94934 2012-08-24 06:50:50 -0700 Wheel-events fails temporarily after reload 2012-09-03 07:14:45 -0700 1 1 1 Unclassified WebKit WebKit2 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen abecsi cmarcelo hausmann jturcotte kenneth menard tonikitoo webkit.review.bot zoltan oldest_to_newest 704075 0 allan.jensen 2012-08-24 06:50:50 -0700 After reloading some pages, wheel events will temporarily fail to work until the page has been scrolled by some other means. The problem is restricted to ports using resizesToContents, possibly only Qt. 704076 1 160415 allan.jensen 2012-08-24 06:55:59 -0700 Created attachment 160415 Patch 705590 2 160415 eric 2012-08-27 13:24:40 -0700 Comment on attachment 160415 Patch How do we test this? We can do reloads and synthesized wheel events in DRT.... 705733 3 allan.jensen 2012-08-27 15:12:25 -0700 (In reply to comment #2) > (From update of attachment 160415 [details]) > How do we test this? We can do reloads and synthesized wheel events in DRT.... If we can set the fixed visible rect and resizes to content, then it should be possible to test it simple by reloading a page that is larger than the visible rect, and checking the size of the fixed visible rect after the reload. I will take a look to see if it is possible. 706192 4 abecsi 2012-08-28 02:33:18 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 160415 [details] [details]) > > How do we test this? We can do reloads and synthesized wheel events in DRT.... > > If we can set the fixed visible rect and resizes to content, then it should be possible to test it simple by reloading a page that is larger than the visible rect, and checking the size of the fixed visible rect after the reload. > > I will take a look to see if it is possible. It should at least be possible to test this with a QML test, see tst_wheelEventHandling.qml. 706204 5 160941 allan.jensen 2012-08-28 03:02:43 -0700 Created attachment 160941 Patch Now with a QML test. LayoutTests does not support fixedVisibleContentRect 707247 6 160941 hausmann 2012-08-29 02:52:21 -0700 Comment on attachment 160941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160941&action=review > Source/WebKit2/ChangeLog:8 > + Set fixed visible content rect using, WebPage::viewportSize instead of WebPage::size when available. There's a stray comma in the sentence :) > Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml:49 > + var position = webView.contentY This seems to be an unused variable. > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1243 > + if (shouldUseFixedLayout) { > +#if USE(TILED_BACKING_STORE) > + m_frame->coreFrame()->view()->setFixedVisibleContentRect(WebCore::IntRect(WebCore::IntPoint(), webPage->viewportSize())); > +#else > m_frame->coreFrame()->view()->setFixedVisibleContentRect(webPage->bounds()); > +#endif I admit that I don't know this code well enough to feel truly comfortable reviewing this. I would prefer if Kenneth could do that. 707410 7 160941 jturcotte 2012-08-29 06:44:23 -0700 Comment on attachment 160941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160941&action=review >> Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1243 >> + if (shouldUseFixedLayout) { >> +#if USE(TILED_BACKING_STORE) >> + m_frame->coreFrame()->view()->setFixedVisibleContentRect(WebCore::IntRect(WebCore::IntPoint(), webPage->viewportSize())); >> +#else >> m_frame->coreFrame()->view()->setFixedVisibleContentRect(webPage->bounds()); >> +#endif > > I admit that I don't know this code well enough to feel truly comfortable reviewing this. I would prefer if Kenneth could do that. I don't think shouldUseFixedLayout will ever be true if USE(TILED_BACKING_STORE) is false. Also I think that logically the visible rect that should be applied is the one last sent by the UI process, anything else is artificial. Would it be possible to do this in Frame::createView and transfer the fixedVisibleContentRect form the previously attached FrameView when creating the new one? Or do it from the outside here rather than guessing it from the page which might still be incomplete at this point? 707417 8 allan.jensen 2012-08-29 07:04:57 -0700 (In reply to comment #7) > I don't think shouldUseFixedLayout will ever be true if USE(TILED_BACKING_STORE) is false. > Maybe not, but API-wise we need to atleast handle it somehow, since shouldUseFixedLayout can be set without TILED_BACKING_STORE being active. > Also I think that logically the visible rect that should be applied is the one last sent by the UI process, anything else is artificial. Would it be possible to do this in Frame::createView and transfer the fixedVisibleContentRect form the previously attached FrameView when creating the new one? Or do it from the outside here rather than guessing it from the page which might still be incomplete at this point? The page here is both the old page and the new page, and reading viewPortSize reads the last size that used to set the fixedVisibleContentRect size. At least as far as I know, the fixed visible content rect is always set as a consequence of WebPage::setViewportSize(). The only thing missing from the fixedVisibleRect the position, but the position is restored separately someplace else. 707433 9 tonikitoo 2012-08-29 07:38:10 -0700 > > I don't think shouldUseFixedLayout will ever be true if USE(TILED_BACKING_STORE) is false. That is the case for BlackBerry: fixed layout: true,backing store: false (we use our own). 707457 10 161228 allan.jensen 2012-08-29 08:09:50 -0700 Created attachment 161228 Patch Changed to use WebFrame::visibleContentBounds which is always available, cleaned up changelog and test-case 707464 11 jturcotte 2012-08-29 08:22:19 -0700 (In reply to comment #9) > > > > I don't think shouldUseFixedLayout will ever be true if USE(TILED_BACKING_STORE) is false. > > That is the case for BlackBerry: fixed layout: true,backing store: false (we use our own). Ah, good to know! 710516 12 allan.jensen 2012-09-03 02:55:11 -0700 (In reply to comment #11) > (In reply to comment #9) > > > > > > I don't think shouldUseFixedLayout will ever be true if USE(TILED_BACKING_STORE) is false. > > > > That is the case for BlackBerry: fixed layout: true,backing store: false (we use our own). > > Ah, good to know! Of course BlackBerry does not use WebKit2 (yet), so you are both right ;) 710628 13 161228 webkit.review.bot 2012-09-03 07:14:41 -0700 Comment on attachment 161228 Patch Clearing flags on attachment: 161228 Committed r127420: <http://trac.webkit.org/changeset/127420> 710629 14 webkit.review.bot 2012-09-03 07:14:45 -0700 All reviewed patches have been landed. Closing bug. 160415 2012-08-24 06:55:59 -0700 2012-08-28 03:02:38 -0700 Patch bug-94934-20120824155548.patch text/plain 2051 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTYzYmI4YTVjN2YzNTM2 YTFmZjQyMjJmNjU1YTkyMjY4YWE0YThiOC4uMDI2MGFhZWZhZDlkZjZlMzM4MDc0Y2VlOTk1Y2Mx OWVkZGU3MjE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTI0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFdo ZWVsLWV2ZW50cyBmYWlscyB0ZW1wb3JhcmlseSBhZnRlciByZWxvYWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTM0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IGZpeGVkIHZpc2libGUgY29udGVu dCByZWN0IHVzaW5nLCBXZWJQYWdlOjp2aWV3cG9ydFNpemUgaW5zdGVhZCBvZiBXZWJQYWdlOjpz aXplIHdoZW4gYXZhaWxhYmxlLgorICAgICAgICBPdGhlcndpc2UgdGhlIGNvbnRlbnQgcmVjdCB3 aWxsIGJlIGluY29ycmVjdGx5IHNldCB0byB0aGUgZW50aXJlIGRvY3VtZW50IHNpemUsIHdoZW4g cmVzaXplc1RvQ29udGVudHMKKyAgICAgICAgaXMgYWN0aXZlLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQ YWdlKToKKwogMjAxMi0wOC0yMyAgRnJlZGVyaWsgR2xhZGhvcm4gIDxnbGFkaG9ybkBrZGUub3Jn PgogCiAgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gYnVpbGQgV2ViS2l0IHdpdGggUHl0aG9u IDMgKGFuZCAyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBhM2MwY2Mx NGE4MDZiMjI2Y2MxYWQ4OGJjOGIzMDMxNzIzMGZmMjM4Li42YjZjY2ZhOTI3ZTM5NjFlZWM2MTAw ZjEzNjEyMmYzYzQ1MzI2MDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApA QCAtMTIzNSw4ICsxMjM1LDEzIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRp b25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogCiAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmNy ZWF0ZVZpZXcod2ViUGFnZS0+c2l6ZSgpLCBiYWNrZ3JvdW5kQ29sb3IsIC8qIHRyYW5zcGFyZW50 ICovIGZhbHNlLCBJbnRTaXplKCksIHNob3VsZFVzZUZpeGVkTGF5b3V0KTsKICAgICBtX2ZyYW1l LT5jb3JlRnJhbWUoKS0+dmlldygpLT5zZXRUcmFuc3BhcmVudCghd2ViUGFnZS0+ZHJhd3NCYWNr Z3JvdW5kKCkpOwotICAgIGlmIChzaG91bGRVc2VGaXhlZExheW91dCkKKyAgICBpZiAoc2hvdWxk VXNlRml4ZWRMYXlvdXQpIHsKKyNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKKyAgICAgICAg bV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3Qo V2ViQ29yZTo6SW50UmVjdChXZWJDb3JlOjpJbnRQb2ludCgpLCB3ZWJQYWdlLT52aWV3cG9ydFNp emUoKSkpOworI2Vsc2UKICAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0 Rml4ZWRWaXNpYmxlQ29udGVudFJlY3Qod2ViUGFnZS0+Ym91bmRzKCkpOworI2VuZGlmCisgICAg fQogfQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRTYXZlVG9QYWdlQ2FjaGUoKQo= 160941 2012-08-28 03:02:43 -0700 2012-08-29 08:09:45 -0700 Patch bug-94934-20120828120227.patch text/plain 3360 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2ODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDNiZTQwNWQwMjlmZmNj OTAyOTEyMDM5NTE0OTFjMjJiY2FlZmM3Yy4uNzJiOTljNDQyZDBiMjFkZmU0MzhhODQ5MmUzYWVi ZTYzZTdiYTU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTI4ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFdo ZWVsLWV2ZW50cyBmYWlscyB0ZW1wb3JhcmlseSBhZnRlciByZWxvYWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTM0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IGZpeGVkIHZpc2libGUgY29udGVu dCByZWN0IHVzaW5nLCBXZWJQYWdlOjp2aWV3cG9ydFNpemUgaW5zdGVhZCBvZiBXZWJQYWdlOjpz aXplIHdoZW4gYXZhaWxhYmxlLgorICAgICAgICBPdGhlcndpc2UgdGhlIGNvbnRlbnQgcmVjdCB3 aWxsIGJlIGluY29ycmVjdGx5IHNldCB0byB0aGUgZW50aXJlIGRvY3VtZW50IHNpemUsIHdoZW4g cmVzaXplc1RvQ29udGVudHMKKyAgICAgICAgaXMgYWN0aXZlLgorCisgICAgICAgIFRlc3Q6IFVJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3Rfd2hlZWxFdmVudEhhbmRs aW5nLnFtbAorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJW aWV3L3RzdF93aGVlbEV2ZW50SGFuZGxpbmcucW1sOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CisK IDIwMTItMDgtMjcgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdW1dLMl0gRml4IFBhZ2VDbGllbnRJbXBsIGxheWVyIHZpb2xhdGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJW aWV3L3RzdF93aGVlbEV2ZW50SGFuZGxpbmcucW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF93aGVlbEV2ZW50SGFuZGxpbmcucW1s CmluZGV4IGQyNDMxMjYxMDcyZTZkZTM1MTIxMjA4ZWUyMGYzNjUwNmVlOTdiNWEuLjM5MDc2Y2Ux YzRmNWRjZTdiOTEzMzk2YTgxOGEzZTQ3ZGMwMzY3MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3Rfd2hlZWxFdmVu dEhhbmRsaW5nLnFtbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3Rz L3FtbHRlc3RzL1dlYlZpZXcvdHN0X3doZWVsRXZlbnRIYW5kbGluZy5xbWwKQEAgLTQyLDUgKzQy LDE3IEBAIEl0ZW0gewogICAgICAgICAgICAgLy8gVGhlIGNoZWNrIGJlbG93IHdpbGwgZmFpbCBp ZiB0aGUgcHJldmlvdXMgcG9zaXRpb24gd2FzIG5vdCByZXN0b3JlZCBhZnRlciByZWxvYWQuCiAg ICAgICAgICAgICB2ZXJpZnkocG9zaXRpb24gPT0gd2ViVmlldy5jb250ZW50WSkKICAgICAgICAg fQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3Rfd2hlZWxTY3JvbGxFdmVudEFmdGVyUmVsb2FkKCkg eworICAgICAgICAgICAgc2Nyb2xsU3B5LmNsZWFyKCkKKyAgICAgICAgICAgIHdlYlZpZXcucmVs b2FkKCkKKyAgICAgICAgICAgIHZhciBwb3NpdGlvbiA9IHdlYlZpZXcuY29udGVudFkKKyAgICAg ICAgICAgIHZlcmlmeSh3ZWJWaWV3LndhaXRGb3JMb2FkU3VjY2VlZGVkKCkpCisgICAgICAgICAg ICB2YXIgY2VudGVyUG9pbnQgPSBRdC5wb2ludCh3ZWJWaWV3LndpZHRoIC8gMiwgd2ViVmlldy5o ZWlnaHQgLyAyKQorICAgICAgICAgICAgdGVzdC53aGVlbEV2ZW50KHdlYlZpZXcsIGNlbnRlclBv aW50LngsIGNlbnRlclBvaW50LnksIC01MDApOworICAgICAgICAgICAgLy8gVGhlIHNpZ25hbCBz cHkgYmVsb3cgd2lsbCB0aW1lIG91dCBpZiB0aGUgd2hlZWwgZXZlbnQgZGlkIG5vdCBzY3JvbGwg dGhlIGNvbnRlbnQuCisgICAgICAgICAgICBzY3JvbGxTcHkud2FpdCgpCisgICAgICAgIH0KICAg ICB9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggYTNjMGNjMTRh ODA2YjIyNmNjMWFkODhiYzhiMzAzMTcyMzBmZjIzOC4uNmI2Y2NmYTkyN2UzOTYxZWVjNjEwMGYx MzYxMjJmM2M0NTMyNjAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAg LTEyMzUsOCArMTIzNSwxMyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9u VG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5jcmVh dGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCAvKiB0cmFuc3BhcmVudCAq LyBmYWxzZSwgSW50U2l6ZSgpLCBzaG91bGRVc2VGaXhlZExheW91dCk7CiAgICAgbV9mcmFtZS0+ Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQoIXdlYlBhZ2UtPmRyYXdzQmFja2dy b3VuZCgpKTsKLSAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpCisgICAgaWYgKHNob3VsZFVz ZUZpeGVkTGF5b3V0KSB7CisjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisgICAgICAgIG1f ZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KFdl YkNvcmU6OkludFJlY3QoV2ViQ29yZTo6SW50UG9pbnQoKSwgd2ViUGFnZS0+dmlld3BvcnRTaXpl KCkpKTsKKyNlbHNlCiAgICAgICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZp eGVkVmlzaWJsZUNvbnRlbnRSZWN0KHdlYlBhZ2UtPmJvdW5kcygpKTsKKyNlbmRpZgorICAgIH0K IH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkU2F2ZVRvUGFnZUNhY2hlKCkK 161228 2012-08-29 08:09:50 -0700 2012-09-03 07:14:41 -0700 Patch bug-94934-20120829170932.patch text/plain 3907 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzZkMDNlOTRlMjkzOTFl YjBjMTg4M2JjZWI4N2Y1N2U5MjRhYWI0OS4uNzk4MDQ0NjQyYzdhODdlYmQzMzY5NjQxNzJkNDYx YTJhNzZhNTMyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTI5ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFdo ZWVsLWV2ZW50cyBmYWlscyB0ZW1wb3JhcmlseSBhZnRlciByZWxvYWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTM0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IGZpeGVkIHZpc2libGUgY29udGVu dCByZWN0IHVzaW5nIHZpc2libGVDb250ZW50Qm91bmRzIGluc3RlYWQgb2YgV2ViUGFnZTo6c2l6 ZS4gT3RoZXJ3aXNlIHRoZSAKKyAgICAgICAgY29udGVudCByZWN0IHdpbGwgYmUgaW5jb3JyZWN0 bHkgc2V0IHRvIHRoZSBlbnRpcmUgZG9jdW1lbnQgc2l6ZSwgd2hlbiByZXNpemVzVG9Db250ZW50 cyBpcyBhY3RpdmUuCisKKyAgICAgICAgVGVzdDogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0 ZXN0cy9XZWJWaWV3L3RzdF93aGVlbEV2ZW50SGFuZGxpbmcucW1sCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X3doZWVsRXZlbnRIYW5kbGlu Zy5xbWw6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFu c2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKwogMjAxMi0wOC0yOCAgTWFydGluIFJvYmlu c29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRW5hYmxlIHRoZSBl ZGdlIGRpc3RhbmNlIGFudGktYWxpYXNpbmcgZm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGxh eWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9x bWx0ZXN0cy9XZWJWaWV3L3RzdF93aGVlbEV2ZW50SGFuZGxpbmcucW1sIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF93aGVlbEV2ZW50 SGFuZGxpbmcucW1sCmluZGV4IGQyNDMxMjYxMDcyZTZkZTM1MTIxMjA4ZWUyMGYzNjUwNmVlOTdi NWEuLjFmYzE1NTlhYjhjYmNjY2Q5ZTJiOThkMjAwMzY1MGM2YWE4MDNkMmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90 c3Rfd2hlZWxFdmVudEhhbmRsaW5nLnFtbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X3doZWVsRXZlbnRIYW5kbGluZy5xbWwK QEAgLTQyLDUgKzQyLDE2IEBAIEl0ZW0gewogICAgICAgICAgICAgLy8gVGhlIGNoZWNrIGJlbG93 IHdpbGwgZmFpbCBpZiB0aGUgcHJldmlvdXMgcG9zaXRpb24gd2FzIG5vdCByZXN0b3JlZCBhZnRl ciByZWxvYWQuCiAgICAgICAgICAgICB2ZXJpZnkocG9zaXRpb24gPT0gd2ViVmlldy5jb250ZW50 WSkKICAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3Rfd2hlZWxTY3JvbGxFdmVudEFm dGVyUmVsb2FkKCkgeworICAgICAgICAgICAgc2Nyb2xsU3B5LmNsZWFyKCkKKyAgICAgICAgICAg IHdlYlZpZXcucmVsb2FkKCkKKyAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3LndhaXRGb3JMb2Fk U3VjY2VlZGVkKCkpCisgICAgICAgICAgICB2YXIgY2VudGVyUG9pbnQgPSBRdC5wb2ludCh3ZWJW aWV3LndpZHRoIC8gMiwgd2ViVmlldy5oZWlnaHQgLyAyKQorICAgICAgICAgICAgdGVzdC53aGVl bEV2ZW50KHdlYlZpZXcsIGNlbnRlclBvaW50LngsIGNlbnRlclBvaW50LnksIC01MDApOworICAg ICAgICAgICAgLy8gVGhlIHNpZ25hbCBzcHkgYmVsb3cgd2lsbCB0aW1lIG91dCBpZiB0aGUgd2hl ZWwgZXZlbnQgZGlkIG5vdCBzY3JvbGwgdGhlIGNvbnRlbnQuCisgICAgICAgICAgICBzY3JvbGxT cHkud2FpdCgpCisgICAgICAgIH0KICAgICB9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHAKaW5kZXggYTNjMGNjMTRhODA2YjIyNmNjMWFkODhiYzhiMzAzMTcyMzBmZjIzOC4u NmE4MDE5MzA2MWY1OTAyMjIyYzAwNmYwOGExZDQwNjFlZGEzNDM3YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTEyMjgsNiArMTIyOCw3IEBAIHZvaWQgV2ViRnJhbWVM b2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogICAgIENvbG9y IGJhY2tncm91bmRDb2xvciA9IHdlYlBhZ2UtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkg PyBDb2xvcjo6dHJhbnNwYXJlbnQgOiBDb2xvcjo6d2hpdGU7CiAgICAgYm9vbCBpc01haW5GcmFt ZSA9IHdlYlBhZ2UtPm1haW5XZWJGcmFtZSgpID09IG1fZnJhbWU7CiAgICAgYm9vbCBzaG91bGRV c2VGaXhlZExheW91dCA9IGlzTWFpbkZyYW1lICYmIHdlYlBhZ2UtPnVzZUZpeGVkTGF5b3V0KCk7 CisgICAgSW50UmVjdCBjdXJyZW50VmlzaWJsZUNvbnRlbnRCb3VuZHMgPSBtX2ZyYW1lLT52aXNp YmxlQ29udGVudEJvdW5kcygpOwogCiAgICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJl c3BvbnNlKCk7CiAgICAgbV9mcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID0gaXNNYWluRnJh bWUgJiYgV2ViUHJvY2Vzczo6c2hhcmVkKCkuc2hvdWxkVXNlQ3VzdG9tUmVwcmVzZW50YXRpb25G b3JSZXNwb25zZShyZXNwb25zZSk7CkBAIC0xMjM1LDggKzEyMzYsOCBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIG1f ZnJhbWUtPmNvcmVGcmFtZSgpLT5jcmVhdGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3Vu ZENvbG9yLCAvKiB0cmFuc3BhcmVudCAqLyBmYWxzZSwgSW50U2l6ZSgpLCBzaG91bGRVc2VGaXhl ZExheW91dCk7CiAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0VHJhbnNwYXJl bnQoIXdlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgpKTsKLSAgICBpZiAoc2hvdWxkVXNlRml4ZWRM YXlvdXQpCi0gICAgICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlz aWJsZUNvbnRlbnRSZWN0KHdlYlBhZ2UtPmJvdW5kcygpKTsKKyAgICBpZiAoc2hvdWxkVXNlRml4 ZWRMYXlvdXQgJiYgIWN1cnJlbnRWaXNpYmxlQ29udGVudEJvdW5kcy5pc0VtcHR5KCkpCisgICAg ICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRS ZWN0KGN1cnJlbnRWaXNpYmxlQ29udGVudEJvdW5kcyk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpZFNhdmVUb1BhZ2VDYWNoZSgpCg==