35796 2010-03-05 10:05:29 -0800 Accept and bailout NULL widgets in ChromiumBridge 2010-03-10 10:48:32 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 antonm webkit-unassigned fishd oldest_to_newest 196530 0 antonm 2010-03-05 10:05:29 -0800 Accept and bailout NULL widgets in ChromiumBridge 196533 1 50102 antonm 2010-03-05 10:09:15 -0800 Created attachment 50102 Patch 196534 2 antonm 2010-03-05 10:10:42 -0800 This a fix for http://code.google.com/p/chromium/issues/detail?id=36945 196566 3 50102 fishd 2010-03-05 11:32:23 -0800 Comment on attachment 50102 Patch > diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog > index 93a474b..f2de64e 100644 > --- a/WebKit/chromium/ChangeLog > +++ b/WebKit/chromium/ChangeLog > @@ -1,3 +1,22 @@ > +2010-03-05 Anton Muhin <antonm@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Accept and bailout NULL widgets in ChromiumBridge > + https://bugs.webkit.org/show_bug.cgi?id=35796 > + > + * src/ChromiumBridge.cpp: > + (WebCore::toChromeClientImpl): > + > +2010-03-05 anton muhin <antonm@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Need a short description and bug URL (OOPS!) > + > + * src/ChromiumBridge.cpp: > + (WebCore::toChromeClientImpl): ^^^ duplicate changelog entries? also, please create a layout test for this. 197570 4 50304 antonm 2010-03-09 07:34:16 -0800 Created attachment 50304 Patch 197572 5 antonm 2010-03-09 07:37:47 -0800 (In reply to comment #3) > (From update of attachment 50102 [details]) > > diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog > > index 93a474b..f2de64e 100644 > > --- a/WebKit/chromium/ChangeLog > > +++ b/WebKit/chromium/ChangeLog > > @@ -1,3 +1,22 @@ > > +2010-03-05 Anton Muhin <antonm@chromium.org> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Accept and bailout NULL widgets in ChromiumBridge > > + https://bugs.webkit.org/show_bug.cgi?id=35796 > > + > > + * src/ChromiumBridge.cpp: > > + (WebCore::toChromeClientImpl): > > + > > +2010-03-05 anton muhin <antonm@google.com> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Need a short description and bug URL (OOPS!) > > + > > + * src/ChromiumBridge.cpp: > > + (WebCore::toChromeClientImpl): > > ^^^ duplicate changelog entries? > > also, please create a layout test for this. Darin, sorry for duplicate entry---removed. And layout test added. May you have another look? 197583 6 50307 antonm 2010-03-09 07:47:34 -0800 Created attachment 50307 Patch 197601 7 50307 fishd 2010-03-09 08:52:55 -0800 Comment on attachment 50307 Patch > +++ b/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html > @@ -0,0 +1,36 @@ > +<html> > +<head> > + <script> > + function accessAttributes(s) { > + var value = 0; > + value = s.height; > + value = s.width; > + value = s.colorDepth; > + value = s.pixelDepth; > + value = s.availLeft; > + value = s.availTop; > + value = s.availHeight; > + value = s.availWidth; > + } > + > + function runTests() { > + if (window.layoutTestController) > + layoutTestController.dumpAsText(); > + > + var f = document.getElementById('theframe'); > + var s = f.contentWindow.screen; > + accessAttributes(s); > + > + // Now remove and check that we don't crash. > + f.parentNode.removeChild(f); > + accessAttributes(s); > + } > + </script> > +</head> > +<iframe id="theframe" src="resources/red.html"></iframe> > +<body onload="runTests()"> > +<div> > +This tests that accessing screen attributes doesn't crash even if containing form is removed from the parent. nit: "form" -> "frame" 197604 8 50312 antonm 2010-03-09 08:59:44 -0800 Created attachment 50312 Patch 197605 9 antonm 2010-03-09 09:00:57 -0800 (In reply to comment #7) > (From update of attachment 50307 [details]) > > +++ b/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html > > @@ -0,0 +1,36 @@ > > +<html> > > +<head> > > + <script> > > + function accessAttributes(s) { > > + var value = 0; > > + value = s.height; > > + value = s.width; > > + value = s.colorDepth; > > + value = s.pixelDepth; > > + value = s.availLeft; > > + value = s.availTop; > > + value = s.availHeight; > > + value = s.availWidth; > > + } > > + > > + function runTests() { > > + if (window.layoutTestController) > > + layoutTestController.dumpAsText(); > > + > > + var f = document.getElementById('theframe'); > > + var s = f.contentWindow.screen; > > + accessAttributes(s); > > + > > + // Now remove and check that we don't crash. > > + f.parentNode.removeChild(f); > > + accessAttributes(s); > > + } > > + </script> > > +</head> > > +<iframe id="theframe" src="resources/red.html"></iframe> > > +<body onload="runTests()"> > > +<div> > > +This tests that accessing screen attributes doesn't crash even if containing form is removed from the parent. > > nit: "form" -> "frame" Fixed. Thanks a lot, Darin. Could you r+ the last patch as well? 197983 10 antonm 2010-03-10 04:30:14 -0800 Landed by Darin: http://trac.webkit.org/changeset/55748 50102 2010-03-05 10:09:15 -0800 2010-03-09 07:34:10 -0800 Patch bug-35796-20100305210913.patch text/plain 1230 antonm ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDkzYTQ3NGIuLmYyZGU2NGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDEwLTAzLTA1ICBBbnRvbiBNdWhpbiAgPGFudG9ubUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXB0IGFu ZCBiYWlsb3V0IE5VTEwgd2lkZ2V0cyBpbiBDaHJvbWl1bUJyaWRnZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3OTYKKworICAgICAgICAqIHNyYy9D aHJvbWl1bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0Nocm9tZUNsaWVudEltcGwp OgorCisyMDEwLTAzLTA1ICBhbnRvbiBtdWhpbiAgPGFudG9ubUBnb29nbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBk ZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAoT09QUyEpCisKKyAgICAgICAgKiBzcmMvQ2hyb21pdW1C cmlkZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9DaHJvbWVDbGllbnRJbXBsKToKKwogMjAx MC0wMy0wNSAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJy aWRnZS5jcHAKaW5kZXggMjA5N2UyMS4uMzRkMWY4ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJv bWl1bUJyaWRnZS5jcHAKQEAgLTkyLDYgKzkyLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBz dGF0aWMgQ2hyb21lQ2xpZW50SW1wbCogdG9DaHJvbWVDbGllbnRJbXBsKFdpZGdldCogd2lkZ2V0 KQogeworICAgIGlmICghd2lkZ2V0KQorICAgICAgICByZXR1cm4gMDsKKwogICAgIEZyYW1lVmll dyogdmlldzsKICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKQogICAgICAgICB2aWV3ID0g c3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4od2lkZ2V0KTsK 50304 2010-03-09 07:34:16 -0800 2010-03-09 07:47:27 -0800 Patch bug-35796-20100309183413.patch text/plain 3285 antonm ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZDFkYWFlLi5iOTBlMTRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMt MDkgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NlcHQgYW5kIGJhaWxvdXQgTlVMTCB3 aWRnZXRzIGluIENocm9taXVtQnJpZGdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNTc5NgorCisgICAgICAgICogZmFzdC9mcmFtZXMvaWZyYW1lLWFj Y2Vzcy1zY3JlZW4tb2YtZGVsZXRlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQuaHRtbDogQWRkZWQuCisK IDIwMTAtMDMtMDMgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLWFjY2Vzcy1zY3JlZW4tb2YtZGVsZXRl ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjJkODk4 ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nl c3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorCitUaGlz IHRlc3RzIHRoYXQgYWNjZXNzaW5nIHNjcmVlbiBhdHRyaWJ1dGVzIGRvZXNuJ3QgY3Jhc2ggZXZl biBpZiBjb250YWluaW5nIGZvcm0gaXMgcmVtb3ZlZCBmcm9tIHRoZSBwYXJlbnQuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtYWNjZXNzLXNjcmVlbi1vZi1kZWxl dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtYWNjZXNzLXNjcmVlbi1v Zi1kZWxldGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjUxNTE4 YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nl c3Mtc2NyZWVuLW9mLWRlbGV0ZWQuaHRtbApAQCAtMCwwICsxLDM1IEBACis8aHRtbD4KKzxoZWFk PgorICAgIDxzY3JpcHQ+CisgICAgZnVuY3Rpb24gYWNjZXNzQXR0cmlidXRlcyhzKSB7CisgICAg ICAgIHZhciB2YWx1ZSA9IDA7CisgICAgICAgIHZhbHVlID0gcy5oZWlnaHQ7CisgICAgICAgIHZh bHVlID0gcy53aWR0aDsKKyAgICAgICAgdmFsdWUgPSBzLmNvbG9yRGVwdGg7CisgICAgICAgIHZh bHVlID0gcy5waXhlbERlcHRoOworICAgICAgICB2YWx1ZSA9IHMuYXZhaWxMZWZ0OworICAgICAg ICB2YWx1ZSA9IHMuYXZhaWxUb3A7CisgICAgICAgIHZhbHVlID0gcy5hdmFpbEhlaWdodDsKKyAg ICAgICAgdmFsdWUgPSBzLmF2YWlsV2lkdGg7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVz dHMoKSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICAKKyAg ICAgICAgdmFyIGYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGhlZnJhbWUnKTsKKyAgICAg ICAgYWNjZXNzQXR0cmlidXRlcyhmLmNvbnRlbnRXaW5kb3cuc2NyZWVuKTsKKworICAgICAgICAv LyBOb3cgcmVtb3ZlIGFuZCBjaGVjayB0aGF0IHdlIGRvbid0IGNyYXNoLgorICAgICAgICBmLnBh cmVudE5vZGUucmVtb3ZlQ2hpbGQoZik7CisgICAgICAgIGFjY2Vzc0F0dHJpYnV0ZXMoZi5jb250 ZW50V2luZG93LnNjcmVlbik7CisgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGlmcmFt ZSBpZD0idGhlZnJhbWUiIHNyYz0icmVzb3VyY2VzL3JlZC5odG1sIj48L2lmcmFtZT4KKzxib2R5 IG9ubG9hZD0icnVuVGVzdHMoKSI+Cis8ZGl2PgorVGhpcyB0ZXN0cyB0aGF0IGFjY2Vzc2luZyBz Y3JlZW4gYXR0cmlidXRlcyBkb2Vzbid0IGNyYXNoIGV2ZW4gaWYgY29udGFpbmluZyBmb3JtIGlz IHJlbW92ZWQgZnJvbSB0aGUgcGFyZW50LgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCA5M2E0NzRiLi5mYWIwODQzIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBA QAorMjAxMC0wMy0wOSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY2VwdCBhbmQgYmFp bG91dCBOVUxMIHdpZGdldHMgaW4gQ2hyb21pdW1CcmlkZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1Nzk2CisKKyAgICAgICAgKiBzcmMvQ2hyb21p dW1CcmlkZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9DaHJvbWVDbGllbnRJbXBsKToKKwog MjAxMC0wMy0wNSAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1 bUJyaWRnZS5jcHAKaW5kZXggMjA5N2UyMS4uMzRkMWY4ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWl1bUJyaWRnZS5jcHAKQEAgLTkyLDYgKzkyLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiBzdGF0aWMgQ2hyb21lQ2xpZW50SW1wbCogdG9DaHJvbWVDbGllbnRJbXBsKFdpZGdldCogd2lk Z2V0KQogeworICAgIGlmICghd2lkZ2V0KQorICAgICAgICByZXR1cm4gMDsKKwogICAgIEZyYW1l VmlldyogdmlldzsKICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKQogICAgICAgICB2aWV3 ID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4od2lkZ2V0KTsK 50307 2010-03-09 07:47:34 -0800 2010-03-09 08:59:38 -0800 Patch bug-35796-20100309184731.patch text/plain 3284 antonm ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZDFkYWFlLi5iOTBlMTRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMt MDkgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NlcHQgYW5kIGJhaWxvdXQgTlVMTCB3 aWRnZXRzIGluIENocm9taXVtQnJpZGdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNTc5NgorCisgICAgICAgICogZmFzdC9mcmFtZXMvaWZyYW1lLWFj Y2Vzcy1zY3JlZW4tb2YtZGVsZXRlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQuaHRtbDogQWRkZWQuCisK IDIwMTAtMDMtMDMgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLWFjY2Vzcy1zY3JlZW4tb2YtZGVsZXRl ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjJkODk4 ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nl c3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorCitUaGlz IHRlc3RzIHRoYXQgYWNjZXNzaW5nIHNjcmVlbiBhdHRyaWJ1dGVzIGRvZXNuJ3QgY3Jhc2ggZXZl biBpZiBjb250YWluaW5nIGZvcm0gaXMgcmVtb3ZlZCBmcm9tIHRoZSBwYXJlbnQuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtYWNjZXNzLXNjcmVlbi1vZi1kZWxl dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtYWNjZXNzLXNjcmVlbi1v Zi1kZWxldGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2ZkNjM5 OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nl c3Mtc2NyZWVuLW9mLWRlbGV0ZWQuaHRtbApAQCAtMCwwICsxLDM2IEBACis8aHRtbD4KKzxoZWFk PgorICAgIDxzY3JpcHQ+CisgICAgZnVuY3Rpb24gYWNjZXNzQXR0cmlidXRlcyhzKSB7CisgICAg ICAgIHZhciB2YWx1ZSA9IDA7CisgICAgICAgIHZhbHVlID0gcy5oZWlnaHQ7CisgICAgICAgIHZh bHVlID0gcy53aWR0aDsKKyAgICAgICAgdmFsdWUgPSBzLmNvbG9yRGVwdGg7CisgICAgICAgIHZh bHVlID0gcy5waXhlbERlcHRoOworICAgICAgICB2YWx1ZSA9IHMuYXZhaWxMZWZ0OworICAgICAg ICB2YWx1ZSA9IHMuYXZhaWxUb3A7CisgICAgICAgIHZhbHVlID0gcy5hdmFpbEhlaWdodDsKKyAg ICAgICAgdmFsdWUgPSBzLmF2YWlsV2lkdGg7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVz dHMoKSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICAKKyAg ICAgICAgdmFyIGYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGhlZnJhbWUnKTsKKyAgICAg ICAgdmFyIHMgPSBmLmNvbnRlbnRXaW5kb3cuc2NyZWVuOworICAgICAgICBhY2Nlc3NBdHRyaWJ1 dGVzKHMpOworCisgICAgICAgIC8vIE5vdyByZW1vdmUgYW5kIGNoZWNrIHRoYXQgd2UgZG9uJ3Qg Y3Jhc2guCisgICAgICAgIGYucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChmKTsKKyAgICAgICAgYWNj ZXNzQXR0cmlidXRlcyhzKTsKKyAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8aWZyYW1l IGlkPSJ0aGVmcmFtZSIgc3JjPSJyZXNvdXJjZXMvcmVkLmh0bWwiPjwvaWZyYW1lPgorPGJvZHkg b25sb2FkPSJydW5UZXN0cygpIj4KKzxkaXY+CitUaGlzIHRlc3RzIHRoYXQgYWNjZXNzaW5nIHNj cmVlbiBhdHRyaWJ1dGVzIGRvZXNuJ3QgY3Jhc2ggZXZlbiBpZiBjb250YWluaW5nIGZvcm0gaXMg cmVtb3ZlZCBmcm9tIHRoZSBwYXJlbnQuCis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCmluZGV4IDkzYTQ3NGIuLmZhYjA4NDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDEwLTAzLTA5ICBBbnRvbiBNdWhpbiAgPGFudG9ubUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXB0IGFuZCBiYWls b3V0IE5VTEwgd2lkZ2V0cyBpbiBDaHJvbWl1bUJyaWRnZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3OTYKKworICAgICAgICAqIHNyYy9DaHJvbWl1 bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0Nocm9tZUNsaWVudEltcGwpOgorCiAy MDEwLTAzLTA1ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVt QnJpZGdlLmNwcAppbmRleCAyMDk3ZTIxLi4zNGQxZjhkIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0No cm9taXVtQnJpZGdlLmNwcApAQCAtOTIsNiArOTIsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHN0YXRpYyBDaHJvbWVDbGllbnRJbXBsKiB0b0Nocm9tZUNsaWVudEltcGwoV2lkZ2V0KiB3aWRn ZXQpCiB7CisgICAgaWYgKCF3aWRnZXQpCisgICAgICAgIHJldHVybiAwOworCiAgICAgRnJhbWVW aWV3KiB2aWV3OwogICAgIGlmICh3aWRnZXQtPmlzRnJhbWVWaWV3KCkpCiAgICAgICAgIHZpZXcg PSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPih3aWRnZXQpOwo= 50312 2010-03-09 08:59:44 -0800 2010-03-09 09:28:46 -0800 Patch bug-35796-20100309195942.patch text/plain 3286 antonm ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZDFkYWFlLi5iOTBlMTRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMt MDkgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NlcHQgYW5kIGJhaWxvdXQgTlVMTCB3 aWRnZXRzIGluIENocm9taXVtQnJpZGdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNTc5NgorCisgICAgICAgICogZmFzdC9mcmFtZXMvaWZyYW1lLWFj Y2Vzcy1zY3JlZW4tb2YtZGVsZXRlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQuaHRtbDogQWRkZWQuCisK IDIwMTAtMDMtMDMgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nlc3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLWFjY2Vzcy1zY3JlZW4tb2YtZGVsZXRl ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2JmZGRl MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1hY2Nl c3Mtc2NyZWVuLW9mLWRlbGV0ZWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorCitUaGlz IHRlc3RzIHRoYXQgYWNjZXNzaW5nIHNjcmVlbiBhdHRyaWJ1dGVzIGRvZXNuJ3QgY3Jhc2ggZXZl biBpZiBjb250YWluaW5nIGZyYW1lIGlzIHJlbW92ZWQgZnJvbSB0aGUgcGFyZW50LgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLWFjY2Vzcy1zY3JlZW4tb2YtZGVs ZXRlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLWFjY2Vzcy1zY3JlZW4t b2YtZGVsZXRlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1OTIx NzMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtYWNj ZXNzLXNjcmVlbi1vZi1kZWxldGVkLmh0bWwKQEAgLTAsMCArMSwzNiBAQAorPGh0bWw+Cis8aGVh ZD4KKyAgICA8c2NyaXB0PgorICAgIGZ1bmN0aW9uIGFjY2Vzc0F0dHJpYnV0ZXMocykgeworICAg ICAgICB2YXIgdmFsdWUgPSAwOworICAgICAgICB2YWx1ZSA9IHMuaGVpZ2h0OworICAgICAgICB2 YWx1ZSA9IHMud2lkdGg7CisgICAgICAgIHZhbHVlID0gcy5jb2xvckRlcHRoOworICAgICAgICB2 YWx1ZSA9IHMucGl4ZWxEZXB0aDsKKyAgICAgICAgdmFsdWUgPSBzLmF2YWlsTGVmdDsKKyAgICAg ICAgdmFsdWUgPSBzLmF2YWlsVG9wOworICAgICAgICB2YWx1ZSA9IHMuYXZhaWxIZWlnaHQ7Cisg ICAgICAgIHZhbHVlID0gcy5hdmFpbFdpZHRoOworICAgIH0KKworICAgIGZ1bmN0aW9uIHJ1blRl c3RzKCkgeworICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAg ICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgCisg ICAgICAgIHZhciBmID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RoZWZyYW1lJyk7CisgICAg ICAgIHZhciBzID0gZi5jb250ZW50V2luZG93LnNjcmVlbjsKKyAgICAgICAgYWNjZXNzQXR0cmli dXRlcyhzKTsKKworICAgICAgICAvLyBOb3cgcmVtb3ZlIGFuZCBjaGVjayB0aGF0IHdlIGRvbid0 IGNyYXNoLgorICAgICAgICBmLnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQoZik7CisgICAgICAgIGFj Y2Vzc0F0dHJpYnV0ZXMocyk7CisgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGlmcmFt ZSBpZD0idGhlZnJhbWUiIHNyYz0icmVzb3VyY2VzL3JlZC5odG1sIj48L2lmcmFtZT4KKzxib2R5 IG9ubG9hZD0icnVuVGVzdHMoKSI+Cis8ZGl2PgorVGhpcyB0ZXN0cyB0aGF0IGFjY2Vzc2luZyBz Y3JlZW4gYXR0cmlidXRlcyBkb2Vzbid0IGNyYXNoIGV2ZW4gaWYgY29udGFpbmluZyBmcmFtZSBp cyByZW1vdmVkIGZyb20gdGhlIHBhcmVudC4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKaW5kZXggOTNhNDc0Yi4uZmFiMDg0MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDMtMDkgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NlcHQgYW5kIGJh aWxvdXQgTlVMTCB3aWRnZXRzIGluIENocm9taXVtQnJpZGdlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTc5NgorCisgICAgICAgICogc3JjL0Nocm9t aXVtQnJpZGdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvQ2hyb21lQ2xpZW50SW1wbCk6CisK IDIwMTAtMDMtMDUgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21p dW1CcmlkZ2UuY3BwCmluZGV4IDIwOTdlMjEuLjM0ZDFmOGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMv Q2hyb21pdW1CcmlkZ2UuY3BwCkBAIC05Miw2ICs5Miw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogc3RhdGljIENocm9tZUNsaWVudEltcGwqIHRvQ2hyb21lQ2xpZW50SW1wbChXaWRnZXQqIHdp ZGdldCkKIHsKKyAgICBpZiAoIXdpZGdldCkKKyAgICAgICAgcmV0dXJuIDA7CisKICAgICBGcmFt ZVZpZXcqIHZpZXc7CiAgICAgaWYgKHdpZGdldC0+aXNGcmFtZVZpZXcoKSkKICAgICAgICAgdmll dyA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHdpZGdldCk7Cg==