80164 2012-03-02 08:56:02 -0800 [Qt] QWebNavigationRequest 'action' property should have an enum type instead of int 2012-03-07 04:29:21 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78821 1 cmarcelo cmarcelo hausmann menard ossy vestbo webkit.review.bot zoltan oldest_to_newest 569681 0 cmarcelo 2012-03-02 08:56:02 -0800 [Qt] QWebNavigationRequest 'action' property should have an enum type instead of int 569685 1 129909 cmarcelo 2012-03-02 09:03:31 -0800 Created attachment 129909 Patch 570789 2 129909 rafael.lobo 2012-03-05 09:43:49 -0800 Comment on attachment 129909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129909&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:86 > + RequestActionCount, Shouldn't this be named ActionCountRequest instead (to follow other names pattern)? 570793 3 129909 cmarcelo 2012-03-05 09:49:15 -0800 Comment on attachment 129909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129909&action=review >> Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:86 >> + RequestActionCount, > > Shouldn't this be named ActionCountRequest instead (to follow other names pattern)? It is the Count of RequestActions, it is not an action to be performed itself. 570799 4 129909 vestbo 2012-03-05 09:55:27 -0800 Comment on attachment 129909 Patch after discussion on IRC 570884 5 130167 cmarcelo 2012-03-05 11:40:13 -0800 Created attachment 130167 Patch 571943 6 130167 hausmann 2012-03-06 10:09:05 -0800 Comment on attachment 130167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130167&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:86 > + IgnoreRequest = 0xFF Why not simply leave it as its original value and use DownloadRequest = IgnoreRequest + 1? It seems strange to have a gap in the _existing_ enums. or enum NavigationRequestAction { AcceptRequest, IgnoreRequest, LastRequestAction = IgnoreRequest /* Mark internal in docs! */ } DownloadRequest = LastRequest I recall seeing the pattern like this in Qt. (see qnamespace.h) 572109 7 130167 cmarcelo 2012-03-06 13:32:58 -0800 Comment on attachment 130167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130167&action=review >> Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h:86 >> + IgnoreRequest = 0xFF > > Why not simply leave it as its original value and use DownloadRequest = IgnoreRequest + 1? > It seems strange to have a gap in the _existing_ enums. > > or > > enum NavigationRequestAction { > AcceptRequest, > IgnoreRequest, > LastRequestAction = IgnoreRequest /* Mark internal in docs! */ > } > > DownloadRequest = LastRequest > > I recall seeing the pattern like this in Qt. (see qnamespace.h) In Qt we use this pattern for ItemDataRole, people create their roles with values >= UserRole. The difference is that functions taking roles as parameter actually take int (see QAbstractItemModel methods). If we want to use the enum type as the property type and as storage for the property (member m_action is of the enum type), we are saying we accept only values inside enum range. It may work in GCC if the value is out of range, but GCC still is unhappy when we construct switch() statements using the type. Casting to int in the switch() alleviates this second problem, but with no true guarantee. Tor-Arne explicitly preferred we do not "clutter" the QML API with the "LastRequestAction" or "RequestActionCount". 572786 8 cmarcelo 2012-03-07 04:29:21 -0800 Committed r110047: <http://trac.webkit.org/changeset/110047> 129909 2012-03-02 09:03:31 -0800 2012-03-05 11:40:06 -0800 Patch bug-80164-20120302140330.patch text/plain 6902 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjEyNzdlMDRkMjgxNDhj YTA0ZWQzMjhlZTMzNDdhMTM2ZmM2ZDdlNi4uZjhmNmQxMTFlNTk2NTkxN2Q0YTA4MmZmN2ZjMWMx Y2I5ZjQxMjMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTAyICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XSBRV2ViTmF2aWdhdGlvblJlcXVlc3QgJ2FjdGlvbicgcHJvcGVydHkg c2hvdWxkIGhhdmUgYW4gZW51bSB0eXBlIGluc3RlYWQgb2YgaW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE2NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgYXBwcm9wcmlhdGUgZW51bSB0 eXBlIGluc3RlYWQgb2YgaW50LiBCZWNhdXNlIHdlIGhhdmUgZXh0cmEgcG9zc2libGUKKyAgICAg ICAgdmFsdWVzIGV4cG9zZWQgaW4gdGhlIEV4cGVyaW1lbnRhbCBpbnRlcmZhY2UsIHdlIG5lZWQg c29tZSBleHRyYSBjYXJlIHRvIG1ha2UKKyAgICAgICAgc3VyZSB0aGVpciBmYWxsIGluc2lkZSB0 aGUgcHVibGljIGVudW0gdmFsaWQgcmFuZ2UuIFRoaXMgaXMgYWNoaWV2ZWQgYnkgaGF2aW5nCisg ICAgICAgIE1heFJlcXVlc3RBY3Rpb24uCisKKyAgICAgICAgVG8gYXZvaWQgaGF2aW5nIHRvIG1h bnVhbGx5IHN5bmNocm9uaXplIHRoZSBzdGFydCB2YWx1ZSBmb3IgdGhlIEV4cGVyaW1lbnRhbCBl bnVtLAorICAgICAgICB0aGUgcHVibGljIGVudW0gYWxzbyBjb250YWlucyBSZXF1ZXN0QWN0aW9u Q291bnQuIExhc3QgYnV0IG5vdCBsZWFzdCwgdGhlIEV4cGVyaW1lbnRhbAorICAgICAgICBlbnVt IHdhcyByZW5hbWVkIHRvIGF2b2lkIGNvbmZ1c2lvbiB3aXRoIHRoZSBwdWJsaWMgZW51bS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbnJlcXVlc3QuY3BwOgorICAgICAgICAoUVdl Yk5hdmlnYXRpb25SZXF1ZXN0UHJpdmF0ZSk6CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVl c3Q6OnNldEFjdGlvbik6CisgICAgICAgIChRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OmFjdGlvbik6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbnJlcXVlc3RfcC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcHVibGljYXBpL3RzdF9wdWJsaWNhcGku Y3BwOgorCiAyMDEyLTAzLTAyICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5A bm9raWEuY29tPgogCiAgICAgICAgIEZpeCBidWlsZCBvbiBBcHBsZVdlYktpdCBhZnRlciAxMDk1 NDguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXdfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 X3AuaAppbmRleCBkNDI0ZGM1ZDRhOWQyMjBjZDE5M2ZjMDA4Mjc1ZDFhMjVhYWM5ZDIwLi42MzZm ODlmZDU1Njk2YWI1MDFhMzExOWM4OWEwZjg4M2VkYmRlOGE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKQEAgLTgyLDcgKzgyLDEx IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFRdWlja1dlYlZpZXcgOiBwdWJsaWMgUVF1aWNrSXRl bSB7CiBwdWJsaWM6CiAgICAgZW51bSBOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiB7CiAgICAgICAg IEFjY2VwdFJlcXVlc3QsCi0gICAgICAgIElnbm9yZVJlcXVlc3QKKyAgICAgICAgSWdub3JlUmVx dWVzdCwKKyAgICAgICAgUmVxdWVzdEFjdGlvbkNvdW50LAorCisgICAgICAgIC8vIFRoaXMgbWFr ZXMgc3VyZSB0aGF0IGV4dHJhIGFjdGlvbnMgZXhwb3NlZCBpbiBFeHBlcmltZW50YWwgYXJlIGlu IGEgdmFsaWQgcmFuZ2Ugb2YgdGhpcyBlbnVtIHR5cGUuCisgICAgICAgIE1heFJlcXVlc3RBY3Rp b24gPSAxNgogICAgIH07CiAgICAgZW51bSBMb2FkU3RhdHVzIHsKICAgICAgICAgTG9hZFN0YXJ0 ZWRTdGF0dXMsCkBAIC0yNDksMTEgKzI1MywxMSBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRUXVp Y2tXZWJWaWV3RXhwZXJpbWVudGFsIDogcHVibGljIFFPYmplY3QgewogICAgIFFfUFJPUEVSVFko UVdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcyBSRUFEIHByZWZlcmVuY2VzIENPTlNUQU5UIEZJ TkFMKQogICAgIFFfUFJPUEVSVFkoUVdlYlZpZXdwb3J0SW5mbyogdmlld3BvcnRJbmZvIFJFQUQg dmlld3BvcnRJbmZvIENPTlNUQU5UIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoUURlY2xhcmF0aXZl TGlzdFByb3BlcnR5PFFRdWlja1VybFNjaGVtZURlbGVnYXRlPiB1cmxTY2hlbWVEZWxlZ2F0ZXMg UkVBRCBzY2hlbWVEZWxlZ2F0ZXMpCi0gICAgUV9FTlVNUyhOYXZpZ2F0aW9uUmVxdWVzdEFjdGlv bikKKyAgICBRX0VOVU1TKE5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uRXhwZXJpbWVudGFsKQogCiBw dWJsaWM6Ci0gICAgZW51bSBOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiB7Ci0gICAgICAgIERvd25s b2FkUmVxdWVzdCA9IDIKKyAgICBlbnVtIE5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uRXhwZXJpbWVu dGFsIHsKKyAgICAgICAgRG93bmxvYWRSZXF1ZXN0ID0gUVF1aWNrV2ViVmlldzo6UmVxdWVzdEFj dGlvbkNvdW50CiAgICAgfTsKIAogICAgIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwoUVF1aWNr V2ViVmlldyogd2ViVmlldyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdC5jcHAKaW5kZXggNmMzZWQ4Mzk5OTlhOTYz YjQwMzA2YTFiODE1NDcwNjVjNmMxMmEzZS4uOTJhZjI3MTc5NmJiOGNiODQ4ZDg1YTI4ZGVjMjA0 YmM3N2FlMThkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbnJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1ZXN0LmNwcApAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6 CiAgICAgUVVybCB1cmw7CiAgICAgUXQ6Ok1vdXNlQnV0dG9uIG1vdXNlQnV0dG9uOwogICAgIFF0 OjpLZXlib2FyZE1vZGlmaWVycyBrZXlib2FyZE1vZGlmaWVyczsKLSAgICBpbnQgYWN0aW9uOwor ICAgIFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbjsKICAgICBR UXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZTsKIH07CiAKQEAgLTU2 LDcgKzU2LDcgQEAgUVdlYk5hdmlnYXRpb25SZXF1ZXN0Ojp+UVdlYk5hdmlnYXRpb25SZXF1ZXN0 KCkKICAgICBkZWxldGUgZDsKIH0KIAotdm9pZCBRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OnNldEFj dGlvbihpbnQgYWN0aW9uKQordm9pZCBRV2ViTmF2aWdhdGlvblJlcXVlc3Q6OnNldEFjdGlvbihR UXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiBhY3Rpb24pCiB7CiAgICAgaWYg KGQtPmFjdGlvbiA9PSBhY3Rpb24pCiAgICAgICAgIHJldHVybjsKQEAgLTgwLDcgKzgwLDcgQEAg aW50IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6a2V5Ym9hcmRNb2RpZmllcnMoKSBjb25zdAogICAg IHJldHVybiBpbnQoZC0+a2V5Ym9hcmRNb2RpZmllcnMpOwogfQogCi1pbnQgUVdlYk5hdmlnYXRp b25SZXF1ZXN0OjphY3Rpb24oKSBjb25zdAorUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblJlcXVl c3RBY3Rpb24gUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjphY3Rpb24oKSBjb25zdAogewogICAgIHJl dHVybiBkLT5hY3Rpb247CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9ucmVxdWVzdF9wLmgKaW5kZXggNDcxNDM0MzY4ZWRhYzYy NGUzODQzNzgwZjBjNDFmZTRjMjI5ZDZjMC4uYjQwMWRlZGE1ZDA5NzY0MDBmNjcwZTBhNWNmYWIw NDdlZDM1ZDBjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbnJlcXVlc3RfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1ZXN0X3AuaApAQCAtMzMsNyArMzMsNyBAQCBjbGFzcyBR V0VCS0lUX0VYUE9SVCBRV2ViTmF2aWdhdGlvblJlcXVlc3QgOiBwdWJsaWMgUU9iamVjdCB7CiAg ICAgUV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBDT05TVEFOVCBGSU5BTCkKICAgICBRX1BS T1BFUlRZKGludCBtb3VzZUJ1dHRvbiBSRUFEIG1vdXNlQnV0dG9uIENPTlNUQU5UIEZJTkFMKQog ICAgIFFfUFJPUEVSVFkoaW50IGtleWJvYXJkTW9kaWZpZXJzIFJFQUQga2V5Ym9hcmRNb2RpZmll cnMgQ09OU1RBTlQgRklOQUwpCi0gICAgUV9QUk9QRVJUWShpbnQgYWN0aW9uIFJFQUQgYWN0aW9u IFdSSVRFIHNldEFjdGlvbiBOT1RJRlkgYWN0aW9uQ2hhbmdlZCBGSU5BTCkKKyAgICBRX1BST1BF UlRZKFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlvbiBSRUFEIGFj dGlvbiBXUklURSBzZXRBY3Rpb24gTk9USUZZIGFjdGlvbkNoYW5nZWQgRklOQUwpCiAgICAgUV9Q Uk9QRVJUWShRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSBSRUFE IG5hdmlnYXRpb25UeXBlIENPTlNUQU5UIEZJTkFMKQogCiBwdWJsaWM6CkBAIC00Myw5ICs0Myw5 IEBAIHB1YmxpYzoKICAgICBRVXJsIHVybCgpIGNvbnN0OwogICAgIGludCBtb3VzZUJ1dHRvbigp IGNvbnN0OwogICAgIGludCBrZXlib2FyZE1vZGlmaWVycygpIGNvbnN0OwotICAgIGludCBhY3Rp b24oKSBjb25zdDsKKyAgICBRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiBh Y3Rpb24oKSBjb25zdDsKIAotICAgIHZvaWQgc2V0QWN0aW9uKGludCBhY3Rpb24pOworICAgIHZv aWQgc2V0QWN0aW9uKFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIGFjdGlv bik7CiAgICAgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUoKSBj b25zdDsKIAogUV9TSUdOQUxTOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9wdWJsaWNhcGkvdHN0X3B1YmxpY2FwaS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1YmxpY2FwaS90c3RfcHVibGljYXBpLmNwcAppbmRl eCA4YTNmMmQyOGI3NzliOGY5NjJmMGRkZjQ2NmNiNDQ3M2Y4NTk0NGVlLi4wYzA4YmYzMDk5NDJl OGU0MTExNjlhNmI1OWQ5YzM2N2FhM2Y0YjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1YmxpY2FwaS90c3RfcHVibGljYXBpLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1YmxpY2FwaS90c3RfcHVibGlj YXBpLmNwcApAQCAtNDEsNiArNDEsOCBAQCBzdGF0aWMgUUxpc3Q8Y29uc3QgUU1ldGFPYmplY3Qq PiB0eXBlc1RvQ2hlY2sgPSBRTGlzdDxjb25zdCBRTWV0YU9iamVjdCo+KCkKIHN0YXRpYyBRU3Ry aW5nTGlzdCBleHBlY3RlZEFQSSA9IFFTdHJpbmdMaXN0KCkKICAgICA8PCAiUVF1aWNrV2ViVmll dy5BY2NlcHRSZXF1ZXN0IC0tPiBOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiIKICAgICA8PCAiUVF1 aWNrV2ViVmlldy5JZ25vcmVSZXF1ZXN0IC0tPiBOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiIKKyAg ICA8PCAiUVF1aWNrV2ViVmlldy5SZXF1ZXN0QWN0aW9uQ291bnQgLS0+IE5hdmlnYXRpb25SZXF1 ZXN0QWN0aW9uIgorICAgIDw8ICJRUXVpY2tXZWJWaWV3Lk1heFJlcXVlc3RBY3Rpb24gLS0+IE5h dmlnYXRpb25SZXF1ZXN0QWN0aW9uIgogICAgIDw8ICJRUXVpY2tXZWJWaWV3LkxvYWRTdGFydGVk U3RhdHVzIC0tPiBMb2FkU3RhdHVzIgogICAgIDw8ICJRUXVpY2tXZWJWaWV3LkxvYWRTdWNjZWVk ZWRTdGF0dXMgLS0+IExvYWRTdGF0dXMiCiAgICAgPDwgIlFRdWlja1dlYlZpZXcuTG9hZEZhaWxl ZFN0YXR1cyAtLT4gTG9hZFN0YXR1cyIKQEAgLTg0LDcgKzg2LDcgQEAgc3RhdGljIFFTdHJpbmdM aXN0IGV4cGVjdGVkQVBJID0gUVN0cmluZ0xpc3QoKQogICAgIDw8ICJRV2ViTmF2aWdhdGlvblJl cXVlc3QudXJsIC0tPiBRVXJsIgogICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QubW91c2VC dXR0b24gLS0+IGludCIKICAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmtleWJvYXJkTW9k aWZpZXJzIC0tPiBpbnQiCi0gICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5hY3Rpb24gLS0+ IGludCIKKyAgICA8PCAiUVdlYk5hdmlnYXRpb25SZXF1ZXN0LmFjdGlvbiAtLT4gUVF1aWNrV2Vi Vmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24iCiAgICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVx dWVzdC5uYXZpZ2F0aW9uVHlwZSAtLT4gUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUiCiAg ICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5hY3Rpb25DaGFuZ2VkKCkgLS0+IHZvaWQiCiAg ICAgOwo= 130167 2012-03-05 11:40:13 -0800 2012-03-06 13:32:58 -0800 Patch bug-80164-20120305164016.patch text/plain 6023 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2U1M2ZkYjIzMjQ5MzVh MzllOTNjMzIwNjlhZGZmNDE4MzY3NGU4NC4uMGNjZmM3MWE2YTQ1YmFiMjRmYWQ5NWI5MDVlYzFh OTI2MjE2NWZlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTAzLTA1ICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XSBRV2ViTmF2aWdhdGlvblJlcXVlc3QgJ2FjdGlvbicgcHJvcGVydHkg c2hvdWxkIGhhdmUgYW4gZW51bSB0eXBlIGluc3RlYWQgb2YgaW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE2NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgYXBwcm9wcmlhdGUgZW51bSB0 eXBlIGluc3RlYWQgb2YgaW50LiBNYWtlIElnbm9yZVJlcXVlc3QgaGF2ZSBhIGJpZ2dlcgorICAg ICAgICB2YWx1ZSB0aGF0IGdpdmUgc29tZSByb29tIGZvciB1cyB0byBwdXQgRXhwZXJpbWVudGFs IHZhbHVlcyBpbiB0aGUgbWlkZGxlLiBUaGlzCisgICAgICAgIHdheSB0aGUgRXhwZXJpbWVudGFs IHZhbHVlcyBhcmUgaW4gYSB2YWxpZCByYW5nZSBmb3IgdGhlIG9yaWdpbmFsIGVudW1lcmF0aW9u LiBUbworICAgICAgICBhdm9pZCBjb25mdXNpb24sIHRoZSBFeHBlcmltZW50YWwgZW51bWVyYXRp b24gd2FzIHJlbmFtZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25yZXF1ZXN0 LmNwcDoKKyAgICAgICAgKFFXZWJOYXZpZ2F0aW9uUmVxdWVzdFByaXZhdGUpOgorICAgICAgICAo UVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpzZXRBY3Rpb24pOgorICAgICAgICAoUVdlYk5hdmlnYXRp b25SZXF1ZXN0OjphY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmln YXRpb25yZXF1ZXN0X3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3B1Ymxp Y2FwaS90c3RfcHVibGljYXBpLmNwcDoKKwogMjAxMi0wMy0wNSAgU2hlcmlmZiBCb3QgIDx3ZWJr aXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjEwOTc0OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlld19wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXdfcC5oCmluZGV4IGQ0MjRkYzVkNGE5ZDIyMGNkMTkzZmMwMDgyNzVkMWEyNWFhYzlk MjAuLjQ5ZTExYjEyYmU1ODExOGJmOGYyMjczNGJlNWRjZTgwMzE3NTVlOWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaApAQCAtODIs NyArODIsOCBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRUXVpY2tXZWJWaWV3IDogcHVibGljIFFR dWlja0l0ZW0gewogcHVibGljOgogICAgIGVudW0gTmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gewog ICAgICAgICBBY2NlcHRSZXF1ZXN0LAotICAgICAgICBJZ25vcmVSZXF1ZXN0CisgICAgICAgIC8v IE1ha2Ugcm9vbSBpbiB0aGUgdmFsaWQgcmFuZ2Ugb2YgdGhlIGVudW0gZm9yIGV4dHJhIGFjdGlv bnMgZXhwb3NlZCBpbiBFeHBlcmltZW50YWwuCisgICAgICAgIElnbm9yZVJlcXVlc3QgPSAweEZG CiAgICAgfTsKICAgICBlbnVtIExvYWRTdGF0dXMgewogICAgICAgICBMb2FkU3RhcnRlZFN0YXR1 cywKQEAgLTI0OSwxMSArMjUwLDExIEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFRdWlja1dlYlZp ZXdFeHBlcmltZW50YWwgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9QUk9QRVJUWShRV2ViUHJl ZmVyZW5jZXMqIHByZWZlcmVuY2VzIFJFQUQgcHJlZmVyZW5jZXMgQ09OU1RBTlQgRklOQUwpCiAg ICAgUV9QUk9QRVJUWShRV2ViVmlld3BvcnRJbmZvKiB2aWV3cG9ydEluZm8gUkVBRCB2aWV3cG9y dEluZm8gQ09OU1RBTlQgRklOQUwpCiAgICAgUV9QUk9QRVJUWShRRGVjbGFyYXRpdmVMaXN0UHJv cGVydHk8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGU+IHVybFNjaGVtZURlbGVnYXRlcyBSRUFEIHNj aGVtZURlbGVnYXRlcykKLSAgICBRX0VOVU1TKE5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uKQorICAg IFFfRU5VTVMoTmF2aWdhdGlvblJlcXVlc3RBY3Rpb25FeHBlcmltZW50YWwpCiAKIHB1YmxpYzoK LSAgICBlbnVtIE5hdmlnYXRpb25SZXF1ZXN0QWN0aW9uIHsKLSAgICAgICAgRG93bmxvYWRSZXF1 ZXN0ID0gMgorICAgIGVudW0gTmF2aWdhdGlvblJlcXVlc3RBY3Rpb25FeHBlcmltZW50YWwgewor ICAgICAgICBEb3dubG9hZFJlcXVlc3QgPSBRUXVpY2tXZWJWaWV3OjpJZ25vcmVSZXF1ZXN0IC0g MQogICAgIH07CiAKICAgICBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKFFRdWlja1dlYlZpZXcq IHdlYlZpZXcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbnJlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2VibmF2aWdhdGlvbnJlcXVlc3QuY3BwCmluZGV4IDZjM2VkODM5OTk5YTk2M2I0MDMwNmEx YjgxNTQ3MDY1YzZjMTJhM2UuLjkyYWYyNzE3OTZiYjhjYjg0OGQ4NWEyOGRlYzIwNGJjNzdhZTE4 ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmln YXRpb25yZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJuYXZpZ2F0aW9ucmVxdWVzdC5jcHAKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIFFV cmwgdXJsOwogICAgIFF0OjpNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbjsKICAgICBRdDo6S2V5Ym9h cmRNb2RpZmllcnMga2V5Ym9hcmRNb2RpZmllcnM7Ci0gICAgaW50IGFjdGlvbjsKKyAgICBRUXVp Y2tXZWJWaWV3OjpOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiBhY3Rpb247CiAgICAgUVF1aWNrV2Vi Vmlldzo6TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGU7CiB9OwogCkBAIC01Niw3ICs1Niw3 IEBAIFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6flFXZWJOYXZpZ2F0aW9uUmVxdWVzdCgpCiAgICAg ZGVsZXRlIGQ7CiB9CiAKLXZvaWQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpzZXRBY3Rpb24oaW50 IGFjdGlvbikKK3ZvaWQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0OjpzZXRBY3Rpb24oUVF1aWNrV2Vi Vmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uKQogewogICAgIGlmIChkLT5hY3Rp b24gPT0gYWN0aW9uKQogICAgICAgICByZXR1cm47CkBAIC04MCw3ICs4MCw3IEBAIGludCBRV2Vi TmF2aWdhdGlvblJlcXVlc3Q6OmtleWJvYXJkTW9kaWZpZXJzKCkgY29uc3QKICAgICByZXR1cm4g aW50KGQtPmtleWJvYXJkTW9kaWZpZXJzKTsKIH0KIAotaW50IFFXZWJOYXZpZ2F0aW9uUmVxdWVz dDo6YWN0aW9uKCkgY29uc3QKK1FRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25SZXF1ZXN0QWN0aW9u IFFXZWJOYXZpZ2F0aW9uUmVxdWVzdDo6YWN0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4gZC0+ YWN0aW9uOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbnJlcXVlc3RfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2VibmF2aWdhdGlvbnJlcXVlc3RfcC5oCmluZGV4IDQ3MTQzNDM2OGVkYWM2MjRlMzg0Mzc4 MGYwYzQxZmU0YzIyOWQ2YzAuLmI0MDFkZWRhNWQwOTc2NDAwZjY3MGUwYTVjZmFiMDQ3ZWQzNWQw Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmln YXRpb25yZXF1ZXN0X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJuYXZpZ2F0aW9ucmVxdWVzdF9wLmgKQEAgLTMzLDcgKzMzLDcgQEAgY2xhc3MgUVdFQktJVF9F WFBPUlQgUVdlYk5hdmlnYXRpb25SZXF1ZXN0IDogcHVibGljIFFPYmplY3QgewogICAgIFFfUFJP UEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgQ09OU1RBTlQgRklOQUwpCiAgICAgUV9QUk9QRVJUWShp bnQgbW91c2VCdXR0b24gUkVBRCBtb3VzZUJ1dHRvbiBDT05TVEFOVCBGSU5BTCkKICAgICBRX1BS T1BFUlRZKGludCBrZXlib2FyZE1vZGlmaWVycyBSRUFEIGtleWJvYXJkTW9kaWZpZXJzIENPTlNU QU5UIEZJTkFMKQotICAgIFFfUFJPUEVSVFkoaW50IGFjdGlvbiBSRUFEIGFjdGlvbiBXUklURSBz ZXRBY3Rpb24gTk9USUZZIGFjdGlvbkNoYW5nZWQgRklOQUwpCisgICAgUV9QUk9QRVJUWShRUXVp Y2tXZWJWaWV3OjpOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiBhY3Rpb24gUkVBRCBhY3Rpb24gV1JJ VEUgc2V0QWN0aW9uIE5PVElGWSBhY3Rpb25DaGFuZ2VkIEZJTkFMKQogICAgIFFfUFJPUEVSVFko UVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUgUkVBRCBuYXZpZ2F0 aW9uVHlwZSBDT05TVEFOVCBGSU5BTCkKIAogcHVibGljOgpAQCAtNDMsOSArNDMsOSBAQCBwdWJs aWM6CiAgICAgUVVybCB1cmwoKSBjb25zdDsKICAgICBpbnQgbW91c2VCdXR0b24oKSBjb25zdDsK ICAgICBpbnQga2V5Ym9hcmRNb2RpZmllcnMoKSBjb25zdDsKLSAgICBpbnQgYWN0aW9uKCkgY29u c3Q7CisgICAgUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblJlcXVlc3RBY3Rpb24gYWN0aW9uKCkg Y29uc3Q7CiAKLSAgICB2b2lkIHNldEFjdGlvbihpbnQgYWN0aW9uKTsKKyAgICB2b2lkIHNldEFj dGlvbihRUXVpY2tXZWJWaWV3OjpOYXZpZ2F0aW9uUmVxdWVzdEFjdGlvbiBhY3Rpb24pOwogICAg IFFRdWlja1dlYlZpZXc6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlKCkgY29uc3Q7CiAK IFFfU0lHTkFMUzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcHVibGljYXBpL3RzdF9wdWJsaWNhcGkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC90ZXN0cy9wdWJsaWNhcGkvdHN0X3B1YmxpY2FwaS5jcHAKaW5kZXggOGEzZjJk MjhiNzc5YjhmOTYyZjBkZGY0NjZjYjQ0NzNmODU5NDRlZS4uMjY0MDMzN2JmYzU4ZDgwZDM0Yjkz ZDk5MDAwMjBhMjhmOTU2ZTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9wdWJsaWNhcGkvdHN0X3B1YmxpY2FwaS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9wdWJsaWNhcGkvdHN0X3B1YmxpY2FwaS5jcHAK QEAgLTg0LDcgKzg0LDcgQEAgc3RhdGljIFFTdHJpbmdMaXN0IGV4cGVjdGVkQVBJID0gUVN0cmlu Z0xpc3QoKQogICAgIDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QudXJsIC0tPiBRVXJsIgogICAg IDw8ICJRV2ViTmF2aWdhdGlvblJlcXVlc3QubW91c2VCdXR0b24gLS0+IGludCIKICAgICA8PCAi UVdlYk5hdmlnYXRpb25SZXF1ZXN0LmtleWJvYXJkTW9kaWZpZXJzIC0tPiBpbnQiCi0gICAgPDwg IlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5hY3Rpb24gLS0+IGludCIKKyAgICA8PCAiUVdlYk5hdmln YXRpb25SZXF1ZXN0LmFjdGlvbiAtLT4gUVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblJlcXVlc3RB Y3Rpb24iCiAgICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVxdWVzdC5uYXZpZ2F0aW9uVHlwZSAtLT4g UVF1aWNrV2ViVmlldzo6TmF2aWdhdGlvblR5cGUiCiAgICAgPDwgIlFXZWJOYXZpZ2F0aW9uUmVx dWVzdC5hY3Rpb25DaGFuZ2VkKCkgLS0+IHZvaWQiCiAgICAgOwo=