87660 2012-05-28 07:00:53 -0700 [BlackBerry] http authentication challenge issue when loading subresource 2012-05-29 09:57:41 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jonathan.dong.webkit webkit-unassigned charles.wei joenotcharles leo.yang rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 635190 0 jonathan.dong.webkit 2012-05-28 07:00:53 -0700 RIM PR: 160585 way to reproduce: try to load an digest http authenticated page which has a subresource, e.g. an img tag pointing to a png file which needs the same authentication. the auth challenge dialog would pop up twice, even you've entered the right credentials for the main resource. root cause: we load store the credentials in handleNotifyDone, after finish loading the whole main resource, which is too late. We should do it as soon as we receives the headers which indicate that we've passed the authentication. Then we can find the credential information from CredentialStorage when loading subresource. 635209 1 144357 jonathan.dong.webkit 2012-05-28 07:31:43 -0700 Created attachment 144357 Patch 635213 2 joenotcharles 2012-05-28 07:41:45 -0700 LGTM 635313 3 144357 rwlbuis 2012-05-28 10:31:52 -0700 Comment on attachment 144357 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144357&action=review Looks good, but can maybe cleaned up some more. > Source/WebCore/ChangeLog:14 > + No new tests because of no behavior changed. No new tests since there is no change in behavior. > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:214 > + // the saved credentials. The comment is quite obvious, and the code below it is readable, maybe not needed. > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:218 > + purgeCredentials(); Is it useful to log the fact that there was an error? How about dealing with isError case first, you do not need the ! operation in that case. 635554 4 144438 jonathan.dong.webkit 2012-05-28 21:20:59 -0700 Created attachment 144438 Patch 635570 5 144443 jonathan.dong.webkit 2012-05-28 22:10:54 -0700 Created attachment 144443 Patch 635580 6 144446 jonathan.dong.webkit 2012-05-28 22:30:25 -0700 Created attachment 144446 Patch 635608 7 jonathan.dong.webkit 2012-05-28 23:21:14 -0700 (In reply to comment #6) > Created an attachment (id=144446) [details] > Patch after talk with Joe, we agreed to keep the exact same code as before, just move them to notifyStatusReceived. We need to think more before being sure we are right about that, such as 500 or 404 or something else, and we need have more tests. For now the way won't be perfect but at least we won't make things worse. 636055 8 rwlbuis 2012-05-29 08:31:17 -0700 Hi Jonathan, (In reply to comment #7) > (In reply to comment #6) > > Created an attachment (id=144446) [details] [details] > > Patch > > after talk with Joe, we agreed to keep the exact same code as before, just move them to notifyStatusReceived. We need to think more before being sure we are right about that, such as 500 or 404 or something else, and we need have more tests. For now the way won't be perfect but at least we won't make things worse. So I made my comment because if the isError is true but isUnauthorized is false, we would not report/log this error, isn't that losing information? Hence my log suggestion, why not always log if there is an error? Cheers, Rob. 636060 9 joenotcharles 2012-05-29 08:35:20 -0700 (In reply to comment #8) > So I made my comment because if the isError is true but isUnauthorized is false, we would not report/log this error, isn't that losing information? Hence my log suggestion, why not always log if there is an error? Of coures we report that error. If isError is true but isUnauthorized is false, it just falls through to existing error handling and doesn't touch the credentials at all. 636071 10 144446 rwlbuis 2012-05-29 08:52:40 -0700 Comment on attachment 144446 Patch Looks good. 636149 11 144446 webkit.review.bot 2012-05-29 09:57:35 -0700 Comment on attachment 144446 Patch Clearing flags on attachment: 144446 Committed r118799: <http://trac.webkit.org/changeset/118799> 636150 12 webkit.review.bot 2012-05-29 09:57:41 -0700 All reviewed patches have been landed. Closing bug. 144357 2012-05-28 07:31:43 -0700 2012-05-28 21:20:44 -0700 Patch bug-87660-20120528223140.patch text/plain 2905 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGViZDUwZDUyNjlmOTll MmU3ZWQ1ODVjZjBjODllYWRlNzU4ZDZmZS4uZDUwNmZiOGQ2NjdkNWE2OTVkZDcyZjZmYTQ1Y2Qz MGZiYzZiYTY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTI4ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIGh0dHAgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGlzc3VlIHdoZW4gbG9h ZGluZyBzdWJyZXNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODc2NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBzaG91bGQgdHJ5IHRvIHN0b3JlIHRoZSBjcmVkZW50aWFsIGluZm9ybWF0aW9u IGFzIHNvb24gYXMgd2UKKyAgICAgICAgcmVjZWl2ZSBodHRwIHN0YXR1cyBub3RpZmljYXRpb24g d2hpY2ggaW5kaWNhdGVzIHRoYXQgdGhlCisgICAgICAgIGF1dGhlbnRpY2F0aW9uIHN1Y2NlZWRz LCBpbnN0ZWFkIG9mIHN0b3JpbmcgY3JlZGVudGlhbHMgd2hlbiB0aGUKKyAgICAgICAgbWFpbiBy ZXNvdXJjZSByZWNlaXZlcyBub3RpZnkgZG9uZSB3aGljaCBpcyB0b28gbGF0ZSBmb3IgbG9hZGlu ZworICAgICAgICBzdWJyZXNvdXJjZS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBv ZiBubyBiZWhhdmlvciBjaGFuZ2VkLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6aGFu ZGxlTm90aWZ5U3RhdHVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6 aGFuZGxlTm90aWZ5Q2xvc2UpOgorCiAyMDEyLTA1LTI4ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNo aUB3ZWJraXQub3JnPgogCiAgICAgICAgIEV4cG9zZSB2YWx1ZSBsb2NhbGl6YXRpb24gZnVuY3Rp b24gb2YgSFRNTElucHV0RWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IGZhYjNiMjdlNmMx N2FjZTZjMDM3Y2IxNjVkMjkxYjk0ODdjNGVjM2YuLjExZjZkYzVmN2M0NTFhYzA1YWQ3MjA4MGIz MmRiZWQ3MzI0ZjkwMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTIwOCw2ICsyMDgsMTQgQEAg dm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlTdGF0dXNSZWNlaXZlZChpbnQgc3RhdHVzLCBj b25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c0Nv ZGUoc3RhdHVzKTsKIAogICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c1RleHQobWVzc2FnZSk7 CisKKyAgICAvLyBJZiBhbiBIVFRQIGF1dGhlbnRpY2F0aW9uLWVuYWJsZWQgcmVxdWVzdCBpcyBz dWNjZXNzZnVsLCBzYXZlCisgICAgLy8gdGhlIGNyZWRlbnRpYWxzIGZvciBsYXRlciByZXVzZS4g SWYgdGhlIHJlcXVlc3QgZmFpbHMsIGRlbGV0ZQorICAgIC8vIHRoZSBzYXZlZCBjcmVkZW50aWFs cy4KKyAgICBpZiAoIWlzRXJyb3IobV9leHRlbmRlZFN0YXR1c0NvZGUpKQorICAgICAgICBzdG9y ZUNyZWRlbnRpYWxzKCk7CisgICAgZWxzZSBpZiAoaXNVbmF1dGhvcml6ZWQobV9leHRlbmRlZFN0 YXR1c0NvZGUpKQorICAgICAgICBwdXJnZUNyZWRlbnRpYWxzKCk7CiB9CiAKIHZvaWQgTmV0d29y a0pvYjo6bm90aWZ5SGVhZGVyc1JlY2VpdmVkKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3Jr UmVxdWVzdDo6SGVhZGVyTGlzdCYgaGVhZGVycykKQEAgLTQ0MSwxNCArNDQ5LDYgQEAgdm9pZCBO ZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlDbG9zZShpbnQgc3RhdHVzKQogICAgICAgICAgICAgbm90 aWZ5U3RhdHVzUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkZpbHRlclN0cmVhbTo6U3Rh dHVzTmV0d29ya0Vycm9yLCAwKTsKICAgICAgICAgfQogCi0gICAgICAgIC8vIElmIGFuIEhUVFAg YXV0aGVudGljYXRpb24tZW5hYmxlZCByZXF1ZXN0IGlzIHN1Y2Nlc3NmdWwsIHNhdmUKLSAgICAg ICAgLy8gdGhlIGNyZWRlbnRpYWxzIGZvciBsYXRlciByZXVzZS4gSWYgdGhlIHJlcXVlc3QgZmFp bHMsIGRlbGV0ZQotICAgICAgICAvLyB0aGUgc2F2ZWQgY3JlZGVudGlhbHMuCi0gICAgICAgIGlm ICghaXNFcnJvcihtX2V4dGVuZGVkU3RhdHVzQ29kZSkpCi0gICAgICAgICAgICBzdG9yZUNyZWRl bnRpYWxzKCk7Ci0gICAgICAgIGVsc2UgaWYgKGlzVW5hdXRob3JpemVkKG1fZXh0ZW5kZWRTdGF0 dXNDb2RlKSkKLSAgICAgICAgICAgIHB1cmdlQ3JlZGVudGlhbHMoKTsKLQogICAgICAgICBpZiAo c2hvdWxkUmVsZWFzZUNsaWVudFJlc291cmNlKCkpIHsKICAgICAgICAgICAgIGlmIChpc1JlZGly ZWN0KG1fZXh0ZW5kZWRTdGF0dXNDb2RlKSAmJiAobV9yZWRpcmVjdENvdW50ID49IHNfcmVkaXJl Y3RNYXhpbXVtKSkKICAgICAgICAgICAgICAgICBtX2V4dGVuZGVkU3RhdHVzQ29kZSA9IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpGaWx0ZXJTdHJlYW06OlN0YXR1c1Rvb01hbnlSZWRpcmVjdHM7Cg== 144438 2012-05-28 21:20:59 -0700 2012-05-28 22:10:37 -0700 Patch bug-87660-20120529122056.patch text/plain 2946 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVmNmE3ZmEzMDE5YWQ1 MzFhYjEzNWU2ZjczNDBkNjRlOWY5NzU0Yi4uNDYyYjQ1YmM1NzY5NzE4OTRlMDI3ZTFlMzRmMTA5 NjU4ZDQ4YjM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTI4ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIGh0dHAgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGlzc3VlIHdoZW4gbG9h ZGluZyBzdWJyZXNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODc2NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBzaG91bGQgdHJ5IHRvIHN0b3JlIHRoZSBjcmVkZW50aWFsIGluZm9ybWF0aW9u IGFzIHNvb24gYXMgd2UKKyAgICAgICAgcmVjZWl2ZSBodHRwIHN0YXR1cyBub3RpZmljYXRpb24g d2hpY2ggaW5kaWNhdGVzIHRoYXQgdGhlCisgICAgICAgIGF1dGhlbnRpY2F0aW9uIHN1Y2NlZWRz LCBpbnN0ZWFkIG9mIHN0b3JpbmcgY3JlZGVudGlhbHMgd2hlbiB0aGUKKyAgICAgICAgbWFpbiBy ZXNvdXJjZSByZWNlaXZlcyBub3RpZnkgZG9uZSB3aGljaCBpcyB0b28gbGF0ZSBmb3IgbG9hZGlu ZworICAgICAgICBzdWJyZXNvdXJjZS4KKworICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5 IEpvZSBNYXNvbiA8am1hc29uQHJpbS5jb20+CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNl IHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtKb2I6OmhhbmRsZU5vdGlmeVN0YXR1c1JlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtKb2I6OmhhbmRsZU5vdGlmeUNsb3NlKToKKwogMjAxMi0wNS0yOCAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBdm9pZCBwYXNzaW5nIE5V TEwgdG8gYW4gJ2lzb2xhdGUnIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IDAwNTM1 MmViZTlhOWMxZDk5ZTdhZTJlYjI3MTE1M2U3OTU4MTE4NzEuLjliZWVhNzg5ZTE1ODkxNDY0NTk0 OTg0YTg3YmY3OTljYTNjNmJjM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTIwOCw2ICsyMDgs MTIgQEAgdm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlTdGF0dXNSZWNlaXZlZChpbnQgc3Rh dHVzLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0 YXR1c0NvZGUoc3RhdHVzKTsKIAogICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c1RleHQobWVz c2FnZSk7CisKKyAgICBpZiAoaXNFcnJvcihtX2V4dGVuZGVkU3RhdHVzQ29kZSkgJiYgaXNVbmF1 dGhvcml6ZWQobV9leHRlbmRlZFN0YXR1c0NvZGUpKSB7CisgICAgICAgIHB1cmdlQ3JlZGVudGlh bHMoKTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmxvZyhCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6TG9nTGV2ZWxDcml0aWNhbCwgIkF1dGhlbnRpY2F0aW9uIGZhaWxlZCwgcHVyZ2UgdGhl IHN0b3JlZCBjcmVkZW50aWFscyBmb3IgdGhpcyBzaXRlLlxuIik7CisgICAgfSBlbHNlCisgICAg ICAgIHN0b3JlQ3JlZGVudGlhbHMoKTsKIH0KIAogdm9pZCBOZXR3b3JrSm9iOjpub3RpZnlIZWFk ZXJzUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpIZWFkZXJM aXN0JiBoZWFkZXJzKQpAQCAtNDQxLDE0ICs0NDcsNiBAQCB2b2lkIE5ldHdvcmtKb2I6OmhhbmRs ZU5vdGlmeUNsb3NlKGludCBzdGF0dXMpCiAgICAgICAgICAgICBub3RpZnlTdGF0dXNSZWNlaXZl ZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6RmlsdGVyU3RyZWFtOjpTdGF0dXNOZXR3b3JrRXJyb3Is IDApOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gSWYgYW4gSFRUUCBhdXRoZW50aWNhdGlvbi1l bmFibGVkIHJlcXVlc3QgaXMgc3VjY2Vzc2Z1bCwgc2F2ZQotICAgICAgICAvLyB0aGUgY3JlZGVu dGlhbHMgZm9yIGxhdGVyIHJldXNlLiBJZiB0aGUgcmVxdWVzdCBmYWlscywgZGVsZXRlCi0gICAg ICAgIC8vIHRoZSBzYXZlZCBjcmVkZW50aWFscy4KLSAgICAgICAgaWYgKCFpc0Vycm9yKG1fZXh0 ZW5kZWRTdGF0dXNDb2RlKSkKLSAgICAgICAgICAgIHN0b3JlQ3JlZGVudGlhbHMoKTsKLSAgICAg ICAgZWxzZSBpZiAoaXNVbmF1dGhvcml6ZWQobV9leHRlbmRlZFN0YXR1c0NvZGUpKQotICAgICAg ICAgICAgcHVyZ2VDcmVkZW50aWFscygpOwotCiAgICAgICAgIGlmIChzaG91bGRSZWxlYXNlQ2xp ZW50UmVzb3VyY2UoKSkgewogICAgICAgICAgICAgaWYgKGlzUmVkaXJlY3QobV9leHRlbmRlZFN0 YXR1c0NvZGUpICYmIChtX3JlZGlyZWN0Q291bnQgPj0gc19yZWRpcmVjdE1heGltdW0pKQogICAg ICAgICAgICAgICAgIG1fZXh0ZW5kZWRTdGF0dXNDb2RlID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkZpbHRlclN0cmVhbTo6U3RhdHVzVG9vTWFueVJlZGlyZWN0czsK 144443 2012-05-28 22:10:54 -0700 2012-05-28 22:29:55 -0700 Patch bug-87660-20120529131051.patch text/plain 2944 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVmNmE3ZmEzMDE5YWQ1 MzFhYjEzNWU2ZjczNDBkNjRlOWY5NzU0Yi4uNDYyYjQ1YmM1NzY5NzE4OTRlMDI3ZTFlMzRmMTA5 NjU4ZDQ4YjM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTI4ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIGh0dHAgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGlzc3VlIHdoZW4gbG9h ZGluZyBzdWJyZXNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODc2NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBzaG91bGQgdHJ5IHRvIHN0b3JlIHRoZSBjcmVkZW50aWFsIGluZm9ybWF0aW9u IGFzIHNvb24gYXMgd2UKKyAgICAgICAgcmVjZWl2ZSBodHRwIHN0YXR1cyBub3RpZmljYXRpb24g d2hpY2ggaW5kaWNhdGVzIHRoYXQgdGhlCisgICAgICAgIGF1dGhlbnRpY2F0aW9uIHN1Y2NlZWRz LCBpbnN0ZWFkIG9mIHN0b3JpbmcgY3JlZGVudGlhbHMgd2hlbiB0aGUKKyAgICAgICAgbWFpbiBy ZXNvdXJjZSByZWNlaXZlcyBub3RpZnkgZG9uZSB3aGljaCBpcyB0b28gbGF0ZSBmb3IgbG9hZGlu ZworICAgICAgICBzdWJyZXNvdXJjZS4KKworICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5 IEpvZSBNYXNvbiA8am1hc29uQHJpbS5jb20+CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNl IHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtKb2I6OmhhbmRsZU5vdGlmeVN0YXR1c1JlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtKb2I6OmhhbmRsZU5vdGlmeUNsb3NlKToKKwogMjAxMi0wNS0yOCAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBdm9pZCBwYXNzaW5nIE5V TEwgdG8gYW4gJ2lzb2xhdGUnIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IDAwNTM1 MmViZTlhOWMxZDk5ZTdhZTJlYjI3MTE1M2U3OTU4MTE4NzEuLjJjOGNjN2M5YTg5YTI2MGZlNjcw NmFjYzk3NWFkMmJhNTJiMWY3YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTIwOCw2ICsyMDgs MTIgQEAgdm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlTdGF0dXNSZWNlaXZlZChpbnQgc3Rh dHVzLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0 YXR1c0NvZGUoc3RhdHVzKTsKIAogICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c1RleHQobWVz c2FnZSk7CisKKyAgICBpZiAoaXNFcnJvcihtX2V4dGVuZGVkU3RhdHVzQ29kZSkgJiYgaXNVbmF1 dGhvcml6ZWQobV9leHRlbmRlZFN0YXR1c0NvZGUpKSB7CisgICAgICAgIHB1cmdlQ3JlZGVudGlh bHMoKTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmxvZyhCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6TG9nTGV2ZWxDcml0aWNhbCwgIkF1dGhlbnRpY2F0aW9uIGZhaWxlZCwgcHVyZ2UgdGhl IHN0b3JlZCBjcmVkZW50aWFscyBmb3IgdGhpcyBzaXRlLiIpOworICAgIH0gZWxzZQorICAgICAg ICBzdG9yZUNyZWRlbnRpYWxzKCk7CiB9CiAKIHZvaWQgTmV0d29ya0pvYjo6bm90aWZ5SGVhZGVy c1JlY2VpdmVkKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SGVhZGVyTGlz dCYgaGVhZGVycykKQEAgLTQ0MSwxNCArNDQ3LDYgQEAgdm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVO b3RpZnlDbG9zZShpbnQgc3RhdHVzKQogICAgICAgICAgICAgbm90aWZ5U3RhdHVzUmVjZWl2ZWQo QmxhY2tCZXJyeTo6UGxhdGZvcm06OkZpbHRlclN0cmVhbTo6U3RhdHVzTmV0d29ya0Vycm9yLCAw KTsKICAgICAgICAgfQogCi0gICAgICAgIC8vIElmIGFuIEhUVFAgYXV0aGVudGljYXRpb24tZW5h YmxlZCByZXF1ZXN0IGlzIHN1Y2Nlc3NmdWwsIHNhdmUKLSAgICAgICAgLy8gdGhlIGNyZWRlbnRp YWxzIGZvciBsYXRlciByZXVzZS4gSWYgdGhlIHJlcXVlc3QgZmFpbHMsIGRlbGV0ZQotICAgICAg ICAvLyB0aGUgc2F2ZWQgY3JlZGVudGlhbHMuCi0gICAgICAgIGlmICghaXNFcnJvcihtX2V4dGVu ZGVkU3RhdHVzQ29kZSkpCi0gICAgICAgICAgICBzdG9yZUNyZWRlbnRpYWxzKCk7Ci0gICAgICAg IGVsc2UgaWYgKGlzVW5hdXRob3JpemVkKG1fZXh0ZW5kZWRTdGF0dXNDb2RlKSkKLSAgICAgICAg ICAgIHB1cmdlQ3JlZGVudGlhbHMoKTsKLQogICAgICAgICBpZiAoc2hvdWxkUmVsZWFzZUNsaWVu dFJlc291cmNlKCkpIHsKICAgICAgICAgICAgIGlmIChpc1JlZGlyZWN0KG1fZXh0ZW5kZWRTdGF0 dXNDb2RlKSAmJiAobV9yZWRpcmVjdENvdW50ID49IHNfcmVkaXJlY3RNYXhpbXVtKSkKICAgICAg ICAgICAgICAgICBtX2V4dGVuZGVkU3RhdHVzQ29kZSA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpG aWx0ZXJTdHJlYW06OlN0YXR1c1Rvb01hbnlSZWRpcmVjdHM7Cg== 144446 2012-05-28 22:30:25 -0700 2012-05-29 09:57:35 -0700 Patch bug-87660-20120529133022.patch text/plain 2952 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVmNmE3ZmEzMDE5YWQ1 MzFhYjEzNWU2ZjczNDBkNjRlOWY5NzU0Yi4uNDYyYjQ1YmM1NzY5NzE4OTRlMDI3ZTFlMzRmMTA5 NjU4ZDQ4YjM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTI4ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIGh0dHAgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGlzc3VlIHdoZW4gbG9h ZGluZyBzdWJyZXNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODc2NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBzaG91bGQgdHJ5IHRvIHN0b3JlIHRoZSBjcmVkZW50aWFsIGluZm9ybWF0aW9u IGFzIHNvb24gYXMgd2UKKyAgICAgICAgcmVjZWl2ZSBodHRwIHN0YXR1cyBub3RpZmljYXRpb24g d2hpY2ggaW5kaWNhdGVzIHRoYXQgdGhlCisgICAgICAgIGF1dGhlbnRpY2F0aW9uIHN1Y2NlZWRz LCBpbnN0ZWFkIG9mIHN0b3JpbmcgY3JlZGVudGlhbHMgd2hlbiB0aGUKKyAgICAgICAgbWFpbiBy ZXNvdXJjZSByZWNlaXZlcyBub3RpZnkgZG9uZSB3aGljaCBpcyB0b28gbGF0ZSBmb3IgbG9hZGlu ZworICAgICAgICBzdWJyZXNvdXJjZS4KKworICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5 IEpvZSBNYXNvbiA8am1hc29uQHJpbS5jb20+CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNl IHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtKb2I6OmhhbmRsZU5vdGlmeVN0YXR1c1JlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtKb2I6OmhhbmRsZU5vdGlmeUNsb3NlKToKKwogMjAxMi0wNS0yOCAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBdm9pZCBwYXNzaW5nIE5V TEwgdG8gYW4gJ2lzb2xhdGUnIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IDAwNTM1 MmViZTlhOWMxZDk5ZTdhZTJlYjI3MTE1M2U3OTU4MTE4NzEuLmI2NTc5YWNjODYyNDNlYTQ3M2Qw NzZkOWZiMTE0NzUwZTFmOGQ5ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTIwOCw2ICsyMDgs MTMgQEAgdm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlTdGF0dXNSZWNlaXZlZChpbnQgc3Rh dHVzLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0 YXR1c0NvZGUoc3RhdHVzKTsKIAogICAgIG1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c1RleHQobWVz c2FnZSk7CisKKyAgICBpZiAoIWlzRXJyb3IobV9leHRlbmRlZFN0YXR1c0NvZGUpKQorICAgICAg ICBzdG9yZUNyZWRlbnRpYWxzKCk7CisgICAgZWxzZSBpZiAoaXNVbmF1dGhvcml6ZWQobV9leHRl bmRlZFN0YXR1c0NvZGUpKSB7CisgICAgICAgIHB1cmdlQ3JlZGVudGlhbHMoKTsKKyAgICAgICAg QmxhY2tCZXJyeTo6UGxhdGZvcm06OmxvZyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TG9nTGV2ZWxD cml0aWNhbCwgIkF1dGhlbnRpY2F0aW9uIGZhaWxlZCwgcHVyZ2UgdGhlIHN0b3JlZCBjcmVkZW50 aWFscyBmb3IgdGhpcyBzaXRlLiIpOworICAgIH0KIH0KIAogdm9pZCBOZXR3b3JrSm9iOjpub3Rp ZnlIZWFkZXJzUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpI ZWFkZXJMaXN0JiBoZWFkZXJzKQpAQCAtNDQxLDE0ICs0NDgsNiBAQCB2b2lkIE5ldHdvcmtKb2I6 OmhhbmRsZU5vdGlmeUNsb3NlKGludCBzdGF0dXMpCiAgICAgICAgICAgICBub3RpZnlTdGF0dXNS ZWNlaXZlZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6RmlsdGVyU3RyZWFtOjpTdGF0dXNOZXR3b3Jr RXJyb3IsIDApOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gSWYgYW4gSFRUUCBhdXRoZW50aWNh dGlvbi1lbmFibGVkIHJlcXVlc3QgaXMgc3VjY2Vzc2Z1bCwgc2F2ZQotICAgICAgICAvLyB0aGUg Y3JlZGVudGlhbHMgZm9yIGxhdGVyIHJldXNlLiBJZiB0aGUgcmVxdWVzdCBmYWlscywgZGVsZXRl Ci0gICAgICAgIC8vIHRoZSBzYXZlZCBjcmVkZW50aWFscy4KLSAgICAgICAgaWYgKCFpc0Vycm9y KG1fZXh0ZW5kZWRTdGF0dXNDb2RlKSkKLSAgICAgICAgICAgIHN0b3JlQ3JlZGVudGlhbHMoKTsK LSAgICAgICAgZWxzZSBpZiAoaXNVbmF1dGhvcml6ZWQobV9leHRlbmRlZFN0YXR1c0NvZGUpKQot ICAgICAgICAgICAgcHVyZ2VDcmVkZW50aWFscygpOwotCiAgICAgICAgIGlmIChzaG91bGRSZWxl YXNlQ2xpZW50UmVzb3VyY2UoKSkgewogICAgICAgICAgICAgaWYgKGlzUmVkaXJlY3QobV9leHRl bmRlZFN0YXR1c0NvZGUpICYmIChtX3JlZGlyZWN0Q291bnQgPj0gc19yZWRpcmVjdE1heGltdW0p KQogICAgICAgICAgICAgICAgIG1fZXh0ZW5kZWRTdGF0dXNDb2RlID0gQmxhY2tCZXJyeTo6UGxh dGZvcm06OkZpbHRlclN0cmVhbTo6U3RhdHVzVG9vTWFueVJlZGlyZWN0czsK