99656 2012-10-17 16:46:27 -0700 ASSERT in RenderLayer::hitTestContents can fire 2020-03-14 17:07:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209110 https://bugs.webkit.org/show_bug.cgi?id=209112 P2 Normal --- 66687 1 abarth abarth allan.jensen eric klobag rwlbuis tonikitoo webkit.arunp webkit.review.bot yfriedman yong.li.webkit oldest_to_newest 744781 0 abarth 2012-10-17 16:46:27 -0700 ASSERT in RenderLayer::hitTestContents can fire 744784 1 169298 abarth 2012-10-17 16:48:40 -0700 Created attachment 169298 Patch 744787 2 abarth 2012-10-17 16:50:34 -0700 This patch comes from 6034d2de096bbdaf1be3474b0141c4d57094a956 in the chromium-android branch (for those with access to that source tree). 744802 3 abarth 2012-10-17 17:01:01 -0700 if (!renderer()->hitTest(request, result, hitTestLocation, toLayoutPoint(layerBounds.location() - renderBoxLocation()), hitTestFilter)) { // It's wrong to set innerNode, but then claim that you didn't hit anything, unless it is // a rect-based test. ASSERT(!result.innerNode() || (result.isRectBasedTest() && result.rectBasedTestResult().size())); return false; } Apparently that is the ASSERT that fires. 744847 4 169313 abarth 2012-10-17 17:36:50 -0700 Created attachment 169313 Some attempts at a test 745089 5 169298 allan.jensen 2012-10-18 02:00:56 -0700 Comment on attachment 169298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169298&action=review The patch makes sense. This is is one of those cases that makes me think addNodeToRectBasedResult really should be called from inside updateHitTestResult(). > Source/WebCore/rendering/RenderBlock.h:570 > + Node* nodeForHitTest(); Could be const. 753042 6 171151 webkit.arunp 2012-10-28 21:03:02 -0700 Created attachment 171151 test case I could repro this issue on android JB stock browser and chromium content shell(I had some weeks old content shell code but not the latest one) with attached small test case. You need to touch exactly at the border of image element. Looks to be a problem when hit test point falls in anonymous block. As Adam rightly pointed out, Assert is because we are setting inner node of HitTestResult and also saying that HitTest doesn't found anything by returning false in HitTest function which is incorrect. This is happening because we are using different nodes in RenderBlock::nodeAtPoint and when setting innerNode in RenderBlock::updateHitTestResult. In RenderBlock::updateHitTestResult, in case of anonymous block continuation, we are using continuation()->node() which returns enclosing node i.e. <a> in our case. But in RenderBlock::nodeAtPoint, while calling addNodeToRectBasedTestResult we use "node()" which returns NULL for anonymous blocks. Using same node at both the places fixes the problem. Patch on this bug looks good to me, Antonio can confirm this as from file revisions, looks like mainly he had implememented rect based hittest. 753044 7 webkit.arunp 2012-10-28 21:05:00 -0700 cc Antonio 753978 8 169298 tonikitoo 2012-10-29 21:49:21 -0700 Comment on attachment 169298 Patch could not Internals::nodesFromRect be used to trigger this assert? 754691 9 169298 abarth 2012-10-30 15:07:06 -0700 Comment on attachment 169298 Patch I'm going to try to construct a test based on the comments above. 757325 10 172085 abarth 2012-11-02 10:46:54 -0700 Created attachment 172085 LayoutTest that hits the ASSERT 757329 11 169298 abarth 2012-11-02 10:48:20 -0700 Comment on attachment 169298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169298&action=review >> Source/WebCore/rendering/RenderBlock.h:570 >> + Node* nodeForHitTest(); > > Could be const. Done. 757337 12 tonikitoo 2012-11-02 10:54:54 -0700 CC'ing some BlackBerry people, since it gets hitten for them as well. 757345 13 172087 abarth 2012-11-02 10:59:15 -0700 Created attachment 172087 Patch 757409 14 172087 eric 2012-11-02 11:45:19 -0700 Comment on attachment 172087 Patch Yay! 757449 15 172087 webkit.review.bot 2012-11-02 12:15:52 -0700 Comment on attachment 172087 Patch Clearing flags on attachment: 172087 Committed r133330: <http://trac.webkit.org/changeset/133330> 757451 16 webkit.review.bot 2012-11-02 12:15:57 -0700 All reviewed patches have been landed. Closing bug. 758153 17 172087 tonikitoo 2012-11-04 15:12:34 -0800 Comment on attachment 172087 Patch Nice fix! 758156 18 abarth 2012-11-04 15:51:39 -0800 Thanks. :) 169298 2012-10-17 16:48:40 -0700 2012-11-02 10:59:12 -0700 Patch bug-99656-20121017164726.patch text/plain 5061 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ5ZTNmODZiZTY4YTJi YmFmYWMyZjU0ZWY5N2QyNzg5MmMxZmU1MC4uMTlmYWM3NDJjZjg0ZTEwNWQ0MzVjY2QzMDIxNWY0 MzkyMmIzYzU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTE3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQVNTRVJUIGluIFJlbmRlckxh eWVyOjpoaXRUZXN0Q29udGVudHMgY2FuIGZpcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIGlzIHRoYXQgdXBkYXRlSGl0VGVzdFJlc3Vs dCBhbmQgYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdAorICAgICAgICBhcmUgdXNpbmcgdHdv IGRpZmZlcmVudCBub2Rlcy4gU2luY2UgdGhleSBhcmVuJ3QgY29uc2lzdGVudCwgd2UgdmlvbGF0 ZQorICAgICAgICBhc3NlcnRpb25zIGFib3V0IG9ubHkgc2V0dGluZyB0aGUgaW5uZXIgbm9kZSBp ZiB3ZSdyZSBkb2luZyBhCisgICAgICAgIHJlY3QtYmFzZWQgaGl0IHRlc3QuCisKKyAgICAgICAg V2UgZm91bmQgdGhpcyBpc3N1ZSBieSBydW5uaW5nIGNocm9taXVtLWFuZHJvaWQgd2l0aCBBU1NF UlRzIGVuYWJsZWQuCisgICAgICAgIFVuZm9ydW5hdGVseSwgdGhlcmUgaXNuJ3QgYW55IGluZm9y bWF0aW9uIGluIHRoZSBjaHJvbWl1bS1hbmRyb2lkCisgICAgICAgIGJyYW5jaCBhYm91dCB3aGF0 IGNvbmRpdGlvbnMgYWN0dWFsbHkgdHJpZ2dlciB0aGlzIEFTU0VSVC4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 bm9kZUZvckhpdFRlc3QpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9jazo6bm9kZUF0UG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OnVwZGF0ZUhpdFRlc3RSZXN1bHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5o OgorICAgICAgICAoUmVuZGVyQmxvY2spOgorCiAyMDEyLTEwLTE3ICBDaHJpc3RvcGhlIER1bWV6 ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgeHNzLURFTklFRC14c2wt ZG9jdW1lbnQtc2VjdXJpdHlPcmlnaW4ueG1sIGNyYXNoZXMgd2l0aCBpY29uIGFzc2VydGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggNzk2MTU2YTYwNjQ3 MzJjZDZiNWQ5ODJhMjU3ZTMwMWM0MzRiYjNhYy4uZDBkMGE1NTRkYzc0ODM3ODk3NmQ3NWM2NmJk NTYwNDdiOWJhMGI2NCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC00NzEwLDYgKzQ3MTAsMTQgQEAgYm9vbCBSZW5kZXJCbG9jazo6aXNQb2ludEluT3ZlcmZs b3dDb250cm9sKEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG8KICAgICByZXR1 cm4gbGF5ZXIoKS0+aGl0VGVzdE92ZXJmbG93Q29udHJvbHMocmVzdWx0LCByb3VuZGVkSW50UG9p bnQobG9jYXRpb25JbkNvbnRhaW5lciAtIHRvTGF5b3V0U2l6ZShhY2N1bXVsYXRlZE9mZnNldCkp KTsKIH0KIAorTm9kZSogUmVuZGVyQmxvY2s6Om5vZGVGb3JIaXRUZXN0KCkKK3sKKyAgICAvLyBJ ZiB3ZSBhcmUgaW4gdGhlIG1hcmdpbnMgb2YgYmxvY2sgZWxlbWVudHMgdGhhdCBhcmUgcGFydCBv ZiBhCisgICAgLy8gY29udGludWF0aW9uIHdlJ3JlIGFjdHVhbGx5IHN0aWxsIGluc2lkZSB0aGUg ZW5jbG9zaW5nIGVsZW1lbnQKKyAgICAvLyB0aGF0IHdhcyBzcGxpdC4gVXNlIHRoZSBhcHByb3By aWF0ZSBpbm5lciBub2RlLgorICAgIHJldHVybiBpc0Fub255bW91c0Jsb2NrQ29udGludWF0aW9u KCkgPyBjb250aW51YXRpb24oKS0+bm9kZSgpIDogbm9kZSgpOworfQorCiBib29sIFJlbmRlckJs b2NrOjpub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJl c3VsdCYgcmVzdWx0LCBjb25zdCBIaXRUZXN0TG9jYXRpb24mIGxvY2F0aW9uSW5Db250YWluZXIs IGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFjdGlvbiBoaXRU ZXN0QWN0aW9uKQogewogICAgIExheW91dFBvaW50IGFkanVzdGVkTG9jYXRpb24oYWNjdW11bGF0 ZWRPZmZzZXQgKyBsb2NhdGlvbigpKTsKQEAgLTQ3MjcsNyArNDczNSw3IEBAIGJvb2wgUmVuZGVy QmxvY2s6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0 UmVzdWx0JiByZXN1CiAgICAgaWYgKChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RCbG9ja0JhY2tn cm91bmQgfHwgaGl0VGVzdEFjdGlvbiA9PSBIaXRUZXN0Q2hpbGRCbG9ja0JhY2tncm91bmQpICYm IGlzUG9pbnRJbk92ZXJmbG93Q29udHJvbChyZXN1bHQsIGxvY2F0aW9uSW5Db250YWluZXIucG9p bnQoKSwgYWRqdXN0ZWRMb2NhdGlvbikpIHsKICAgICAgICAgdXBkYXRlSGl0VGVzdFJlc3VsdChy ZXN1bHQsIGxvY2F0aW9uSW5Db250YWluZXIucG9pbnQoKSAtIGxvY2FsT2Zmc2V0KTsKICAgICAg ICAgLy8gRklYTUU6IGlzUG9pbnRJbk92ZXJmbG93Q29udHJvbCgpIGRvZXNuJ3QgaGFuZGxlIHJl Y3QtYmFzZWQgdGVzdHMgeWV0LgotICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFz ZWRUZXN0UmVzdWx0KG5vZGUoKSwgcmVxdWVzdCwgbG9jYXRpb25JbkNvbnRhaW5lcikpCisgICAg ICAgIGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQobm9kZUZvckhpdFRl c3QoKSwgcmVxdWVzdCwgbG9jYXRpb25JbkNvbnRhaW5lcikpCiAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIApAQCAtNDc2MCw3ICs0NzY4LDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6bm9k ZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJl c3UKICAgICAgICAgTGF5b3V0UmVjdCBib3VuZHNSZWN0KGFkanVzdGVkTG9jYXRpb24sIHNpemUo KSk7CiAgICAgICAgIGlmICh2aXNpYmxlVG9IaXRUZXN0aW5nKCkgJiYgbG9jYXRpb25JbkNvbnRh aW5lci5pbnRlcnNlY3RzKGJvdW5kc1JlY3QpKSB7CiAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0 UmVzdWx0KHJlc3VsdCwgZmxpcEZvcldyaXRpbmdNb2RlKGxvY2F0aW9uSW5Db250YWluZXIucG9p bnQoKSAtIGxvY2FsT2Zmc2V0KSk7Ci0gICAgICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9S ZWN0QmFzZWRUZXN0UmVzdWx0KG5vZGUoKSwgcmVxdWVzdCwgbG9jYXRpb25JbkNvbnRhaW5lciwg Ym91bmRzUmVjdCkpCisgICAgICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRU ZXN0UmVzdWx0KG5vZGVGb3JIaXRUZXN0KCksIHJlcXVlc3QsIGxvY2F0aW9uSW5Db250YWluZXIs IGJvdW5kc1JlY3QpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAg ICAgfQpAQCAtNjgxOSwxNCArNjgyNyw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUhpdFRl c3RSZXN1bHQoSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYKICAgICBp ZiAocmVzdWx0LmlubmVyTm9kZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBOb2RlKiBuID0g bm9kZSgpOwotICAgIGlmIChpc0Fub255bW91c0Jsb2NrQ29udGludWF0aW9uKCkpCi0gICAgICAg IC8vIFdlIGFyZSBpbiB0aGUgbWFyZ2lucyBvZiBibG9jayBlbGVtZW50cyB0aGF0IGFyZSBwYXJ0 IG9mIGEgY29udGludWF0aW9uLiAgSW4KLSAgICAgICAgLy8gdGhpcyBjYXNlIHdlJ3JlIGFjdHVh bGx5IHN0aWxsIGluc2lkZSB0aGUgZW5jbG9zaW5nIGVsZW1lbnQgdGhhdCB3YXMKLSAgICAgICAg Ly8gc3BsaXQuICBHbyBhaGVhZCBhbmQgc2V0IG91ciBpbm5lciBub2RlIGFjY29yZGluZ2x5Lgot ICAgICAgICBuID0gY29udGludWF0aW9uKCktPm5vZGUoKTsKLQotICAgIGlmIChuKSB7CisgICAg aWYgKE5vZGUqIG4gPSBub2RlRm9ySGl0VGVzdCgpKSB7CiAgICAgICAgIHJlc3VsdC5zZXRJbm5l ck5vZGUobik7CiAgICAgICAgIGlmICghcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpKQogICAg ICAgICAgICAgcmVzdWx0LnNldElubmVyTm9uU2hhcmVkTm9kZShuKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggMjRjY2U5OWI0NzQ3ZTVmZjkxNWQ0MDdhNzk3MjEx NTY4MTQwNzNlNy4uZmI4MTkzMDAzMjM2MGE2MmY5MzE5YmNiODI2NGMwZDFjYWJkNGM2OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTU2Nyw2ICs1NjcsOCBAQCBw cml2YXRlOgogICAgIHZvaWQgY3JlYXRlRmlyc3RMZXR0ZXJSZW5kZXJlcihSZW5kZXJPYmplY3Qq IGZpcnN0TGV0dGVyQmxvY2ssIFJlbmRlck9iamVjdCogY3VycmVudENoaWxkKTsKICAgICB2b2lk IHVwZGF0ZUZpcnN0TGV0dGVyU3R5bGUoUmVuZGVyT2JqZWN0KiBmaXJzdExldHRlckJsb2NrLCBS ZW5kZXJPYmplY3QqIGZpcnN0TGV0dGVyQ29udGFpbmVyKTsKIAorICAgIE5vZGUqIG5vZGVGb3JI aXRUZXN0KCk7CisKICAgICBzdHJ1Y3QgRmxvYXRXaXRoUmVjdCB7CiAgICAgICAgIEZsb2F0V2l0 aFJlY3QoUmVuZGVyQm94KiBmKQogICAgICAgICAgICAgOiBvYmplY3QoZikK 169313 2012-10-17 17:36:50 -0700 2012-11-02 10:46:54 -0700 Some attempts at a test test.html text/html 624 abarth PHN0eWxlPg0Kc3BhbiB7DQogIHBhZGRpbmctcmlnaHQ6IDMwMHB4Ow0KICBiYWNrZ3JvdW5kLWNv bG9yOiBibHVlOw0KfQ0KZGl2IHsNCiAgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93Ow0KfQ0KPC9z dHlsZT4NCjxzcGFuIGlkPSJmb28iIG9udG91Y2hzdGFydD0iYWxlcnQoJ3RvdWNoZWQnKSI+Rm9v PGRpdj5iYXI8L2Rpdj5iYXo8L3NwYW4+DQo8c2NyaXB0Pg0KDQppZiAod2luZG93LnRlc3RSdW5u ZXIpDQogICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7DQoNCmlmICh3aW5kb3cuZXZlbnRTZW5k ZXIpIHsNCiAgICBldmVudFNlbmRlci5jbGVhclRvdWNoUG9pbnRzKCk7DQoNCiAgICBpZiAoZXZl bnRTZW5kZXIuc2V0VG91Y2hQb2ludFJhZGl1cykgew0KICAgICAgICBldmVudFNlbmRlci5zZXRU b3VjaFBvaW50UmFkaXVzKDAsIDApOw0KICAgIH0NCg0KICAgIGV2ZW50U2VuZGVyLmFkZFRvdWNo UG9pbnQoMjUsIDI1KTsNCiAgICBldmVudFNlbmRlci50b3VjaFN0YXJ0KCk7DQogICAgZXZlbnRT ZW5kZXIucmVsZWFzZVRvdWNoUG9pbnQoMCk7DQogICAgZXZlbnRTZW5kZXIudG91Y2hFbmQoKTsN Cg0KICAgIGV2ZW50U2VuZGVyLmNsZWFyVG91Y2hQb2ludHMoKTsNCn0NCjwvc2NyaXB0Pg0K 171151 2012-10-28 21:03:02 -0700 2012-11-02 10:46:54 -0700 test case anonymous-block-hittest.html text/html 312 webkit.arunp PGh0bWw+Cjxib2R5IHN0eWxlPSJiYWNrZ3JvdW5kOmdyYXk7Ij4KICA8YXJ0aWNsZSBzdHlsZT0i d2lkdGg6MTAwcHg7cG9zaXRpb246cmVsYXRpdmU7Ij4KICAgIDxhIGlkPSJhbmNob3IiIGhyZWY9 Imh0dHA6Ly93d3cuZ29vZ2xlLmNvbSI+CiAgICAgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxh dGl2ZTsiPgogICAgICAgIDxpbWcgYWx0PSJUZXN0IGltYWdlIiBzdHlsZT0ibWF4LXdpZHRoOiAx MDBweDsiIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIj4KICAgICAgPC9kaXY+CiAgICA8L2E+CiAg PC9hcnRpY2xlPgo8L2JvZHk+CjwvaHRtbD4K 172085 2012-11-02 10:46:54 -0700 2012-11-02 10:46:54 -0700 LayoutTest that hits the ASSERT test.html text/html 639 abarth PGh0bWw+CjxoZWFkPgo8c2NyaXB0PgppZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICB0ZXN0UnVu bmVyLmR1bXBBc1RleHQoKTsKCndpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKICAgIGlmICgh d2luZG93LmludGVybmFscykKICAgICAgICBhbGVydCgiVGhpcyB0ZXN0IHJlcXVpcmVzIHdpbmRv dy5pbnRlcm5hbHMiKTsKICAgIHZhciBub2RlcyA9IGludGVybmFscy5ub2Rlc0Zyb21SZWN0KGRv Y3VtZW50LCAxMDAsIDEwMCwgMjAsIDIwLCAyMCwgMjAsIGZhbHNlLCBmYWxzZSk7CiAgICBhbGVy dCgiUEFTUzogVGhpcyB0ZXN0IGRpZCBub3QgdHJpZ2dlciBhbiBBU1NFUlQiKTsKfTsKPC9zY3Jp cHQ+CjwvaGVhZD4KPGJvZHkgc3R5bGU9ImJhY2tncm91bmQ6Z3JheTsiPgogIDxhcnRpY2xlIHN0 eWxlPSJ3aWR0aDoxMDBweDtwb3NpdGlvbjpyZWxhdGl2ZTsiPgogICAgPGEgaWQ9ImFuY2hvciIg aHJlZj0iIyI+CiAgICAgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZTsiPgogICAgICAg IDxpbWcgYWx0PSJUZXN0IGltYWdlIiBzdHlsZT0ibWF4LXdpZHRoOiAxMDBweDsiIGhlaWdodD0i MTAwIiB3aWR0aD0iMTAwIj4KICAgICAgPC9kaXY+CiAgICA8L2E+CiAgPC9hcnRpY2xlPgo8L2Jv ZHk+CjwvaHRtbD4K 172087 2012-11-02 10:59:15 -0700 2012-11-04 15:12:34 -0800 Patch bug-99656-20121102105818.patch text/plain 7268 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyOTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU1M2ZmNzVlOWQ0OWEx MjJmNmZhNmRkYjAyMThmODUzY2VkZDYxNy4uODdkNDljNmZhZjNmNzM4NTc0NGZhMzY0NmU3MjVm Nzc0NmZlNjk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTExLTAyICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQVNTRVJUIGluIFJlbmRlckxh eWVyOjpoaXRUZXN0Q29udGVudHMgY2FuIGZpcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIGlzIHRoYXQgdXBkYXRlSGl0VGVzdFJlc3Vs dCBhbmQgYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdAorICAgICAgICBhcmUgdXNpbmcgdHdv IGRpZmZlcmVudCBub2Rlcy4gU2luY2UgdGhleSBhcmVuJ3QgY29uc2lzdGVudCwgd2UgdmlvbGF0 ZQorICAgICAgICBhc3NlcnRpb25zIGFib3V0IG9ubHkgc2V0dGluZyB0aGUgaW5uZXIgbm9kZSBp ZiB3ZSdyZSBkb2luZyBhCisgICAgICAgIHJlY3QtYmFzZWQgaGl0IHRlc3QuIFRoaXMgcGF0Y2gg bWFrZXMgdGhlIHR3byBjb25zaXN0ZW50LgorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL25vZGVz RnJvbVJlY3Qvbm9kZXNGcm9tUmVjdC1jb250aW51YXRpb24tY3Jhc2guaHRtbAorCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrOjpub2RlRm9ySGl0VGVzdCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJsb2NrOjpub2RlQXRQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9jazo6dXBkYXRlSGl0VGVzdFJlc3VsdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJs b2NrLmg6CisgICAgICAgIChSZW5kZXJCbG9jayk6CisKIDIwMTItMTAtMzAgIFcuIEphbWVzIE1h Y0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVz dHJpY3QgbGluayBoaWdobGlnaHRzIHRvIHRhcmdldHMgdGhhdCBkaXNwbGF5IGEgaGFuZC1jdXJz b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGNkYTlkNDI3 YmQ5NGJkOTdkNDhhNGI4ZjMxN2Y3OTA4M2EwNzllMzIuLjJjNzY2YjJhNjUyNjk2OTQ2ZjE5M2Vl NGNiNjRkZTE4NTJiYmQ1ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcApAQCAtNDcxNiw2ICs0NzE2LDE0IEBAIGJvb2wgUmVuZGVyQmxvY2s6OmlzUG9pbnRJbk92 ZXJmbG93Q29udHJvbChIaXRUZXN0UmVzdWx0JiByZXN1bHQsIGNvbnN0IExheW91dFBvCiAgICAg cmV0dXJuIGxheWVyKCktPmhpdFRlc3RPdmVyZmxvd0NvbnRyb2xzKHJlc3VsdCwgcm91bmRlZElu dFBvaW50KGxvY2F0aW9uSW5Db250YWluZXIgLSB0b0xheW91dFNpemUoYWNjdW11bGF0ZWRPZmZz ZXQpKSk7CiB9CiAKK05vZGUqIFJlbmRlckJsb2NrOjpub2RlRm9ySGl0VGVzdCgpIGNvbnN0Cit7 CisgICAgLy8gSWYgd2UgYXJlIGluIHRoZSBtYXJnaW5zIG9mIGJsb2NrIGVsZW1lbnRzIHRoYXQg YXJlIHBhcnQgb2YgYQorICAgIC8vIGNvbnRpbnVhdGlvbiB3ZSdyZSBhY3R1YWxseSBzdGlsbCBp bnNpZGUgdGhlIGVuY2xvc2luZyBlbGVtZW50CisgICAgLy8gdGhhdCB3YXMgc3BsaXQuIFVzZSB0 aGUgYXBwcm9wcmlhdGUgaW5uZXIgbm9kZS4KKyAgICByZXR1cm4gaXNBbm9ueW1vdXNCbG9ja0Nv bnRpbnVhdGlvbigpID8gY29udGludWF0aW9uKCktPm5vZGUoKSA6IG5vZGUoKTsKK30KKwogYm9v bCBSZW5kZXJCbG9jazo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3Qs IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2NhdGlvbklu Q29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RB Y3Rpb24gaGl0VGVzdEFjdGlvbikKIHsKICAgICBMYXlvdXRQb2ludCBhZGp1c3RlZExvY2F0aW9u KGFjY3VtdWxhdGVkT2Zmc2V0ICsgbG9jYXRpb24oKSk7CkBAIC00NzMzLDcgKzQ3NDEsNyBAQCBi b29sIFJlbmRlckJsb2NrOjpub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVz dCwgSGl0VGVzdFJlc3VsdCYgcmVzdQogICAgIGlmICgoaGl0VGVzdEFjdGlvbiA9PSBIaXRUZXN0 QmxvY2tCYWNrZ3JvdW5kIHx8IGhpdFRlc3RBY3Rpb24gPT0gSGl0VGVzdENoaWxkQmxvY2tCYWNr Z3JvdW5kKSAmJiBpc1BvaW50SW5PdmVyZmxvd0NvbnRyb2wocmVzdWx0LCBsb2NhdGlvbkluQ29u dGFpbmVyLnBvaW50KCksIGFkanVzdGVkTG9jYXRpb24pKSB7CiAgICAgICAgIHVwZGF0ZUhpdFRl c3RSZXN1bHQocmVzdWx0LCBsb2NhdGlvbkluQ29udGFpbmVyLnBvaW50KCkgLSBsb2NhbE9mZnNl dCk7CiAgICAgICAgIC8vIEZJWE1FOiBpc1BvaW50SW5PdmVyZmxvd0NvbnRyb2woKSBkb2Vzbid0 IGhhbmRsZSByZWN0LWJhc2VkIHRlc3RzIHlldC4KLSAgICAgICAgaWYgKCFyZXN1bHQuYWRkTm9k ZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChub2RlKCksIHJlcXVlc3QsIGxvY2F0aW9uSW5Db250YWlu ZXIpKQorICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KG5v ZGVGb3JIaXRUZXN0KCksIHJlcXVlc3QsIGxvY2F0aW9uSW5Db250YWluZXIpKQogICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTQ3NjYsNyArNDc3NCw3IEBAIGJvb2wgUmVuZGVy QmxvY2s6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0 UmVzdWx0JiByZXN1CiAgICAgICAgIExheW91dFJlY3QgYm91bmRzUmVjdChhZGp1c3RlZExvY2F0 aW9uLCBzaXplKCkpOwogICAgICAgICBpZiAodmlzaWJsZVRvSGl0VGVzdGluZygpICYmIGxvY2F0 aW9uSW5Db250YWluZXIuaW50ZXJzZWN0cyhib3VuZHNSZWN0KSkgewogICAgICAgICAgICAgdXBk YXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIGZsaXBGb3JXcml0aW5nTW9kZShsb2NhdGlvbkluQ29u dGFpbmVyLnBvaW50KCkgLSBsb2NhbE9mZnNldCkpOwotICAgICAgICAgICAgaWYgKCFyZXN1bHQu YWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChub2RlKCksIHJlcXVlc3QsIGxvY2F0aW9uSW5D b250YWluZXIsIGJvdW5kc1JlY3QpKQorICAgICAgICAgICAgaWYgKCFyZXN1bHQuYWRkTm9kZVRv UmVjdEJhc2VkVGVzdFJlc3VsdChub2RlRm9ySGl0VGVzdCgpLCByZXF1ZXN0LCBsb2NhdGlvbklu Q29udGFpbmVyLCBib3VuZHNSZWN0KSkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICAgICAgfQogICAgIH0KQEAgLTY4MjYsMTQgKzY4MzQsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjp1 cGRhdGVIaXRUZXN0UmVzdWx0KEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9p bnQmCiAgICAgaWYgKHJlc3VsdC5pbm5lck5vZGUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg Tm9kZSogbiA9IG5vZGUoKTsKLSAgICBpZiAoaXNBbm9ueW1vdXNCbG9ja0NvbnRpbnVhdGlvbigp KQotICAgICAgICAvLyBXZSBhcmUgaW4gdGhlIG1hcmdpbnMgb2YgYmxvY2sgZWxlbWVudHMgdGhh dCBhcmUgcGFydCBvZiBhIGNvbnRpbnVhdGlvbi4gIEluCi0gICAgICAgIC8vIHRoaXMgY2FzZSB3 ZSdyZSBhY3R1YWxseSBzdGlsbCBpbnNpZGUgdGhlIGVuY2xvc2luZyBlbGVtZW50IHRoYXQgd2Fz Ci0gICAgICAgIC8vIHNwbGl0LiAgR28gYWhlYWQgYW5kIHNldCBvdXIgaW5uZXIgbm9kZSBhY2Nv cmRpbmdseS4KLSAgICAgICAgbiA9IGNvbnRpbnVhdGlvbigpLT5ub2RlKCk7Ci0KLSAgICBpZiAo bikgeworICAgIGlmIChOb2RlKiBuID0gbm9kZUZvckhpdFRlc3QoKSkgewogICAgICAgICByZXN1 bHQuc2V0SW5uZXJOb2RlKG4pOwogICAgICAgICBpZiAoIXJlc3VsdC5pbm5lck5vblNoYXJlZE5v ZGUoKSkKICAgICAgICAgICAgIHJlc3VsdC5zZXRJbm5lck5vblNoYXJlZE5vZGUobik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4IDU2N2Q3ZGNiNGMzZWFhMDI4MTQ5 ODY0NDE5ODJkYmFjZmQyMDAzYmUuLmI1MzcxY2YxNzYzODRlODkyNjVjYzUxMGI3MjQyOTU5YWQ4 OWZmODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC01NjgsNiAr NTY4LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZUZpcnN0TGV0dGVyUmVuZGVyZXIoUmVu ZGVyT2JqZWN0KiBmaXJzdExldHRlckJsb2NrLCBSZW5kZXJPYmplY3QqIGN1cnJlbnRDaGlsZCk7 CiAgICAgdm9pZCB1cGRhdGVGaXJzdExldHRlclN0eWxlKFJlbmRlck9iamVjdCogZmlyc3RMZXR0 ZXJCbG9jaywgUmVuZGVyT2JqZWN0KiBmaXJzdExldHRlckNvbnRhaW5lcik7CiAKKyAgICBOb2Rl KiBub2RlRm9ySGl0VGVzdCgpIGNvbnN0OworCiAgICAgc3RydWN0IEZsb2F0V2l0aFJlY3Qgewog ICAgICAgICBGbG9hdFdpdGhSZWN0KFJlbmRlckJveCogZikKICAgICAgICAgICAgIDogb2JqZWN0 KGYpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggMjU0MWRhOTU0MmQ3N2MzYTYxY2U2Mjg3ODgwNWQ5MmY3MjU3MWM1ZS4uZTg0 NTJlZGMxZWQxNDA5NjhhYzZjMGUyZTQ2YzhhNmM2YzZjNWRlZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTExLTAyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgQVNTRVJUIGluIFJlbmRlckxheWVyOjpoaXRUZXN0Q29udGVudHMgY2FuIGZpcmUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjU2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB0ZXN0IGVuc3Vy ZXMgdGhhdCB3ZSBkb24ndCB0cmlnZ2VyIHRoZSBhc3NlcnQuCisKKyAgICAgICAgKiBmYXN0L2Rv bS9ub2Rlc0Zyb21SZWN0L25vZGVzRnJvbVJlY3QtY29udGludWF0aW9uLWNyYXNoLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9kb20vbm9kZXNGcm9tUmVjdC9ub2Rlc0Zyb21S ZWN0LWNvbnRpbnVhdGlvbi1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAxMi0xMC0zMCAgVy4gSmFt ZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt XSBSZXN0cmljdCBsaW5rIGhpZ2hsaWdodHMgdG8gdGFyZ2V0cyB0aGF0IGRpc3BsYXkgYSBoYW5k LWN1cnNvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbm9kZXNGcm9tUmVjdC9u b2Rlc0Zyb21SZWN0LWNvbnRpbnVhdGlvbi1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9ub2Rlc0Zyb21SZWN0L25vZGVzRnJvbVJlY3QtY29udGludWF0aW9uLWNyYXNo LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41MjY0N2Y1MDMwZDBmMjVlNmM1YTFiZGZiODI4ODhh ZmM3ZjA1NTNiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vbm9kZXNG cm9tUmVjdC9ub2Rlc0Zyb21SZWN0LWNvbnRpbnVhdGlvbi1jcmFzaC1leHBlY3RlZC50eHQKQEAg LTAsMCArMSwzIEBACitBTEVSVDogUEFTUzogVGhpcyB0ZXN0IGRpZCBub3QgdHJpZ2dlciBhbiBB U1NFUlQKKyAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbm9kZXNGcm9tUmVj dC9ub2Rlc0Zyb21SZWN0LWNvbnRpbnVhdGlvbi1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9kb20vbm9kZXNGcm9tUmVjdC9ub2Rlc0Zyb21SZWN0LWNvbnRpbnVhdGlvbi1jcmFzaC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmFmZmE1ZTUxMWVjNzdmZDQwMDJjYmYxNjk5OTRmMmQwNWRjNTQ2OGEKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9ub2Rlc0Zyb21SZWN0L25vZGVz RnJvbVJlY3QtY29udGludWF0aW9uLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPGh0bWw+ Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5l ci5kdW1wQXNUZXh0KCk7CisKK3dpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICBpZiAo IXdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIGFsZXJ0KCJUaGlzIHRlc3QgcmVxdWlyZXMgd2lu ZG93LmludGVybmFscyIpOworICAgIHZhciBub2RlcyA9IGludGVybmFscy5ub2Rlc0Zyb21SZWN0 KGRvY3VtZW50LCAxMDAsIDEwMCwgMjAsIDIwLCAyMCwgMjAsIGZhbHNlLCBmYWxzZSk7CisgICAg YWxlcnQoIlBBU1M6IFRoaXMgdGVzdCBkaWQgbm90IHRyaWdnZXIgYW4gQVNTRVJUIik7Cit9Owor PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBzdHlsZT0iYmFja2dyb3VuZDpncmF5OyI+CisgIDxh cnRpY2xlIHN0eWxlPSJ3aWR0aDoxMDBweDtwb3NpdGlvbjpyZWxhdGl2ZTsiPgorICAgIDxhIGlk PSJhbmNob3IiIGhyZWY9IiMiPgorICAgICAgPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZl OyI+CisgICAgICAgIDxpbWcgYWx0PSJUZXN0IGltYWdlIiBzdHlsZT0ibWF4LXdpZHRoOiAxMDBw eDsiIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIj4KKyAgICAgIDwvZGl2PgorICAgIDwvYT4KKyAg PC9hcnRpY2xlPgorPC9ib2R5PgorPC9odG1sPgo=