120542 2013-08-30 11:43:20 -0700 [wk2] REGRESSION (r154673): PDF scrolling moves very slowly 2013-09-08 22:18:01 -0700 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Mac (Intel) OS X 10.8 RESOLVED FIXED InRadar P2 Normal --- 1 arsenm2 cdumez cdumez commit-queue darin eric.carlson esprehn+autocc glenn jer.noble penagoscorzo thorton webkit-bug-importer oldest_to_newest 923114 0 210142 arsenm2 2013-08-30 11:43:20 -0700 Created attachment 210142 Testcase PDF This PDF scrolls very slowly. Not graphically slowly, but slow as in it takes a lot of scrolling effort to move forward in the PDF. Scrolling the full height of my trackpad only advances about one line forward of text instead of most of a page like expected. The PDF scrolls normally in Preview. Link to PDF: http://cs.brown.edu/courses/cs033/docs/x86_cheatsheet.pdf I will also attach it in case it changes or goes away. 923116 1 thorton 2013-08-30 11:48:09 -0700 Super bizarre; I can reproduce. Dragging the scroll thumb or autoscrolling (via dragging) work fine. 923117 2 webkit-bug-importer 2013-08-30 11:48:25 -0700 <rdar://problem/14881237> 923143 3 thorton 2013-08-30 12:36:01 -0700 Broke in http://trac.webkit.org/changeset/154673; Christophe, might you take a peek? 923265 4 zalan 2013-08-31 01:57:47 -0700 *** Bug 120417 has been marked as a duplicate of this bug. *** 923266 5 cdumez 2013-08-31 02:01:35 -0700 I am investigating, sorry about the breakage. Unfortunately, it seems only Mac WK2 supports this PDF plugin so I cannot test / reproduce the issue. 923267 6 210183 cdumez 2013-08-31 02:19:45 -0700 Created attachment 210183 Experiment #1 Looking at my patch, I could find one small behavior change. WheelEvent::deltaX() / WheelEvent::deltaY() used to return a rounded integer and now they return a double value. I figured this should not be too much of a problem because EventHandler's scrollNode() takes a floating point value in argument anyway. This experimental patch attached rounds the value returned by WheelEvent::deltaX() / WheelEvent::deltaY() in EventHandler so that it should behave exactly like before. It would be great if someone could let me know if it has any impact on the PDF scrolling issue (since I don't run the mac port unfortunately). I am not sure why this would impact PDF scrolling in WK2 at this point but I wasn't able to find any other behavior change with my patch yet. 923301 7 ap 2013-08-31 09:08:37 -0700 Chris, I suspect that this may be more like bug 87557, which had very similar symptoms. 926293 8 thorton 2013-09-07 16:10:49 -0700 (In reply to comment #6) > Created an attachment (id=210183) [details] > Experiment #1 > > Looking at my patch, I could find one small behavior change. WheelEvent::deltaX() / WheelEvent::deltaY() used to return a rounded integer and now they return a double value. > I figured this should not be too much of a problem because EventHandler's scrollNode() takes a floating point value in argument anyway. > > This experimental patch attached rounds the value returned by WheelEvent::deltaX() / WheelEvent::deltaY() in EventHandler so that it should behave exactly like before. It would be great if someone could let me know if it has any impact on the PDF scrolling issue (since I don't run the mac port unfortunately). This patch does not fix the problem. I have a feeling Alexey's note is probably more accurate. 926296 9 thorton 2013-09-07 16:27:47 -0700 FWIW I'm not seeing PDFPlugin::handleWheelEvent get hit *at all* now. 926298 10 thorton 2013-09-07 16:36:53 -0700 (In reply to comment #9) > FWIW I'm not seeing PDFPlugin::handleWheelEvent get hit *at all* now. The event that's making it to PluginView is a "wheel" event, not a "mousewheel" event, so it doesn't get forwarded on to the Plugin. 926299 11 thorton 2013-09-07 16:39:17 -0700 (In reply to comment #10) > (In reply to comment #9) > > FWIW I'm not seeing PDFPlugin::handleWheelEvent get hit *at all* now. > > The event that's making it to PluginView is a "wheel" event, not a "mousewheel" event, so it doesn't get forwarded on to the Plugin. ... which is exactly what your change is about. Should we just be using "wheel" in WebKit2? Should that have been part of your patch? 926300 12 thorton 2013-09-07 16:43:08 -0700 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #9) > > > FWIW I'm not seeing PDFPlugin::handleWheelEvent get hit *at all* now. > > > > The event that's making it to PluginView is a "wheel" event, not a "mousewheel" event, so it doesn't get forwarded on to the Plugin. > > ... which is exactly what your change is about. Should we just be using "wheel" in WebKit2? Should that have been part of your patch? MediaControlsApple also uses mousewheelEvent. Should that be changed too? Did you by any chance grep the codebase for the "legacy" event you were changing? 926389 13 cdumez 2013-09-07 23:16:07 -0700 Thanks for investigating this. Note that my patch adds support for the 'wheel' event but does NOT remove support for the legacy 'mousewheel' event. Therefore, code that is still using the legacy event should in theory be fine. There are a lot of layout tests using it and still passing. There is one case where the 'mousewheel' event no longer gets fired. This is when there is a listener of the 'wheel' event already. The 'mousewheel' is only fired as fallback (similarly to webkit- prefixed events). The assumption is that the web page either uses the new standard event, or the legacy one, but not both. 926390 14 thorton 2013-09-07 23:22:21 -0700 (In reply to comment #13) > Thanks for investigating this. > > Note that my patch adds support for the 'wheel' event but does NOT remove support for the legacy 'mousewheel' event. Therefore, code that is still using the legacy event should in theory be fine. There are a lot of layout tests using it and still passing. > > There is one case where the 'mousewheel' event no longer gets fired. This is when there is a listener of the 'wheel' event already. The 'mousewheel' is only fired as fallback (similarly to webkit- prefixed events). The assumption is that the web page either uses the new standard event, or the legacy one, but not both. To a page, maybe, but what events will make it to e.g. PluginView::handleEvent? Where does the wheel/mouseWheel split happen? If a page uses wheel events, will a <object> inside it get mouseWheel events, or not? None of the aforementioned layout tests test plugins, obviously, because plugins very clearly do not get mouseWheel events anymore. 926391 15 cdumez 2013-09-07 23:35:10 -0700 (In reply to comment #14) > (In reply to comment #13) > > Thanks for investigating this. > > > > Note that my patch adds support for the 'wheel' event but does NOT remove support for the legacy 'mousewheel' event. Therefore, code that is still using the legacy event should in theory be fine. There are a lot of layout tests using it and still passing. > > > > There is one case where the 'mousewheel' event no longer gets fired. This is when there is a listener of the 'wheel' event already. The 'mousewheel' is only fired as fallback (similarly to webkit- prefixed events). The assumption is that the web page either uses the new standard event, or the legacy one, but not both. > > To a page, maybe, but what events will make it to e.g. PluginView::handleEvent? Where does the wheel/mouseWheel split happen? If a page uses wheel events, will a <object> inside it get mouseWheel events, or not? > > None of the aforementioned layout tests test plugins, obviously, because plugins very clearly do not get mouseWheel events anymore. The split occurs in EventTarget.cpp. I don't know much about plugins but I will take a look as well. 926395 16 210966 cdumez 2013-09-08 00:37:22 -0700 Created attachment 210966 Patch 926396 17 cdumez 2013-09-08 00:40:04 -0700 You were right, I missed several instances where the code is only checking for 'mousewheel' event name but not 'wheel'. I fixed that in this patch. I am confident this fixes the scrolling issue even though I haven't tested. I initially grep'ed on Blink side to make sure I updated everything but failed to do the same on WebKit side when I ported the patch. Sorry about that. 926515 18 210966 thorton 2013-09-08 15:42:39 -0700 Comment on attachment 210966 Patch That works for me, and seems reasonable. 926516 19 thorton 2013-09-08 15:43:12 -0700 (In reply to comment #17) > You were right, I missed several instances where the code is only checking for 'mousewheel' event name but not 'wheel'. I fixed that in this patch. I am confident this fixes the scrolling issue even though I haven't tested. > > I initially grep'ed on Blink side to make sure I updated everything but failed to do the same on WebKit side when I ported the patch. Sorry about that. That would do it :D Thanks for fixing! 926571 20 210966 commit-queue 2013-09-08 22:17:57 -0700 Comment on attachment 210966 Patch Clearing flags on attachment: 210966 Committed r155321: <http://trac.webkit.org/changeset/155321> 926572 21 commit-queue 2013-09-08 22:18:01 -0700 All reviewed patches have been landed. Closing bug. 210142 2013-08-30 11:43:20 -0700 2013-08-30 11:43:20 -0700 Testcase PDF url.txt text/plain 57 arsenm2 aHR0cDovL2NzLmJyb3duLmVkdS9jb3Vyc2VzL2NzMDMzL2RvY3MveDg2X2NoZWF0c2hlZXQucGRm 210183 2013-08-31 02:19:45 -0700 2013-09-08 00:37:15 -0700 Experiment #1 120542_wheel_pdf.patch text/plain 1283 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA0ODNjOWJhLi4xNjYzZjgwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0yNTg0LDEwICsyNTg0LDEwIEBA IHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0V2hlZWxFdmVudEhhbmRsZXIoTm9kZSogc3RhcnRO b2RlLCBXaGVlbEV2ZW50KiB3aGVlbEV2CiAgICAgCiAgICAgLy8gQnJlYWsgdXAgaW50byB0d28g c2Nyb2xscyBpZiB3ZSBuZWVkIHRvLiAgRGlhZ29uYWwgbW92ZW1lbnQgb24gCiAgICAgLy8gYSBN YWNCb29rIHBybyBpcyBhbiBleGFtcGxlIG9mIGEgMi1kaW1lbnNpb25hbCBtb3VzZSB3aGVlbCBl dmVudCAod2hlcmUgYm90aCBkZWx0YVggYW5kIGRlbHRhWSBjYW4gYmUgc2V0KS4KLSAgICBpZiAo ZG9taW5hbnREaXJlY3Rpb24gIT0gRG9taW5hbnRTY3JvbGxEaXJlY3Rpb25WZXJ0aWNhbCAmJiBz Y3JvbGxOb2RlKHdoZWVsRXZlbnQtPmRlbHRhWCgpLCBncmFudWxhcml0eSwgU2Nyb2xsUmlnaHQs IFNjcm9sbExlZnQsIHN0YXJ0Tm9kZSwgJnN0b3BOb2RlKSkKKyAgICBpZiAoZG9taW5hbnREaXJl Y3Rpb24gIT0gRG9taW5hbnRTY3JvbGxEaXJlY3Rpb25WZXJ0aWNhbCAmJiBzY3JvbGxOb2RlKHJv dW5kKHdoZWVsRXZlbnQtPmRlbHRhWCgpKSwgZ3JhbnVsYXJpdHksIFNjcm9sbFJpZ2h0LCBTY3Jv bGxMZWZ0LCBzdGFydE5vZGUsICZzdG9wTm9kZSkpCiAgICAgICAgIHdoZWVsRXZlbnQtPnNldERl ZmF1bHRIYW5kbGVkKCk7CiAgICAgCi0gICAgaWYgKGRvbWluYW50RGlyZWN0aW9uICE9IERvbWlu YW50U2Nyb2xsRGlyZWN0aW9uSG9yaXpvbnRhbCAmJiBzY3JvbGxOb2RlKHdoZWVsRXZlbnQtPmRl bHRhWSgpLCBncmFudWxhcml0eSwgU2Nyb2xsRG93biwgU2Nyb2xsVXAsIHN0YXJ0Tm9kZSwgJnN0 b3BOb2RlKSkKKyAgICBpZiAoZG9taW5hbnREaXJlY3Rpb24gIT0gRG9taW5hbnRTY3JvbGxEaXJl Y3Rpb25Ib3Jpem9udGFsICYmIHNjcm9sbE5vZGUocm91bmQod2hlZWxFdmVudC0+ZGVsdGFZKCkp LCBncmFudWxhcml0eSwgU2Nyb2xsRG93biwgU2Nyb2xsVXAsIHN0YXJ0Tm9kZSwgJnN0b3BOb2Rl KSkKICAgICAgICAgd2hlZWxFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAKICAgICBp ZiAoIW1fbGF0Y2hlZFdoZWVsRXZlbnROb2RlKQo= 210966 2013-09-08 00:37:22 -0700 2013-09-08 22:17:57 -0700 Patch bug-120542-20130908103721.patch text/plain 5864 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1Mjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg3NDNhZTdkN2I1NmRm NmEwNzAwODMxNmExODY3YWE5ODNhNjgxMS4uMzRlOTNhNjZkYzFiOTBkNmYxNjdhZGVkNWFkOTcz NDg1ZTEwY2I3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA5LTA4ICBDaHJp c3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbd2sy XSBSRUdSRVNTSU9OIChyMTU0NjczKTogUERGIHNjcm9sbGluZyBtb3ZlcyB2ZXJ5IHNsb3dseQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNTQyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFuZGxlICd3 aGVlbCcgZXZlbnRzIGluIGFkZGl0aW9uIHRvICdtb3VzZXdoZWVsJy4KKworICAgICAgICAqIGh0 bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHA6CisgICAgICAgIExpc3RlbiBmb3IgdGhl IHN0YW5kYXJkICd3aGVlbCcgZXZlbnQgaW5zdGVhZCBvZiB0aGUgbGVnYWN5ICdtb3VzZXdoZWVs JyBvbmUuCisgICAgICAgIFdoaWxlIG5vdCBzdHJpY3RseSBuZWVkZWQsIHdlIHNob3VsZCB1c2Ug dGhlIGxlZ2FjeSBldmVudHMgYXMgbGl0dGxlIGFzCisgICAgICAgIHBvc3NpYmxlLgorICAgICAg ICAqIHBsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIEhhbmRsZSAnd2hlZWwnIGV2ZW50 cyBpbiBhZGRpdGlvbiB0byAnbW91c2V3aGVlbCcuCisKIDIwMTMtMDktMDcgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNlcGFyYXRlIGZvcndhcmQgYW5kIGJh Y2t3YXJkIHBhdGhzIGluIENvbXBvc2VkU2hhZG93VHJlZVdhbGtlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDFi ODk4ZDZmOTQ1MGRiYzg3YzUyZjAxMzljMmYyNWM3MTBiNDA3YTcuLjQ0ZjgyNjgwNWM0ZjAxYWNl MjEwMjU2ODAzZDc5ZTUwYTU4YzM5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx My0wOS0wOCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW3drMl0gUkVHUkVTU0lPTiAocjE1NDY3Myk6IFBERiBzY3JvbGxpbmcgbW92ZXMg dmVyeSBzbG93bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMDU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEhhbmRsZSAnd2hlZWwnIGV2ZW50cyBpbiBhZGRpdGlvbiB0byAnbW91c2V3aGVlbCcuIFRo aXMgZml4ZXMKKyAgICAgICAgUERGIHNjcm9sbGluZy4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6aGFu ZGxlRXZlbnQpOgorCiAyMDEzLTA5LTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBQYXNzT3duQXJyYXlQdHIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuY3BwCmluZGV4IDkxN2E4 NDIyZjc5ZmI1ZTUzOWViZDc5M2NkMjk4NmIyODYzMWVhZDkuLmRlNDhkZTg0ZjZjMjg1OGUxMzRh NmVjNjU0ZTYyMDY4NGRhZDFlZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFk b3cvTWVkaWFDb250cm9sc0FwcGxlLmNwcApAQCAtNTIyLDcgKzUyMiw3IEBAIHZvaWQgTWVkaWFD b250cm9sc0FwcGxlOjpzaG93Q2xvc2VkQ2FwdGlvblRyYWNrTGlzdCgpCiAgICAgbV9wYW5lbC0+ c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVBvaW50ZXJFdmVudHMsIENTU1ZhbHVl Tm9uZSk7CiAKICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBldmVudExpc3Rl bmVyKCk7Ci0gICAgbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+YWRkRXZlbnRMaXN0ZW5lcihl dmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50LCBsaXN0ZW5lciwgdHJ1ZSk7CisgICAgbV9jbG9z ZWRDYXB0aW9uc0NvbnRhaW5lci0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkud2hlZWxF dmVudCwgbGlzdGVuZXIsIHRydWUpOwogCiAgICAgLy8gVHJhY2sgY2xpY2sgZXZlbnRzIGluIHRo ZSBjYXB0dXJlIHBoYXNlIGF0IHR3byBsZXZlbHMsIGZpcnN0IGF0IHRoZSBkb2N1bWVudCBsZXZl bAogICAgIC8vIHN1Y2ggdGhhdCBhIGNsaWNrIG91dHNpZGUgb2YgdGhlIDx2aWRlbz4gbWF5IGRp c21pc3MgdGhlIHRyYWNrIGxpc3QsIHNlY29uZCBhdCB0aGUKQEAgLTU0NCw3ICs1NDQsNyBAQCB2 b2lkIE1lZGlhQ29udHJvbHNBcHBsZTo6aGlkZUNsb3NlZENhcHRpb25UcmFja0xpc3QoKQogICAg IG1fcGFuZWwtPnJlbW92ZUlubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlQb2ludGVyRXZl bnRzKTsKIAogICAgIEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVyID0gZXZlbnRMaXN0ZW5lcigpLmdl dCgpOwotICAgIG1fY2xvc2VkQ2FwdGlvbnNDb250YWluZXItPnJlbW92ZUV2ZW50TGlzdGVuZXIo ZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCwgbGlzdGVuZXIsIHRydWUpOworICAgIG1fY2xv c2VkQ2FwdGlvbnNDb250YWluZXItPnJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLndo ZWVsRXZlbnQsIGxpc3RlbmVyLCB0cnVlKTsKICAgICBkb2N1bWVudCgpLnJlbW92ZUV2ZW50TGlz dGVuZXIoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIGxpc3RlbmVyLCB0cnVlKTsKICAgICByZW1v dmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCBsaXN0ZW5lciwgdHJ1ZSk7 CiB9CkBAIC02MDIsNyArNjAyLDggQEAgdm9pZCBNZWRpYUNvbnRyb2xzQXBwbGVFdmVudExpc3Rl bmVyOjpoYW5kbGVFdmVudChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgRXZlbnQKICAgICBpZiAo ZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCkKICAgICAgICAgbV9tZWRp YUNvbnRyb2xzLT5oYW5kbGVDbGlja0V2ZW50KGV2ZW50KTsKIAotICAgIGVsc2UgaWYgKGV2ZW50 LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCAmJiBldmVudC0+aGFzSW50 ZXJmYWNlKGV2ZW50TmFtZXMoKS5pbnRlcmZhY2VGb3JXaGVlbEV2ZW50KSkgeworICAgIGVsc2Ug aWYgKChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS53aGVlbEV2ZW50IHx8IGV2ZW50LT50 eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCkKKyAgICAgICAgJiYgZXZlbnQt Pmhhc0ludGVyZmFjZShldmVudE5hbWVzKCkuaW50ZXJmYWNlRm9yV2hlZWxFdmVudCkpIHsKICAg ICAgICAgV2hlZWxFdmVudCogd2hlZWxFdmVudCA9IHN0YXRpY19jYXN0PFdoZWVsRXZlbnQqPihl dmVudCk7CiAgICAgICAgIGlmIChtX21lZGlhQ29udHJvbHMtPnNob3VsZENsb3NlZENhcHRpb25z Q29udGFpbmVyUHJldmVudFBhZ2VTY3JvbGxpbmcod2hlZWxFdmVudC0+d2hlZWxEZWx0YVkoKSkp CiAgICAgICAgICAgICBldmVudC0+cHJldmVudERlZmF1bHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5z L1BsdWdpblZpZXcuY3BwCmluZGV4IDhiMWVlN2E2OWZhNGZkYWNhMGZmODlkMWI0NGUxYTE0Mzc2 ODdhMjcuLjRiNTA0OGE0ZjBlY2ZiOTg2NTM1OTM0MWRkY2ExYWM4OGNjYzc2Y2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtMTczLDcgKzE3Myw3IEBAIHZvaWQgUGx1 Z2luVmlldzo6aGFuZGxlRXZlbnQoRXZlbnQqIGV2ZW50KQogICAgIGVsc2UgaWYgKGV2ZW50LT5p c0tleWJvYXJkRXZlbnQoKSkKICAgICAgICAgaGFuZGxlS2V5Ym9hcmRFdmVudChzdGF0aWNfY2Fz dDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpKTsKICNpZiBkZWZpbmVkKFhQX01BQ09TWCkKLSAgICBl bHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCisg ICAgZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkud2hlZWxFdmVudCB8fCBl dmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCiAgICAgICAgIGhh bmRsZVdoZWVsRXZlbnQoc3RhdGljX2Nhc3Q8V2hlZWxFdmVudCo+KGV2ZW50KSk7CiAjZW5kaWYK ICAgICBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5jb250ZXh0bWVudUV2 ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwCmluZGV4IGRlMDIwN2ZiMjVjMGI1NTA1OWUwNmM0MmM2OWE4NGZmZjZkMGVjMjAuLjQ3Zjlm ZTEzMWVmYWU0ZTc2YmRkZWI4YWVmMGFlNDNlYzEzYjY4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTg5MCw3ICs4OTAsOCBA QCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZUV2ZW50KEV2ZW50KiBldmVudCkKICAgICAgICAgZGlk SGFuZGxlRXZlbnQgPSBtX3BsdWdpbi0+aGFuZGxlTW91c2VFdmVudChzdGF0aWNfY2FzdDxjb25z dCBXZWJNb3VzZUV2ZW50Jj4oKmN1cnJlbnRFdmVudCkpOwogICAgICAgICBpZiAoZXZlbnQtPnR5 cGUoKSAhPSBldmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQpCiAgICAgICAgICAgICBwbHVnaW5E aWRSZWNlaXZlVXNlckludGVyYWN0aW9uKCk7Ci0gICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgp ID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQgJiYgY3VycmVudEV2ZW50LT50eXBlKCkg PT0gV2ViRXZlbnQ6OldoZWVsICYmIG1fcGx1Z2luLT53YW50c1doZWVsRXZlbnRzKCkpIHsKKyAg ICB9IGVsc2UgaWYgKChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS53aGVlbEV2ZW50IHx8 IGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCkKKyAgICAgICAg JiYgY3VycmVudEV2ZW50LT50eXBlKCkgPT0gV2ViRXZlbnQ6OldoZWVsICYmIG1fcGx1Z2luLT53 YW50c1doZWVsRXZlbnRzKCkpIHsKICAgICAgICAgZGlkSGFuZGxlRXZlbnQgPSBtX3BsdWdpbi0+ aGFuZGxlV2hlZWxFdmVudChzdGF0aWNfY2FzdDxjb25zdCBXZWJXaGVlbEV2ZW50Jj4oKmN1cnJl bnRFdmVudCkpOwogICAgICAgICBwbHVnaW5EaWRSZWNlaXZlVXNlckludGVyYWN0aW9uKCk7CiAg ICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVu dCAmJiBjdXJyZW50RXZlbnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VNb3ZlKQo=