122859 2013-10-15 13:39:12 -0700 [GTK] No hover-horizontal scrolling available 2016-02-16 10:15:46 -0800 1 1 1 Unclassified WebKit WebKitGTK 420+ PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=153405 P3 Normal --- 0 gnome webkit-unassigned cgarcia csaavedra gnome mcatanzaro zan oldest_to_newest 940106 0 gnome 2013-10-15 13:39:12 -0700 I am unable to perform horizontal scrolling by hovering over the horizontal scrollbar and scroll the scrolling wheel on my mouse at the same time. I am using Ephiphany 3.10.0 This behavior is, however, available in every other gtk based application I know of and use, though. For example Evince, Documents, Libreoffice applications, gedit, inkscape and gimp. I propose it is added to webkitgtk too. 940300 1 cgarcia 2013-10-16 00:53:43 -0700 Is this specific to GTK+? does it work in mac or EFL? 940309 2 cgarcia 2013-10-16 01:14:37 -0700 It works for non-primary scrollbars, like scrollbars in a text area. 940361 3 zan 2013-10-16 06:21:01 -0700 (In reply to comment #2) > It works for non-primary scrollbars, like scrollbars in a text area. I think the issue is with the main scrollbar, i.e. the scrollbar of the web view embedded inside Epiphany. 1164732 4 271339 cgarcia 2016-02-15 06:07:41 -0800 Created attachment 271339 Patch 1165051 5 271339 mcatanzaro 2016-02-15 22:05:45 -0800 Comment on attachment 271339 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271339&action=review > Source/WebCore/page/EventHandler.cpp:2649 > + bool handledEvent = platformCompleteWheelEvent(adjustedEvent, scrollableContainer.get(), scrollableArea); It looks right, though I wonder how much regression potential this has for other ports. 1165054 6 mcatanzaro 2016-02-15 22:08:23 -0800 Er, forgot to ask about a layout test for this? Probably I should have withheld my r+ pending a test; I'm sure you can write one with your new mock animator. 1165074 7 cgarcia 2016-02-16 00:15:48 -0800 (In reply to comment #5) > Comment on attachment 271339 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=271339&action=review > > > Source/WebCore/page/EventHandler.cpp:2649 > > + bool handledEvent = platformCompleteWheelEvent(adjustedEvent, scrollableContainer.get(), scrollableArea); > > It looks right, though I wonder how much regression potential this has for > other ports. In all other ports adjustedEvent == event 1165075 8 cgarcia 2016-02-16 00:16:50 -0800 (In reply to comment #6) > Er, forgot to ask about a layout test for this? Probably I should have > withheld my r+ pending a test; I'm sure you can write one with your new mock > animator. I'll try to find the time, we don't need the scroll animator tests for this, we can just hover the scrollbar, send wheel event, and check how the view scrolled. 1165149 9 271432 cgarcia 2016-02-16 09:36:43 -0800 Created attachment 271432 Patch for landing including test 1165164 10 cgarcia 2016-02-16 10:15:46 -0800 Committed r196640: <http://trac.webkit.org/changeset/196640> 271339 2016-02-15 06:07:41 -0800 2016-02-16 09:36:43 -0800 Patch wcore-frame-horizontal-wheel.diff text/plain 2897 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNjNhOTUwLi5hNTk4OTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTYtMDItMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE5vIGhvdmVyLWhvcml6b250YWwgc2Nyb2xsaW5nIGF2YWlsYWJs ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODU5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBp cyBhIHJlZ3Jlc3Npb24gb2YgV2ViS2l0MiwgYmVjYXVzZSBpbiBXZWJLaXQxIHdlIHVzZWQgbmF0 aXZlCisgICAgICAgIHdpZGdldHMgZm9yIGZyYW1lIHNjcm9sbGJhcnMgdGhhdCBoYW5kbGVkIHRo aXMgYXV0b21hdGljYWxseS4gTm93CisgICAgICAgIHdlIG5lZWQgdG8gYWxzbyBjaGVjayBpZiB0 aGUgbW91c2UgaXMgb3ZlciBmcmFtZSBzY3JvbGxiYXJzIHRvCisgICAgICAgIGFkanVzdCB0aGUg d2hlZWwgZXZlbnQuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQpOiBQYXNzIHRoZSBhZGp1 c3RlZCB3aGVlbAorICAgICAgICBldmVudCB0byBwbGF0Zm9ybUNvbXBsZXRlV2hlZWxFdmVudCgp LgorICAgICAgICAqIHBhZ2UvZ3RrL0V2ZW50SGFuZGxlckd0ay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpFdmVudEhhbmRsZXI6OnNob3VsZFR1cm5WZXJ0aWNhbFRpY2tzSW50b0hvcml6b250YWwp OgorICAgICAgICBDaGVjayBhbHNvIGZyYW1lIHNjcm9sbGJhcnMuCisKIDIwMTYtMDItMTQgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW0NTUyBGaWx0 ZXJzXSBXaGVuIGFwcGx5aW5nIGFuIFNWRyBmaWx0ZXIgb24gYSBjb21wb3NpdGVkIGltYWdlIHVz aW5nIENTUyB0aGUgaW1hZ2UgaXMgcmVuZGVyZWQgd2l0aG91dCB0aGUgZmlsdGVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggZTMyMzU2Ny4uOGJkZGMzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMjY0Niw3ICsyNjQ2LDcgQEAgYm9vbCBFdmVu dEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVu dCkKICAgICBpZiAoc2Nyb2xsYWJsZUFyZWEpCiAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRT Y3JvbGxlZFByb2dyYW1tYXRpY2FsbHkoZmFsc2UpOwogCi0gICAgYm9vbCBoYW5kbGVkRXZlbnQg PSBwbGF0Zm9ybUNvbXBsZXRlV2hlZWxFdmVudChldmVudCwgc2Nyb2xsYWJsZUNvbnRhaW5lci5n ZXQoKSwgc2Nyb2xsYWJsZUFyZWEpOworICAgIGJvb2wgaGFuZGxlZEV2ZW50ID0gcGxhdGZvcm1D b21wbGV0ZVdoZWVsRXZlbnQoYWRqdXN0ZWRFdmVudCwgc2Nyb2xsYWJsZUNvbnRhaW5lci5nZXQo KSwgc2Nyb2xsYWJsZUFyZWEpOwogICAgIHBsYXRmb3JtTm90aWZ5SWZFbmRHZXN0dXJlKGFkanVz dGVkRXZlbnQsIHNjcm9sbGFibGVBcmVhKTsKICAgICByZXR1cm4gaGFuZGxlZEV2ZW50OwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ndGsvRXZlbnRIYW5kbGVyR3RrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvZ3RrL0V2ZW50SGFuZGxlckd0ay5jcHAKaW5kZXggNzUwYjg4 YS4uM2EwMDc3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ndGsvRXZlbnRIYW5k bGVyR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2d0ay9FdmVudEhhbmRsZXJHdGsu Y3BwCkBAIC0xMjksOSArMTI5LDEzIEBAIHVuc2lnbmVkIEV2ZW50SGFuZGxlcjo6YWNjZXNzS2V5 TW9kaWZpZXJzKCkKIC8vIGhvcml6b250YWwgc2Nyb2xsYmFyIHdoaWxlIHNjcm9sbGluZyB3aXRo IHRoZSB3aGVlbDsgd2UgbmVlZCB0bwogLy8gYWRkIHRoZSBkZWx0YXMgYW5kIHRpY2tzIGhlcmUg c28gdGhhdCB0aGlzIGJlaGF2aW9yIGlzIGNvbnNpc3RlbnQKIC8vIGZvciBzdHlsZWQgc2Nyb2xs YmFycy4KLWJvb2wgRXZlbnRIYW5kbGVyOjpzaG91bGRUdXJuVmVydGljYWxUaWNrc0ludG9Ib3Jp em9udGFsKGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgUGxhdGZvcm1XaGVlbEV2 ZW50JikgY29uc3QKK2Jvb2wgRXZlbnRIYW5kbGVyOjpzaG91bGRUdXJuVmVydGljYWxUaWNrc0lu dG9Ib3Jpem9udGFsKGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgUGxhdGZvcm1X aGVlbEV2ZW50JiBldmVudCkgY29uc3QKIHsKLSAgICByZXR1cm4gcmVzdWx0LnNjcm9sbGJhcigp ICYmIHJlc3VsdC5zY3JvbGxiYXIoKS0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xs YmFyOworICAgIEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUudmlldygpOworICAgIFNjcm9sbGJh ciogc2Nyb2xsYmFyID0gdmlldyA/IHZpZXctPnNjcm9sbGJhckF0UG9pbnQoZXZlbnQucG9zaXRp b24oKSkgOiBudWxscHRyOworICAgIGlmICghc2Nyb2xsYmFyKQorICAgICAgICBzY3JvbGxiYXIg PSByZXN1bHQuc2Nyb2xsYmFyKCk7CisgICAgcmV0dXJuIHNjcm9sbGJhciAmJiBzY3JvbGxiYXIt Pm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKIH0KIAogfQo= 271432 2016-02-16 09:36:43 -0800 2016-02-16 09:36:43 -0800 Patch for landing including test wcore-horizontal-scrollbar-wheel.diff text/plain 5277 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZWY0YjNhLi4yMmFiOGZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTYtMDIt MTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAg IFtHVEtdIE5vIGhvdmVyLWhvcml6b250YWwgc2Nyb2xsaW5nIGF2YWlsYWJsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODU5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTWljaGFlbCBDYXRhbnphcm8uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsv c2Nyb2xsYmFycy9tYWluLWZyYW1lLXNjcm9sbGJhci1ob3Jpem9udGFsLXdoZWVsLXNjcm9sbC1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvc2Nyb2xsYmFycy9t YWluLWZyYW1lLXNjcm9sbGJhci1ob3Jpem9udGFsLXdoZWVsLXNjcm9sbC5odG1sOiBBZGRlZC4K KworMjAxNi0wMi0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgQWRkIGEgd2F5IHRvIHRlc3QgU2Nyb2xsQW5pbWF0b3IKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzQ3OQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvc2Nyb2xsYmFycy9tYWluLWZyYW1lLXNjcm9sbGJh ci1ob3Jpem9udGFsLXdoZWVsLXNjcm9sbC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZ3RrL3Njcm9sbGJhcnMvbWFpbi1mcmFtZS1zY3JvbGxiYXItaG9yaXpvbnRhbC13aGVl bC1zY3JvbGwtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li43YWY1M2I1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL3Nj cm9sbGJhcnMvbWFpbi1mcmFtZS1zY3JvbGxiYXItaG9yaXpvbnRhbC13aGVlbC1zY3JvbGwtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDkgQEAKKzxodG1sPgorPGJvZHkgc3R5bGU9IndpZHRoOiA1 MDAwcHg7IGhlaWdodDogNTAwMHB4Ij4KKzxwPlRoaXMgaXMgYSB0ZXN0IGZvciBidWcgPGEgaHJl Zj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjg1OSI+MTIyODU5 PC9hPi4KK1Njcm9sbGluZyB3aXRoIHRoZSBtb3VzZSB3aGVlbCBvdmVyIHRoZSBob3Jpem9udGFs IG1haW4gc2Nyb2xsYmFyIHNob3VsZCBzY3JvbGwgdGhlIHZpZXcgaG9yaXpvbnRhbGx5PC9wPgor PHNjcmlwdD4KKyAgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxMZWZ0ID0gNDA7Cis8 L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9zY3JvbGxiYXJzL21haW4tZnJhbWUtc2Nyb2xsYmFyLWhvcml6b250YWwtd2hlZWwt c2Nyb2xsLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvc2Nyb2xsYmFycy9tYWluLWZy YW1lLXNjcm9sbGJhci1ob3Jpem9udGFsLXdoZWVsLXNjcm9sbC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYwZjM3OWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvc2Nyb2xsYmFycy9tYWluLWZyYW1lLXNjcm9sbGJhci1ob3Jpem9u dGFsLXdoZWVsLXNjcm9sbC5odG1sCkBAIC0wLDAgKzEsMTIgQEAKKzxodG1sPgorPGJvZHkgc3R5 bGU9IndpZHRoOiA1MDAwcHg7IGhlaWdodDogNTAwMHB4Ij4KKzxwPlRoaXMgaXMgYSB0ZXN0IGZv ciBidWcgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy Mjg1OSI+MTIyODU5PC9hPi4KK1Njcm9sbGluZyB3aXRoIHRoZSBtb3VzZSB3aGVlbCBvdmVyIHRo ZSBob3Jpem9udGFsIG1haW4gc2Nyb2xsYmFyIHNob3VsZCBzY3JvbGwgdGhlIHZpZXcgaG9yaXpv bnRhbGx5PC9wPgorPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAg ZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oNCwgd2luZG93LmlubmVySGVpZ2h0IC0gNCk7CisgICAg ICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKKyAgfQorPC9zY3JpcHQ+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk1OTY2MC4uMTM5YzZmOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDI2IEBACiAyMDE2LTAyLTE2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBObyBob3Zlci1ob3Jpem9udGFsIHNjcm9s bGluZyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyMjg1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgor CisgICAgICAgIFRoaXMgaXMgYSByZWdyZXNzaW9uIG9mIFdlYktpdDIsIGJlY2F1c2UgaW4gV2Vi S2l0MSB3ZSB1c2VkIG5hdGl2ZQorICAgICAgICB3aWRnZXRzIGZvciBmcmFtZSBzY3JvbGxiYXJz IHRoYXQgaGFuZGxlZCB0aGlzIGF1dG9tYXRpY2FsbHkuIE5vdworICAgICAgICB3ZSBuZWVkIHRv IGFsc28gY2hlY2sgaWYgdGhlIG1vdXNlIGlzIG92ZXIgZnJhbWUgc2Nyb2xsYmFycyB0bworICAg ICAgICBhZGp1c3QgdGhlIHdoZWVsIGV2ZW50LgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL2d0 ay9zY3JvbGxiYXJzL21haW4tZnJhbWUtc2Nyb2xsYmFyLWhvcml6b250YWwtd2hlZWwtc2Nyb2xs Lmh0bWwKKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlV2hlZWxFdmVudCk6IFBhc3MgdGhlIGFkanVzdGVkIHdo ZWVsCisgICAgICAgIGV2ZW50IHRvIHBsYXRmb3JtQ29tcGxldGVXaGVlbEV2ZW50KCkuCisgICAg ICAgICogcGFnZS9ndGsvRXZlbnRIYW5kbGVyR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6c2hvdWxkVHVyblZlcnRpY2FsVGlja3NJbnRvSG9yaXpvbnRhbCk6CisgICAg ICAgIENoZWNrIGFsc28gZnJhbWUgc2Nyb2xsYmFycy4KKworMjAxNi0wMi0xNiAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgUkVHUkVTU0lPTihy MTg4NjU5KTogTm9uIG1haW4gZnJhbWUgc2Nyb2xsYWJsZSBhcmVhcyBkb24ndCB3b3JrIGZvciBw YWdlcyByZXN0b3JlZCBmcm9tIHRoZSBwYWdlIGNhY2hlCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM0MDQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwCmluZGV4IDA0Njg0YzguLmExZTU4ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5jcHAKQEAgLTI2NTQsNyArMjY1NCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5k bGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQpCiAgICAgaWYgKHNj cm9sbGFibGVBcmVhKQogICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsZWRQcm9ncmFt bWF0aWNhbGx5KGZhbHNlKTsKIAotICAgIGJvb2wgaGFuZGxlZEV2ZW50ID0gcGxhdGZvcm1Db21w bGV0ZVdoZWVsRXZlbnQoZXZlbnQsIHNjcm9sbGFibGVDb250YWluZXIuZ2V0KCksIHNjcm9sbGFi bGVBcmVhKTsKKyAgICBib29sIGhhbmRsZWRFdmVudCA9IHBsYXRmb3JtQ29tcGxldGVXaGVlbEV2 ZW50KGFkanVzdGVkRXZlbnQsIHNjcm9sbGFibGVDb250YWluZXIuZ2V0KCksIHNjcm9sbGFibGVB cmVhKTsKICAgICBwbGF0Zm9ybU5vdGlmeUlmRW5kR2VzdHVyZShhZGp1c3RlZEV2ZW50LCBzY3Jv bGxhYmxlQXJlYSk7CiAgICAgcmV0dXJuIGhhbmRsZWRFdmVudDsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvZ3RrL0V2ZW50SGFuZGxlckd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2d0ay9FdmVudEhhbmRsZXJHdGsuY3BwCmluZGV4IDc1MGI4OGEuLjNhMDA3NzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvZ3RrL0V2ZW50SGFuZGxlckd0ay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9ndGsvRXZlbnRIYW5kbGVyR3RrLmNwcApAQCAtMTI5LDkg KzEyOSwxMyBAQCB1bnNpZ25lZCBFdmVudEhhbmRsZXI6OmFjY2Vzc0tleU1vZGlmaWVycygpCiAv LyBob3Jpem9udGFsIHNjcm9sbGJhciB3aGlsZSBzY3JvbGxpbmcgd2l0aCB0aGUgd2hlZWw7IHdl IG5lZWQgdG8KIC8vIGFkZCB0aGUgZGVsdGFzIGFuZCB0aWNrcyBoZXJlIHNvIHRoYXQgdGhpcyBi ZWhhdmlvciBpcyBjb25zaXN0ZW50CiAvLyBmb3Igc3R5bGVkIHNjcm9sbGJhcnMuCi1ib29sIEV2 ZW50SGFuZGxlcjo6c2hvdWxkVHVyblZlcnRpY2FsVGlja3NJbnRvSG9yaXpvbnRhbChjb25zdCBI aXRUZXN0UmVzdWx0JiByZXN1bHQsIGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpIGNvbnN0Citi b29sIEV2ZW50SGFuZGxlcjo6c2hvdWxkVHVyblZlcnRpY2FsVGlja3NJbnRvSG9yaXpvbnRhbChj b25zdCBIaXRUZXN0UmVzdWx0JiByZXN1bHQsIGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZl bnQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHJlc3VsdC5zY3JvbGxiYXIoKSAmJiByZXN1bHQuc2Ny b2xsYmFyKCktPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKKyAgICBGcmFt ZVZpZXcqIHZpZXcgPSBtX2ZyYW1lLnZpZXcoKTsKKyAgICBTY3JvbGxiYXIqIHNjcm9sbGJhciA9 IHZpZXcgPyB2aWV3LT5zY3JvbGxiYXJBdFBvaW50KGV2ZW50LnBvc2l0aW9uKCkpIDogbnVsbHB0 cjsKKyAgICBpZiAoIXNjcm9sbGJhcikKKyAgICAgICAgc2Nyb2xsYmFyID0gcmVzdWx0LnNjcm9s bGJhcigpOworICAgIHJldHVybiBzY3JvbGxiYXIgJiYgc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigp ID09IEhvcml6b250YWxTY3JvbGxiYXI7CiB9CiAKIH0K