153304 2016-01-21 03:44:38 -0800 Main frame scrollbars not updated on hovering when using overlay scrollbars 2016-01-26 09:00:35 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 153405 1 cgarcia webkit-unassigned bdakin commit-queue darin esprehn+autocc glenn kondapallykalyan mcatanzaro simon.fraser oldest_to_newest 1157253 0 cgarcia 2016-01-21 03:44:38 -0800 Legacy scrollbars were fixed in r194155, but overlay scrollbars are not notified when they are hovered. This is because the layer hit test in RenderView::hitTest always returns true when using overlay scrollbars and we are returning early in such case ignoring the HitTestRequest::AllowFrameScrollbars flag. So, in case of using overlay scrollbars we still need to check the RenderView scrollbars even when the layer hist test succeeded unless it already contains a scrollbar. 1157254 1 269444 cgarcia 2016-01-21 03:47:04 -0800 Created attachment 269444 Patch 1157359 2 bdakin 2016-01-21 11:00:55 -0800 (In reply to comment #0) > Legacy scrollbars were fixed in r194155, but overlay scrollbars are not > notified when they are hovered. This is because the layer hit test in > RenderView::hitTest always returns true when using overlay scrollbars and we > are returning early in such case ignoring the > HitTestRequest::AllowFrameScrollbars flag. So, in case of using overlay > scrollbars we still need to check the RenderView scrollbars even when the > layer hist test succeeded unless it already contains a scrollbar. Can you write up a set of steps that reproduce a bug that you are fixing here? 1157604 3 cgarcia 2016-01-21 23:36:21 -0800 (In reply to comment #2) > (In reply to comment #0) > > Legacy scrollbars were fixed in r194155, but overlay scrollbars are not > > notified when they are hovered. This is because the layer hit test in > > RenderView::hitTest always returns true when using overlay scrollbars and we > > are returning early in such case ignoring the > > HitTestRequest::AllowFrameScrollbars flag. So, in case of using overlay > > scrollbars we still need to check the RenderView scrollbars even when the > > layer hist test succeeded unless it already contains a scrollbar. > > Can you write up a set of steps that reproduce a bug that you are fixing > here? Sure. 1. Enable overlay scrollbars 2. Open MiniBrowser and visit any page long enough to show a scrollbar 3. Hover the scrollbar There's no change in appearance on hover. That's from the users point of view. From the WebKit point of view, the scrollbar is not invalidated and WebKit doesn't know the mouse is over a scrollbar until you press the mouse button, because in EventHandler::handleMousePressEvent() we are manually getting the scrollbar again and only using the first hit test scrollbar if we don't get a scrollbar manually, see: FrameView* view = m_frame.view(); Scrollbar* scrollbar = view ? view->scrollbarAtPoint(platformMouseEvent.position()) : 0; if (!scrollbar) scrollbar = mouseEvent.scrollbar(); updateLastScrollbarUnderMouse(scrollbar, true); And this is why even when the appearance is not updated on hover, you can still click and drag the scrollbar and it works. EventHandler::handleMousePressEvent() needs to do this because it doesn't use the AllowFrameScrollbars flag when doing the hit test. 1157667 4 mcatanzaro 2016-01-22 07:51:07 -0800 I'm curious, do OS X scrollbars not change in appearance when hovered? 1158100 5 cgarcia 2016-01-24 01:40:51 -0800 (In reply to comment #4) > I'm curious, do OS X scrollbars not change in appearance when hovered? Legacy scrollbars do, but overlay scrollbars don't. 1158106 6 269444 mcatanzaro 2016-01-24 06:35:22 -0800 Comment on attachment 269444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=269444&action=review > Source/WebCore/ChangeLog:14 > + RenderView scrollbars even when the layer hist test succeeded hist -> hit 1158224 7 bdakin 2016-01-24 22:34:09 -0800 (In reply to comment #5) > (In reply to comment #4) > > I'm curious, do OS X scrollbars not change in appearance when hovered? > > Legacy scrollbars do, but overlay scrollbars don't. This is false. On Mac, overlay scrollbars become fatter and get a visible track when hovered, and that works correctly in tip of tree WebKit for me. Does it fail for you on some version of Mac OS? If so, what Mac OS version are you testing on? Which platform does that patch affect? 1158228 8 bdakin 2016-01-24 22:39:43 -0800 (In reply to comment #7) > (In reply to comment #5) > > (In reply to comment #4) > > > I'm curious, do OS X scrollbars not change in appearance when hovered? > > > > Legacy scrollbars do, but overlay scrollbars don't. > > This is false. > > On Mac, overlay scrollbars become fatter and get a visible track when > hovered, and that works correctly in tip of tree WebKit for me. Does it fail > for you on some version of Mac OS? If so, what Mac OS version are you > testing on? > > Which platform does that patch affect? Of course I assume GTK, but I am asking for specifics of the platform because I am curious about the exact platform behaviors and making sure we are as consistent as possible in this code since a lot of it was written thinking about Mac behavior. I want to make sure that other platforms using it understand the Mac behavior and are truly using it for similar purposes. (In other words, I want to make sure we all have the same definition of what an overlay vs. legacy scrollbar is.) 1158251 9 cgarcia 2016-01-25 00:27:09 -0800 (In reply to comment #6) > Comment on attachment 269444 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=269444&action=review > > > Source/WebCore/ChangeLog:14 > > + RenderView scrollbars even when the layer hist test succeeded > > hist -> hit Oops. I'm also considering that main frame scrollbars should take precedence over a possible scrollbar returned by the layer hit test result. That would be consistent with what EventHandler::handleMousePressEvent does, see: FrameView* view = m_frame.view(); Scrollbar* scrollbar = view ? view->scrollbarAtPoint(platformMouseEvent.position()) : 0; if (!scrollbar) scrollbar = mouseEvent.scrollbar(); 1158252 10 cgarcia 2016-01-25 00:31:19 -0800 (In reply to comment #7) > (In reply to comment #5) > > (In reply to comment #4) > > > I'm curious, do OS X scrollbars not change in appearance when hovered? > > > > Legacy scrollbars do, but overlay scrollbars don't. > > This is false. Ah, I guess it's now fixed then. > On Mac, overlay scrollbars become fatter and get a visible track when > hovered, and that works correctly in tip of tree WebKit for me. Does it fail > for you on some version of Mac OS? If so, what Mac OS version are you > testing on? Yes, that didn't happen for me with Safari in Mac OSX El Capitan (probably not the latest update, I'll try to upgrade). > Which platform does that patch affect? It should affect all platforms, I expected this to fix Mac as well, but maybe Mac is already updating the scrollbars from the scroll animator when mouseEnteredScrollbar is called, that would be hiding this bug in Mac, but I'm just guessing. 1158298 11 mcatanzaro 2016-01-25 07:03:36 -0800 (In reply to comment #8) > Of course I assume GTK, but I am asking for specifics of the platform > because I am curious about the exact platform behaviors and making sure we > are as consistent as possible in this code since a lot of it was written > thinking about Mac behavior. I want to make sure that other platforms using > it understand the Mac behavior and are truly using it for similar purposes. > (In other words, I want to make sure we all have the same definition of what > an overlay vs. legacy scrollbar is.) Here's a video I found that demonstrates how GTK+ scrollbars work nowadays; this is what we're trying to match. (Warning: music.) https://www.youtube.com/watch?v=8DktM-XLaf0 1158397 12 bdakin 2016-01-25 11:19:20 -0800 (In reply to comment #11) > (In reply to comment #8) > > Of course I assume GTK, but I am asking for specifics of the platform > > because I am curious about the exact platform behaviors and making sure we > > are as consistent as possible in this code since a lot of it was written > > thinking about Mac behavior. I want to make sure that other platforms using > > it understand the Mac behavior and are truly using it for similar purposes. > > (In other words, I want to make sure we all have the same definition of what > > an overlay vs. legacy scrollbar is.) > > Here's a video I found that demonstrates how GTK+ scrollbars work nowadays; > this is what we're trying to match. (Warning: music.) > > https://www.youtube.com/watch?v=8DktM-XLaf0 OH, very interesting. Thank you for this. This makes me realize that my previous statement was perhaps misleading (or wrong depending on exactly what the original question was asking :-P ). It seems like in GTK, the scrollbars appear ANY TIME you hover over the scrollbar areas. On Mac, the scrollbars only do anything special on hover if they are ALREADY showing for any other reason. So, for example, if you scroll a little and then quickly move the cursor over to the scrollbar area, then you will see the hover effect. Another difference seems to be the the GTK scrollbars show up whenever you are moving the cursor around inside a scrollable box. Very interesting! 1158748 13 269859 cgarcia 2016-01-25 23:51:18 -0800 Created attachment 269859 Patch for landing 1158823 14 cgarcia 2016-01-26 09:00:35 -0800 Committed r195591: <http://trac.webkit.org/changeset/195591> 269444 2016-01-21 03:47:04 -0800 2016-01-25 23:51:18 -0800 Patch wcore-overlay-scrollbar-hovered.diff text/plain 3652 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NzhhMWIxLi4yMzExMzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTYtMDEtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIE1haW4gZnJhbWUgc2Nyb2xsYmFycyBub3QgdXBkYXRlZCBvbiBob3Zlcmlu ZyB3aGVuIHVzaW5nIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzMzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGVnYWN5IHNjcm9sbGJhcnMgd2VyZSBmaXhlZCBpbiBy MTk0MTU1LCBidXQgb3ZlcmxheSBzY3JvbGxiYXJzCisgICAgICAgIGFyZSBub3Qgbm90aWZpZWQg d2hlbiB0aGV5IGFyZSBob3ZlcmVkLiBUaGlzIGlzIGJlY2F1c2UgdGhlIGxheWVyCisgICAgICAg IGhpdCB0ZXN0IGluIFJlbmRlclZpZXc6OmhpdFRlc3QgYWx3YXlzIHJldHVybnMgdHJ1ZSB3aGVu IHVzaW5nCisgICAgICAgIG92ZXJsYXkgc2Nyb2xsYmFycyBhbmQgd2UgYXJlIHJldHVybmluZyBl YXJseSBpbiBzdWNoIGNhc2UsCisgICAgICAgIGlnbm9yaW5nIHRoZSBIaXRUZXN0UmVxdWVzdDo6 QWxsb3dGcmFtZVNjcm9sbGJhcnMgZmxhZy4gU28sIGluCisgICAgICAgIGNhc2Ugb2YgdXNpbmcg b3ZlcmxheSBzY3JvbGxiYXJzIHdlIHN0aWxsIG5lZWQgdG8gY2hlY2sgdGhlCisgICAgICAgIFJl bmRlclZpZXcgc2Nyb2xsYmFycyBldmVuIHdoZW4gdGhlIGxheWVyIGhpc3QgdGVzdCBzdWNjZWVk ZWQKKyAgICAgICAgdW5sZXNzIGl0IGFscmVhZHkgY29udGFpbnMgYSBzY3JvbGxiYXIuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJWaWV3OjpoaXRUZXN0KToKKworMjAxNi0wMS0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW1NPVVBdIEdSZXNvdXJjZSByZXNvdXJjZXMg c2hvdWxkIGJlIGNhY2hlZCBpbmRlZmluaXRlbHkgaW4gbWVtb3J5IGNhY2hlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMyNzUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmluZGV4IDNjN2ZjNmUuLmU5MDllMjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTQ3LDYgKzQ3LDcgQEAKICNp bmNsdWRlICJSZW5kZXJOYW1lZEZsb3dUaHJlYWQuaCIKICNpbmNsdWRlICJSZW5kZXJTZWxlY3Rp b25JbmZvLmgiCiAjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCisjaW5jbHVkZSAiU2Nyb2xsYmFy VGhlbWUuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlN0eWxlSW5oZXJpdGVk RGF0YS5oIgogI2luY2x1ZGUgIlRyYW5zZm9ybVN0YXRlLmgiCkBAIC0xOTcsMjEgKzE5OCwyNCBA QCBib29sIFJlbmRlclZpZXc6OmhpdFRlc3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbAogCiAgICAgRnJhbWVGbGF0dGVuaW5nTGF5b3V0RGlz YWxsb3dlciBkaXNhbGxvd2VyKGZyYW1lVmlldygpKTsKIAotICAgIGlmIChsYXllcigpLT5oaXRU ZXN0KHJlcXVlc3QsIGxvY2F0aW9uLCByZXN1bHQpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQot ICAgIC8vIEZJWE1FOiBDb25zaWRlciBpZiB0aGlzIHRlc3Qgc2hvdWxkIGJlIGRvbmUgdW5jb25k aXRpb25hbGx5LgotICAgIGlmIChyZXF1ZXN0LmFsbG93c0ZyYW1lU2Nyb2xsYmFycygpKSB7Ci0g ICAgICAgIC8vIFNjcm9sbFZpZXcgc2Nyb2xsYmFycyBhcmUgbm90IHRoZSBzYW1lIGFzIFJlbmRl ckxheWVyIHNjcm9sbGJhcnMgdGVzdGVkIGJ5IFJlbmRlckxheWVyOjpoaXRUZXN0T3ZlcmZsb3dD b250cm9scywKLSAgICAgICAgLy8gc28gd2UgbmVlZCB0byB0ZXN0IFNjcm9sbFZpZXcgc2Nyb2xs YmFycyBzZXBhcmF0ZWx5IGhlcmUuCi0gICAgICAgIEludFBvaW50IHdpbmRvd1BvaW50ID0gZnJh bWVWaWV3KCkuY29udGVudHNUb1dpbmRvdyhsb2NhdGlvbi5yb3VuZGVkUG9pbnQoKSk7Ci0gICAg ICAgIGlmIChTY3JvbGxiYXIqIGZyYW1lU2Nyb2xsYmFyID0gZnJhbWVWaWV3KCkuc2Nyb2xsYmFy QXRQb2ludCh3aW5kb3dQb2ludCkpIHsKLSAgICAgICAgICAgIHJlc3VsdC5zZXRTY3JvbGxiYXIo ZnJhbWVTY3JvbGxiYXIpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgYm9vbCByZXN1 bHRMYXllciA9IGxheWVyKCktPmhpdFRlc3QocmVxdWVzdCwgbG9jYXRpb24sIHJlc3VsdCk7CisK KyAgICAvLyBTY3JvbGxWaWV3IHNjcm9sbGJhcnMgYXJlIG5vdCB0aGUgc2FtZSBhcyBSZW5kZXJM YXllciBzY3JvbGxiYXJzIHRlc3RlZCBieSBSZW5kZXJMYXllcjo6aGl0VGVzdE92ZXJmbG93Q29u dHJvbHMsCisgICAgLy8gc28gd2UgbmVlZCB0byB0ZXN0IFNjcm9sbFZpZXcgc2Nyb2xsYmFycyBz ZXBhcmF0ZWx5IGhlcmUuIEluIGNhc2Ugb2YgdXNpbmcgb3ZlcmxheSBzY3JvbGxiYXJzLCB0aGUg bGF5ZXIgaGl0IHRlc3QKKyAgICAvLyB3aWxsIGFsd2F5cyB3b3JrIHNvIHdlIG5lZWQgdG8gY2hl Y2sgdGhlIFNjcm9sbFZpZXcgc2Nyb2xsYmFycyBpbiB0aGF0IGNhc2UgdG9vLCB1bmxlc3MgdGhl IHJlc3VsdCBhbHJlYWR5IGNvbnRhaW5zCisgICAgLy8gYSBzY3JvbGxiYXIuCisgICAgaWYgKCFy ZXN1bHRMYXllciB8fCAoU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCkudXNlc092ZXJsYXlTY3JvbGxi YXJzKCkgJiYgIXJlc3VsdC5zY3JvbGxiYXIoKSkpIHsKKyAgICAgICAgLy8gRklYTUU6IENvbnNp ZGVyIGlmIHRoaXMgdGVzdCBzaG91bGQgYmUgZG9uZSB1bmNvbmRpdGlvbmFsbHkuCisgICAgICAg IGlmIChyZXF1ZXN0LmFsbG93c0ZyYW1lU2Nyb2xsYmFycygpKSB7CisgICAgICAgICAgICBJbnRQ b2ludCB3aW5kb3dQb2ludCA9IGZyYW1lVmlldygpLmNvbnRlbnRzVG9XaW5kb3cobG9jYXRpb24u cm91bmRlZFBvaW50KCkpOworICAgICAgICAgICAgaWYgKFNjcm9sbGJhciogZnJhbWVTY3JvbGxi YXIgPSBmcmFtZVZpZXcoKS5zY3JvbGxiYXJBdFBvaW50KHdpbmRvd1BvaW50KSkgeworICAgICAg ICAgICAgICAgIHJlc3VsdC5zZXRTY3JvbGxiYXIoZnJhbWVTY3JvbGxiYXIpOworICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogCi0g ICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiByZXN1bHRMYXllcjsKIH0KIAogdm9pZCBSZW5k ZXJWaWV3Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExh eW91dFVuaXQsIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNv bnN0Cg== 269859 2016-01-25 23:51:18 -0800 2016-01-25 23:51:18 -0800 Patch for landing wcore-overlay-scrollbars-hover.diff text/plain 3450 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2M2Y2FhLi45ZjM4NmZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTYtMDEtMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIE1haW4gZnJhbWUgc2Nyb2xsYmFycyBub3QgdXBkYXRlZCBvbiBob3Zlcmlu ZyB3aGVuIHVzaW5nIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzMzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWlj aGFlbCBDYXRhbnphcm8uCisKKyAgICAgICAgTGVnYWN5IHNjcm9sbGJhcnMgd2VyZSBmaXhlZCBp biByMTk0MTU1LCBidXQgb3ZlcmxheSBzY3JvbGxiYXJzCisgICAgICAgIGFyZSBub3Qgbm90aWZp ZWQgd2hlbiB0aGV5IGFyZSBob3ZlcmVkLiBUaGlzIGlzIGJlY2F1c2UgdGhlIGxheWVyCisgICAg ICAgIGhpdCB0ZXN0IGluIFJlbmRlclZpZXc6OmhpdFRlc3QgYWx3YXlzIHJldHVybnMgdHJ1ZSB3 aGVuIHVzaW5nCisgICAgICAgIG92ZXJsYXkgc2Nyb2xsYmFycyBhbmQgd2UgYXJlIHJldHVybmlu ZyBlYXJseSBpbiBzdWNoIGNhc2UsCisgICAgICAgIGlnbm9yaW5nIHRoZSBIaXRUZXN0UmVxdWVz dDo6QWxsb3dGcmFtZVNjcm9sbGJhcnMgZmxhZy4gU28sIGluCisgICAgICAgIGNhc2Ugb2YgdXNp bmcgb3ZlcmxheSBzY3JvbGxiYXJzIHdlIHN0aWxsIG5lZWQgdG8gY2hlY2sgdGhlCisgICAgICAg IFJlbmRlclZpZXcgc2Nyb2xsYmFycyBldmVuIHdoZW4gdGhlIGxheWVyIGhpdCB0ZXN0IHN1Y2Nl ZWRlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclZpZXc6OmhpdFRlc3QpOgorCiAyMDE2LTAxLTI1ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgV2ViQ29yZUpTQnVpbHRp bnMgZG8gbm90IHVzZSB0byBkbyBjb25kaXRpb25hbCBpbmNsdWRlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggM2M3ZmM2ZS4uMGQ1YTgyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtNDcsNiArNDcsNyBAQAogI2luY2x1ZGUg IlJlbmRlck5hbWVkRmxvd1RocmVhZC5oIgogI2luY2x1ZGUgIlJlbmRlclNlbGVjdGlvbkluZm8u aCIKICNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKKyNpbmNsdWRlICJTY3JvbGxiYXJUaGVtZS5o IgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU3R5bGVJbmhlcml0ZWREYXRhLmgi CiAjaW5jbHVkZSAiVHJhbnNmb3JtU3RhdGUuaCIKQEAgLTE5NywyMSArMTk4LDIzIEBAIGJvb2wg UmVuZGVyVmlldzo6aGl0VGVzdChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg SGl0VGVzdExvY2F0aW9uJiBsCiAKICAgICBGcmFtZUZsYXR0ZW5pbmdMYXlvdXREaXNhbGxvd2Vy IGRpc2FsbG93ZXIoZnJhbWVWaWV3KCkpOwogCi0gICAgaWYgKGxheWVyKCktPmhpdFRlc3QocmVx dWVzdCwgbG9jYXRpb24sIHJlc3VsdCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgLy8g RklYTUU6IENvbnNpZGVyIGlmIHRoaXMgdGVzdCBzaG91bGQgYmUgZG9uZSB1bmNvbmRpdGlvbmFs bHkuCi0gICAgaWYgKHJlcXVlc3QuYWxsb3dzRnJhbWVTY3JvbGxiYXJzKCkpIHsKLSAgICAgICAg Ly8gU2Nyb2xsVmlldyBzY3JvbGxiYXJzIGFyZSBub3QgdGhlIHNhbWUgYXMgUmVuZGVyTGF5ZXIg c2Nyb2xsYmFycyB0ZXN0ZWQgYnkgUmVuZGVyTGF5ZXI6OmhpdFRlc3RPdmVyZmxvd0NvbnRyb2xz LAotICAgICAgICAvLyBzbyB3ZSBuZWVkIHRvIHRlc3QgU2Nyb2xsVmlldyBzY3JvbGxiYXJzIHNl cGFyYXRlbHkgaGVyZS4KLSAgICAgICAgSW50UG9pbnQgd2luZG93UG9pbnQgPSBmcmFtZVZpZXco KS5jb250ZW50c1RvV2luZG93KGxvY2F0aW9uLnJvdW5kZWRQb2ludCgpKTsKLSAgICAgICAgaWYg KFNjcm9sbGJhciogZnJhbWVTY3JvbGxiYXIgPSBmcmFtZVZpZXcoKS5zY3JvbGxiYXJBdFBvaW50 KHdpbmRvd1BvaW50KSkgewotICAgICAgICAgICAgcmVzdWx0LnNldFNjcm9sbGJhcihmcmFtZVNj cm9sbGJhcik7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBib29sIHJlc3VsdExheWVy ID0gbGF5ZXIoKS0+aGl0VGVzdChyZXF1ZXN0LCBsb2NhdGlvbiwgcmVzdWx0KTsKKworICAgIC8v IFNjcm9sbFZpZXcgc2Nyb2xsYmFycyBhcmUgbm90IHRoZSBzYW1lIGFzIFJlbmRlckxheWVyIHNj cm9sbGJhcnMgdGVzdGVkIGJ5IFJlbmRlckxheWVyOjpoaXRUZXN0T3ZlcmZsb3dDb250cm9scywK KyAgICAvLyBzbyB3ZSBuZWVkIHRvIHRlc3QgU2Nyb2xsVmlldyBzY3JvbGxiYXJzIHNlcGFyYXRl bHkgaGVyZS4gSW4gY2FzZSBvZiB1c2luZyBvdmVybGF5IHNjcm9sbGJhcnMsIHRoZSBsYXllciBo aXQgdGVzdAorICAgIC8vIHdpbGwgYWx3YXlzIHdvcmsgc28gd2UgbmVlZCB0byBjaGVjayB0aGUg U2Nyb2xsVmlldyBzY3JvbGxiYXJzIGluIHRoYXQgY2FzZSB0b28uCisgICAgaWYgKCFyZXN1bHRM YXllciB8fCBTY3JvbGxiYXJUaGVtZTo6dGhlbWUoKS51c2VzT3ZlcmxheVNjcm9sbGJhcnMoKSkg eworICAgICAgICAvLyBGSVhNRTogQ29uc2lkZXIgaWYgdGhpcyB0ZXN0IHNob3VsZCBiZSBkb25l IHVuY29uZGl0aW9uYWxseS4KKyAgICAgICAgaWYgKHJlcXVlc3QuYWxsb3dzRnJhbWVTY3JvbGxi YXJzKCkpIHsKKyAgICAgICAgICAgIEludFBvaW50IHdpbmRvd1BvaW50ID0gZnJhbWVWaWV3KCku Y29udGVudHNUb1dpbmRvdyhsb2NhdGlvbi5yb3VuZGVkUG9pbnQoKSk7CisgICAgICAgICAgICBp ZiAoU2Nyb2xsYmFyKiBmcmFtZVNjcm9sbGJhciA9IGZyYW1lVmlldygpLnNjcm9sbGJhckF0UG9p bnQod2luZG93UG9pbnQpKSB7CisgICAgICAgICAgICAgICAgcmVzdWx0LnNldFNjcm9sbGJhcihm cmFtZVNjcm9sbGJhcik7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0KICAgICB9CiAKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHJl c3VsdExheWVyOwogfQogCiB2b2lkIFJlbmRlclZpZXc6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KExh eW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCwgTG9naWNhbEV4dGVudENvbXB1dGVk VmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QK