97216 2012-09-20 08:04:34 -0700 [Qt] Large areas highlighted on touch 2012-11-20 08:03:45 -0800 1 1 1 Unclassified WebKit WebKit2 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76773 1 allan.jensen allan.jensen abecsi hausmann laszlo.gombos oldest_to_newest 724524 0 allan.jensen 2012-09-20 08:04:34 -0700 In some situations we can still end up highlighting a large area if the document has an onclick handler. To avoid all these issues I suggest putting a area limit on non-link, non-form elements with click eventhandlers that can be highlighted. 724528 1 164919 allan.jensen 2012-09-20 08:07:00 -0700 Created attachment 164919 Patch 724531 2 164919 allan.jensen 2012-09-20 08:12:11 -0700 Comment on attachment 164919 Patch Wrong version uploaded. 724538 3 164923 allan.jensen 2012-09-20 08:18:10 -0700 Created attachment 164923 Patch 724580 4 164923 abecsi 2012-09-20 09:47:58 -0700 Comment on attachment 164923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164923&action=review Thanks for fixing, this was really annoying. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1588 > + if (boxSize.area() > 100000 > + && (boxSize.width() > 200 && boxSize.height() > 200)) > + activationNode = 0; Hmm, 100000 feels a bit big to me. Wouldn't this still highlight narrow but long areas? Let's say 200 * 500? I wonder how to better decide this threshold. 725187 5 164923 kenneth 2012-09-20 23:24:31 -0700 Comment on attachment 164923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164923&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1581 > + if (activationNode && !activationNode->isMouseFocusable() && !activationNode->isContentEditable() && !activationNode->isLink()) { How to make sure this "list" is always up to date? > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1587 > + if (boxSize.area() > 100000 > + && (boxSize.width() > 200 && boxSize.height() > 200)) could be one line or the style guide says to add braces 725336 6 allan.jensen 2012-09-21 02:57:04 -0700 (In reply to comment #4) > (From update of attachment 164923 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164923&action=review > > Thanks for fixing, this was really annoying. > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1588 > > + if (boxSize.area() > 100000 > > + && (boxSize.width() > 200 && boxSize.height() > 200)) > > + activationNode = 0; > > Hmm, 100000 feels a bit big to me. Wouldn't this still highlight narrow but long areas? Let's say 200 * 500? > I wonder how to better decide this threshold. I made it quite big on purpose, and the cases it is designed to stop are actually much larger. 100000 does seem big, but it is just 333x333, which is 1x1 inch on a high dpi screen. (In reply to comment #5) > (From update of attachment 164923 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164923&action=review > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1581 > > + if (activationNode && !activationNode->isMouseFocusable() && !activationNode->isContentEditable() && !activationNode->isLink()) { > > How to make sure this "list" is always up to date? > Hopefully it wouldn't need to be updated. New special shadow elements can be added, but I can't think of any that we would like to highlight, that would be large and neither focusable or a link. 725380 7 164923 kenneth 2012-09-21 03:31:42 -0700 Comment on attachment 164923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164923&action=review >>> Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1588 >>> + activationNode = 0; >> >> Hmm, 100000 feels a bit big to me. Wouldn't this still highlight narrow but long areas? Let's say 200 * 500? >> I wonder how to better decide this threshold. > > I made it quite big on purpose, and the cases it is designed to stop are actually much larger. 100000 does seem big, but it is just 333x333, which is 1x1 inch on a high dpi screen. > > (In reply to comment #5) Then tht is a good comment to add. I actually think that one inch is a good size, but you should maybe make the value dependent on device-pixel-ratio. int oneInchArea... 745103 8 abecsi 2012-10-18 02:30:45 -0700 Allan, what is the state of this bug? 745111 9 allan.jensen 2012-10-18 02:56:34 -0700 (In reply to comment #8) > Allan, what is the state of this bug? I haven't updated it to use DPI yet. Mostly because I am not sure 1"x1" is any less arbitrary than 300x300. 745139 10 169386 allan.jensen 2012-10-18 03:48:43 -0700 Created attachment 169386 Alternative Patch This is an alternative solution to the problem. This restricts the highlighting of scripted event-handlers to inline elements. In theory big areas could still to be highlighted if someone puts the scripted event-handler on an inline-block element that is actually used as normal block element, but that seems extremely unlike. 771804 11 abecsi 2012-11-20 06:17:27 -0800 (In reply to comment #10) > Created an attachment (id=169386) [details] > Alternative Patch > > This is an alternative solution to the problem. This restricts the highlighting of scripted event-handlers to inline elements. In theory big areas could still to be highlighted if someone puts the scripted event-handler on an inline-block element that is actually used as normal block element, but that seems extremely unlike. This approach works for all the sites I noticed the issue on, and I couldn't reproduce the problem with the patch. I also like this better because it seems to do the right thing instead of introducing fishy heuristics based on area size. Looks good to me. 771851 12 164923 hausmann 2012-11-20 07:32:24 -0800 Comment on attachment 164923 Patch Marking this one as obsolete given r+ on the smaller alternative version :) 771876 13 allan.jensen 2012-11-20 08:03:45 -0800 Committed r135280: <http://trac.webkit.org/changeset/135280> 164919 2012-09-20 08:07:00 -0700 2012-09-20 08:12:11 -0700 Patch bug-97216-20120920170614.patch text/plain 2383 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDNhYmJmOWZjZTYzYzhm MjI4MjAzNDE3MzlmNDM0YmJhYmYzN2RjNy4uZWU5ZmYxZWUzZGZjMGE2OTc3NTViYzRkNTBmZDAy NWU4ODY5NWY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTGFyZ2UgYXJlYXMgaGlnaGxpZ2h0ZWQgb24gdG91Y2guCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzIxNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBlbGVtZW50cyB0aGF0IGFyZSBub3QgZm9y bXMsIGxpbmtzIG9yIGNvbnRlbnQtZWRpdGFibGUsIGVuZm9yY2UgYW4gYXJlYSBsaW1pdC4KKyAg ICAgICAgVGhpcyBpcyB0byBhdm9pZCBoaWdobGlnaHRpbmcgbGFyZ2UgYXJlYXMgd2l0aCBldmVu dCBsaXN0ZW5lcnMsIGJ1dCBzdGlsbCBlbnN1cmUKKyAgICAgICAgd2UgaGlnaGxpZ2h0IHNtYWxs IFdlYkFwcCBjb250cm9scy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aGlnaGxpZ2h0UG90ZW50aWFsQWN0aXZh dGlvbik6CisKIDIwMTItMDktMjAgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFtFRkxdIENoYW5nZSB0aGUgbG9nIG1hY3JvIG5hbWVzIHRvIGJlIG1v cmUgY29uc2lzdGVudCB3aXRoIEVJTkEgTE9HCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNzUwOTgzMTY5MzQ3YjQzZjdkYjAyMGU4NDFjMTU3 ZTAwMDI4OTRmMS4uZjliNTAwNTAwNmRhMjliN2M1NDRjMTk0YTRhN2RiNTFkOGNmMTRiMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTU3 OCwxMCArMTU3OCwyMSBAQCB2b2lkIFdlYlBhZ2U6OmhpZ2hsaWdodFBvdGVudGlhbEFjdGl2YXRp b24oY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBJbnRTaXplJgogICAgICAgICAgICAgICAg IGFjdGl2YXRpb25Ob2RlID0gbm9kZTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGlmIChub2RlLT5yZW5kZXJlcigpICYmIG5vZGUtPnJlbmRlcmVy KCktPmlzSW5saW5lKCkpCi0gICAgICAgICAgICAgICAgYWN0aXZhdGlvbk5vZGUgPSBub2RlOwot ICAgICAgICAgICAgZWxzZSBpZiAoYWN0aXZhdGlvbk5vZGUpCi0gICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFhY3RpdmF0aW9uTm9kZSkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBpZiAoIWFjdGl2YXRpb25Ob2RlLT5pc01vdXNlRm9jdXNhYmxl KCkgfHwgIWFjdGl2YXRpb25Ob2RlLT5pc0NvbnRlbnRFZGl0YWJsZSgpIHx8ICFhY3RpdmF0aW9u Tm9kZS0+aXNMaW5rKCkpIHsKKyAgICAgICAgICAgIC8vIENoZWNrIGZvciBzYW5pdHksIHdlIGRv IG5vdCB3YW50IHRvIGhpZ2hsaWdodCB0b28gbGFyZ2UgYXJlYXMgdW5sZXNzIHdlIHRoZXkgYXJl IGZvcm0tZWxlbWVudHMKKyAgICAgICAgICAgIC8vIG9yIGltYWdlIGxpbmtzLgorICAgICAgICAg ICAgaWYgKGFjdGl2YXRpb25Ob2RlLT5yZW5kZXJlcigpICYmIGFjdGl2YXRpb25Ob2RlLT5yZW5k ZXJlcigpLT5pc0JveCgpKSB7CisgICAgICAgICAgICAgICAgUmVuZGVyQm94KiByZW5kZXJCb3gg PSB0b1JlbmRlckJveChhY3RpdmF0aW9uTm9kZS0+cmVuZGVyZXIoKSk7CisgICAgICAgICAgICAg ICAgSW50U2l6ZSBib3hTaXplID0gcm91bmRlZEludFNpemUocmVuZGVyQm94LT5zaXplKCkpOwor ICAgICAgICAgICAgICAgIGlmIChib3hTaXplLmFyZWEoKSA+IDEwMDAKKyAgICAgICAgICAgICAg ICAgICAgJiYgKGJveFNpemUud2lkdGgoKSA+IDIwMCAmJiBib3hTaXplLmhlaWdodCgpID4gMjAw KSkKKyAgICAgICAgICAgICAgICAgICAgYWN0aXZhdGlvbk5vZGUgPSAwOworCisgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoYWN0aXZhdGlvbk5vZGUpCg== 164923 2012-09-20 08:18:10 -0700 2012-11-20 07:32:24 -0800 Patch bug-97216-20120920171724.patch text/plain 3194 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDNhYmJmOWZjZTYzYzhm MjI4MjAzNDE3MzlmNDM0YmJhYmYzN2RjNy4uZWU5ZmYxZWUzZGZjMGE2OTc3NTViYzRkNTBmZDAy NWU4ODY5NWY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTGFyZ2UgYXJlYXMgaGlnaGxpZ2h0ZWQgb24gdG91Y2guCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzIxNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBlbGVtZW50cyB0aGF0IGFyZSBub3QgZm9y bXMsIGxpbmtzIG9yIGNvbnRlbnQtZWRpdGFibGUsIGVuZm9yY2UgYW4gYXJlYSBsaW1pdC4KKyAg ICAgICAgVGhpcyBpcyB0byBhdm9pZCBoaWdobGlnaHRpbmcgbGFyZ2UgYXJlYXMgd2l0aCBldmVu dCBsaXN0ZW5lcnMsIGJ1dCBzdGlsbCBlbnN1cmUKKyAgICAgICAgd2UgaGlnaGxpZ2h0IHNtYWxs IFdlYkFwcCBjb250cm9scy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aGlnaGxpZ2h0UG90ZW50aWFsQWN0aXZh dGlvbik6CisKIDIwMTItMDktMjAgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFtFRkxdIENoYW5nZSB0aGUgbG9nIG1hY3JvIG5hbWVzIHRvIGJlIG1v cmUgY29uc2lzdGVudCB3aXRoIEVJTkEgTE9HCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNzUwOTgzMTY5MzQ3YjQzZjdkYjAyMGU4NDFjMTU3 ZTAwMDI4OTRmMS4uYzU0M2IyNWQ3M2YxOGYzMmM5MDhiMzBkMzYzYTI5MTBhMWI5MWFmZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTU2 OCw5ICsxNTY4LDcgQEAgdm9pZCBXZWJQYWdlOjpoaWdobGlnaHRQb3RlbnRpYWxBY3RpdmF0aW9u KGNvbnN0IEludFBvaW50JiBwb2ludCwgY29uc3QgSW50U2l6ZSYKICAgICAgICAgSGl0VGVzdFJl c3VsdCByZXN1bHQgPSBtYWluZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5oaXRUZXN0UmVzdWx0QXRQ b2ludChtYWluZnJhbWUtPnZpZXcoKS0+d2luZG93VG9Db250ZW50cyhwb2ludCksIC8qYWxsb3dT aGFkb3dDb250ZW50Ki8gZmFsc2UsIC8qaWdub3JlQ2xpcHBpbmcqLyB0cnVlKTsKICAgICAgICAg YWRqdXN0ZWROb2RlID0gcmVzdWx0LmlubmVyTm9kZSgpOwogI2VuZGlmCi0gICAgICAgIC8vIEZp bmQgdGhlIG5vZGUgdG8gaGlnaGxpZ2h0LiBUaGlzIGlzIG5vdCB0aGUgc2FtZSBhcyB0aGUgbm9k ZSByZXNwb25kaW5nIHRoZSB0YXAgZ2VzdHVyZSwgYmVjYXVzZSBtYW55Ci0gICAgICAgIC8vIHBh Z2VzIGhhcyBhIGdsb2JhbCBjbGljayBoYW5kbGVyIGFuZCB3ZSBkbyBub3Qgd2FudCB0byBoaWdo bGlnaHQgdGhlIGJvZHkuCi0gICAgICAgIC8vIEluc3RlYWQgZmluZCB0aGUgZW5jbG9zaW5nIGxp bmsgb3IgZm9jdXNhYmxlIGVsZW1lbnQsIG9yIHRoZSBsYXN0IGVuY2xvc2luZyBpbmxpbmUgZWxl bWVudC4KKyAgICAgICAgLy8gRmluZCB0aGUgbm9kZSB0byBoaWdobGlnaHQuCiAgICAgICAgIGZv ciAoTm9kZSogbm9kZSA9IGFkanVzdGVkTm9kZTsgbm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE9y SG9zdE5vZGUoKSkgewogICAgICAgICAgICAgaWYgKG5vZGUtPmlzRG9jdW1lbnROb2RlKCkgfHwg bm9kZS0+aXNGcmFtZU93bmVyRWxlbWVudCgpKQogICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAt MTU3OCwxMCArMTU3NiwxOCBAQCB2b2lkIFdlYlBhZ2U6OmhpZ2hsaWdodFBvdGVudGlhbEFjdGl2 YXRpb24oY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBJbnRTaXplJgogICAgICAgICAgICAg ICAgIGFjdGl2YXRpb25Ob2RlID0gbm9kZTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGlmIChub2RlLT5yZW5kZXJlcigpICYmIG5vZGUtPnJlbmRl cmVyKCktPmlzSW5saW5lKCkpCi0gICAgICAgICAgICAgICAgYWN0aXZhdGlvbk5vZGUgPSBub2Rl OwotICAgICAgICAgICAgZWxzZSBpZiAoYWN0aXZhdGlvbk5vZGUpCi0gICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBpZiAoYWN0aXZhdGlvbk5vZGUgJiYgIWFjdGl2 YXRpb25Ob2RlLT5pc01vdXNlRm9jdXNhYmxlKCkgJiYgIWFjdGl2YXRpb25Ob2RlLT5pc0NvbnRl bnRFZGl0YWJsZSgpICYmICFhY3RpdmF0aW9uTm9kZS0+aXNMaW5rKCkpIHsKKyAgICAgICAgICAg IC8vIENoZWNrIGZvciBzYW5pdHksIHdlIGRvIG5vdCB3YW50IHRvIGhpZ2hsaWdodCB0b28gbGFy Z2UgYXJlYXMgdW5sZXNzIHdlIHRoZXkgYXJlIGZvcm0tZWxlbWVudHMgb3IgaW1hZ2UgbGlua3Mu CisgICAgICAgICAgICBpZiAoYWN0aXZhdGlvbk5vZGUtPnJlbmRlcmVyKCkgJiYgYWN0aXZhdGlv bk5vZGUtPnJlbmRlcmVyKCktPmlzQm94KCkpIHsKKyAgICAgICAgICAgICAgICBSZW5kZXJCb3gq IHJlbmRlckJveCA9IHRvUmVuZGVyQm94KGFjdGl2YXRpb25Ob2RlLT5yZW5kZXJlcigpKTsKKyAg ICAgICAgICAgICAgICBJbnRTaXplIGJveFNpemUgPSByb3VuZGVkSW50U2l6ZShyZW5kZXJCb3gt PnNpemUoKSk7CisgICAgICAgICAgICAgICAgaWYgKGJveFNpemUuYXJlYSgpID4gMTAwMDAwCisg ICAgICAgICAgICAgICAgICAgICYmIChib3hTaXplLndpZHRoKCkgPiAyMDAgJiYgYm94U2l6ZS5o ZWlnaHQoKSA+IDIwMCkpCisgICAgICAgICAgICAgICAgICAgIGFjdGl2YXRpb25Ob2RlID0gMDsK KworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGFjdGl2YXRpb25Ob2Rl KQo= 169386 2012-10-18 03:48:43 -0700 2012-11-20 07:32:01 -0800 Alternative Patch Patch text/plain 2489 allan.jensen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjODBiYjVmLi4wYjdmMGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMTAtMTggIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdp YS5jb20+CisKKyAgICAgICAgW1F0XSBMYXJnZSBhcmVhcyBoaWdobGlnaHRlZCBvbiB0b3VjaAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXN0cmljdCBo aWdobGlnaHRpbmcgb2Ygc2NyaXB0ZWQgZXZlbnQtaGFuZGxlcnMgdG8gaW5saW5lIGVsZW1lbnRz IG9ubHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmhpZ2hsaWdodFBvdGVudGlhbEFjdGl2YXRpb24pOgorCiAy MDEyLTEwLTE4ICBKdXNzaSBLdWtrb25lbiAgPGp1c3NpLmt1a2tvbmVuQGludGVsLmNvbT4KIAog ICAgICAgICBBZGQgUGx1Z2luUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVMYXVuY2hP cHRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK aW5kZXggZTgyZTY1Yy4uNDEwMDdjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTY0MiwxNyArMTY0MiwyMSBAQCB2b2lkIFdlYlBhZ2U6 OmhpZ2hsaWdodFBvdGVudGlhbEFjdGl2YXRpb24oY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25z dCBJbnRTaXplJgogI2VuZGlmCiAgICAgICAgIC8vIEZpbmQgdGhlIG5vZGUgdG8gaGlnaGxpZ2h0 LiBUaGlzIGlzIG5vdCB0aGUgc2FtZSBhcyB0aGUgbm9kZSByZXNwb25kaW5nIHRoZSB0YXAgZ2Vz dHVyZSwgYmVjYXVzZSBtYW55CiAgICAgICAgIC8vIHBhZ2VzIGhhcyBhIGdsb2JhbCBjbGljayBo YW5kbGVyIGFuZCB3ZSBkbyBub3Qgd2FudCB0byBoaWdobGlnaHQgdGhlIGJvZHkuCi0gICAgICAg IC8vIEluc3RlYWQgZmluZCB0aGUgZW5jbG9zaW5nIGxpbmsgb3IgZm9jdXNhYmxlIGVsZW1lbnQs IG9yIHRoZSBsYXN0IGVuY2xvc2luZyBpbmxpbmUgZWxlbWVudC4KICAgICAgICAgZm9yIChOb2Rl KiBub2RlID0gYWRqdXN0ZWROb2RlOyBub2RlOyBub2RlID0gbm9kZS0+cGFyZW50T3JIb3N0Tm9k ZSgpKSB7CiAgICAgICAgICAgICBpZiAobm9kZS0+aXNEb2N1bWVudE5vZGUoKSB8fCBub2RlLT5p c0ZyYW1lT3duZXJFbGVtZW50KCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICBpZiAobm9kZS0+aXNNb3VzZUZvY3VzYWJsZSgpIHx8IG5vZGUtPndpbGxSZXNwb25kVG9Nb3Vz ZUNsaWNrRXZlbnRzKCkpIHsKKworICAgICAgICAgICAgLy8gV2UgYWx3YXlzIGhpZ2hsaWdodCBm b2N1c2FibGUgKGZvcm0tZWxlbWVudHMpLCBpbWFnZSBsaW5rcyBvciBjb250ZW50LWVkaXRhYmxl IGVsZW1lbnRzLgorICAgICAgICAgICAgaWYgKG5vZGUtPmlzTW91c2VGb2N1c2FibGUoKSB8fCBu b2RlLT5pc0xpbmsoKSB8fCBub2RlLT5pc0NvbnRlbnRFZGl0YWJsZSgpKQogICAgICAgICAgICAg ICAgIGFjdGl2YXRpb25Ob2RlID0gbm9kZTsKLSAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIGVsc2UgaWYgKG5vZGUtPndpbGxSZXNwb25kVG9Nb3VzZUNsaWNrRXZlbnRzKCkpIHsK KyAgICAgICAgICAgICAgICAvLyBIaWdobGlnaHQgZWxlbWVudHMgd2l0aCBkZWZhdWx0IG1vdXNl LWNsaWNrIGhhbmRsZXJzLCBidXQgaGlnaGxpZ2h0IG9ubHkgaW5saW5lIGVsZW1lbnRzCisgICAg ICAgICAgICAgICAgLy8gc2NyaXB0ZWQgZXZlbnQtaGFuZGxlcnMuCisgICAgICAgICAgICAgICAg aWYgKCFub2RlLT5Ob2RlOjp3aWxsUmVzcG9uZFRvTW91c2VDbGlja0V2ZW50cygpIHx8IChub2Rl LT5yZW5kZXJlcigpICYmIG5vZGUtPnJlbmRlcmVyKCktPmlzSW5saW5lKCkpKQorICAgICAgICAg ICAgICAgICAgICBhY3RpdmF0aW9uTm9kZSA9IG5vZGU7CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBpZiAobm9kZS0+cmVuZGVyZXIoKSAmJiBub2RlLT5yZW5kZXJlcigpLT5pc0lubGluZSgp KQotICAgICAgICAgICAgICAgIGFjdGl2YXRpb25Ob2RlID0gbm9kZTsKLSAgICAgICAgICAgIGVs c2UgaWYgKGFjdGl2YXRpb25Ob2RlKQorCisgICAgICAgICAgICBpZiAoYWN0aXZhdGlvbk5vZGUp CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAo=