155292 2016-03-10 01:43:27 -0800 [GTK] Scrollbars are broken once again with current GTK+ master 2016-03-10 22:59:53 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply oldest_to_newest 1173029 0 cgarcia 2016-03-10 01:43:27 -0800 So, basically most of the trouch theming properties have been moved to the scrollbar, and a new gadget "contents" has been added between the scrollbar and its children. 1173042 1 273553 cgarcia 2016-03-10 02:45:46 -0800 Created attachment 273553 Patch 1173078 2 273553 mcatanzaro 2016-03-10 07:03:50 -0800 Comment on attachment 273553 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273553&action=review I'm surprised that some of these changes are not guarded by GTK_CHECK_VERSION, but I presume you've tested it with 3.16 or 3.18. > Source/WebCore/ChangeLog:8 > + Most of the trouch theming properties have been moved to the trough > Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp:217 > + gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "right" : "bottom"); Are you sure this is right? I thought these were used to indicate the position of the scrollbar within its trough, not the position of the scrollbar in the window itself. So a vertical scrollbar should start with the "top" style class rather than "right", and the horizontal scrollbar would start with "left" rather than "bottom". Then once the scrollbar moves any distance on the trough, that style class should be removed, and restored only if it reaches the very top/left/right/bottom again. A pain, so I thought it OK to ignore. However I didn't check the code, and if you tell me these are now "overloaded" and necessary to get the border correct, then that's fine.... 1173093 3 cgarcia 2016-03-10 08:15:37 -0800 (In reply to comment #2) > Comment on attachment 273553 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=273553&action=review > > I'm surprised that some of these changes are not guarded by > GTK_CHECK_VERSION, but I presume you've tested it with 3.16 or 3.18. Yes, I tested with the gtk+ version in the internal jhbuild. I tried to recude the amount of ifdefed code. > > Source/WebCore/ChangeLog:8 > > + Most of the trouch theming properties have been moved to the > > trough > > > Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp:217 > > + gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "right" : "bottom"); > > Are you sure this is right? I thought these were used to indicate the > position of the scrollbar within its trough, not the position of the > scrollbar in the window itself. So a vertical scrollbar should start with > the "top" style class rather than "right", and the horizontal scrollbar > would start with "left" rather than "bottom". Then once the scrollbar moves > any distance on the trough, that style class should be removed, and restored > only if it reaches the very top/left/right/bottom again. A pain, so I > thought it OK to ignore. > > However I didn't check the code, and if you tell me these are now > "overloaded" and necessary to get the border correct, then that's fine.... This is in Adwaita: // scrollbar border &.top { border-bottom: 1px solid $borders_color; } &.bottom { border-top: 1px solid $borders_color; } &.left { border-right: 1px solid $borders_color; } &.right { border-left: 1px solid $borders_color; } So, if the top class is present it has 1 pixel border at the bottom, if bottom at the top, if left at the right and if right at the left. Thats' what we do now. We should fix this to support RTL scrollbars, but ATM vertical is always left (has a right border) and horizontal is bottom (has a top border). 1173613 4 cgarcia 2016-03-10 22:59:53 -0800 Committed r197997: <http://trac.webkit.org/changeset/197997> 273553 2016-03-10 02:45:46 -0800 2016-03-10 07:03:50 -0800 Patch wcore-gtk-scrollbars.diff text/plain 12275 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNzIwOTNjLi5mZTUwMTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTYtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFNjcm9sbGJhcnMgYXJlIGJyb2tlbiBvbmNlIGFnYWluIHdpdGgg Y3VycmVudCBHVEsrIG1hc3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU1MjkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW9zdCBvZiB0aGUgdHJvdWNoIHRoZW1pbmcgcHJvcGVydGllcyBoYXZlIGJl ZW4gbW92ZWQgdG8gdGhlCisgICAgICAgIHNjcm9sbGJhciwgYW5kIGEgbmV3IGdhZGdldCAiY29u dGVudHMiIGhhcyBiZWVuIGFkZGVkIGJldHdlZW4gdGhlCisgICAgICAgIHNjcm9sbGJhciBhbmQg aXRzIGNoaWxkcmVuLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3Rr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpnZXRPckNyZWF0ZVN0 eWxlQ29udGV4dCk6IEFkZAorICAgICAgICBsZWZ0L2JvdHRvbSBzdHlsZSBjbGFzc2VzIHRvIGVu c3VyZSB0aGUgc2Nyb2xsYmFycyBib3JkZXIgaXMgdGFrZW4KKyAgICAgICAgaW50byBhY2NvdW50 IGFuZCByZW5kZXJlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpwYWlu dFRyYWNrQmFja2dyb3VuZCk6IEFsc28gY3JlYXRlCisgICAgICAgIHN0eWxlIGNvbnRleHQgZm9y IGNvbnRlbnRzIGdhZGdldC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpw YWludFRodW1iKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6 cGFpbnRCdXR0b24pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3Rr OjpzY3JvbGxiYXJUaGlja25lc3MpOiBUYWtlIHRoZQorICAgICAgICBzY3JvbGxiYXIgYm9yZGVy IGludG8gYWNjb3VudC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpidXR0 b25TaXplKTogQWxzbyBjcmVhdGUgc3R5bGUKKyAgICAgICAgY29udGV4dCBmb3IgY29udGVudHMg Z2FkZ2V0LgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OmdldFN0ZXBwZXJT cGFjaW5nKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6bWlu aW11bVRodW1iTGVuZ3RoKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVt ZUd0azo6dGh1bWJGYXRuZXNzKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJU aGVtZUd0azo6Z2V0VHJvdWdoQm9yZGVyKTogVGFrZSB0aGUgc2Nyb2xsYmFyCisgICAgICAgIGJv cmRlciBpbnRvIGFjY291bnQuCisKIDIwMTYtMDMtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxicG91 bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW1wcm92ZSBjb2RlZ2VuIG9mIENvbXBh cmUgYW5kIFRlc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3Jv bGxiYXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFy VGhlbWVHdGsuY3BwCmluZGV4IGFhYzY1ZWYuLjM2ZmE5ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcApAQCAtMTkwLDExICsxOTAs NiBAQCBJbnRSZWN0IFNjcm9sbGJhclRoZW1lR3RrOjp0cmFja1JlY3QoU2Nyb2xsYmFyJiBzY3Jv bGxiYXIsIGJvb2wgcGFpbnRpbmcpCiB9CiAKICNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIKLXN0 YXRpYyBpbmxpbmUgY29uc3QgY2hhciogb3JpZW50YXRpb25TdHlsZUNsYXNzKFNjcm9sbGJhck9y aWVudGF0aW9uIG9yaWVudGF0aW9uKQotewotICAgIHJldHVybiBvcmllbnRhdGlvbiA9PSBWZXJ0 aWNhbFNjcm9sbGJhciA/ICJ2ZXJ0aWNhbCIgOiAiaG9yaXpvbnRhbCI7Ci19Ci0KIC8vIFRoZSBH dGtTdHlsZUNvbnRleHQgcmV0dXJuZWQgYnkgdGhpcyBmdW5jdGlvbiBpcyBjYWNoZWQgYnkgU2Ny b2xsYmFyVGhlbWVHdGs6OnBhaW50IGZvciB0aGUKIC8vIGR1cmF0aW9uIG9mIGl0cyBzY29wZSwg c28gYSBkaWZmZXJlbnQgR3RrU3R5bGVDb250ZXh0IHdpdGggdXBkYXRlZCB0aGVtZSBwcm9wZXJ0 aWVzIHdpbGwgYmUKIC8vIHVzZWQgZm9yIGVhY2ggY2FsbCB0byBwYWludC4KQEAgLTIxNyw3ICsy MTIsOSBAQCBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gU2Nyb2xsYmFyVGhlbWVHdGs6OmdldE9y Q3JlYXRlU3R5bGVDb250ZXh0KFNjcm9sbGJhciogcwogI2Vsc2UKICAgICBndGtfd2lkZ2V0X3Bh dGhfaXRlcl9hZGRfY2xhc3MocGF0aC5nZXQoKSwgLTEsICJzY3JvbGxiYXIiKTsKICNlbmRpZgot ICAgIGd0a193aWRnZXRfcGF0aF9pdGVyX2FkZF9jbGFzcyhwYXRoLmdldCgpLCAtMSwgb3JpZW50 YXRpb25TdHlsZUNsYXNzKHNjcm9sbGJhciA/IHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA6IFZl cnRpY2FsU2Nyb2xsYmFyKSk7CisgICAgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24g PSBzY3JvbGxiYXIgPyBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgOiBWZXJ0aWNhbFNjcm9sbGJh cjsKKyAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9hZGRfY2xhc3MocGF0aC5nZXQoKSwgLTEsIG9y aWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFyID8gInZlcnRpY2FsIiA6ICJob3Jpem9udGFs Iik7CisgICAgZ3RrX3dpZGdldF9wYXRoX2l0ZXJfYWRkX2NsYXNzKHBhdGguZ2V0KCksIC0xLCBv cmllbnRhdGlvbiA9PSBWZXJ0aWNhbFNjcm9sbGJhciA/ICJyaWdodCIgOiAiYm90dG9tIik7CiAg ICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0X3BhdGgoc3R5bGVDb250ZXh0LmdldCgpLCBwYXRoLmdl dCgpKTsKIAogICAgIHJldHVybiBzdHlsZUNvbnRleHQ7CkBAIC0zMTcsMTAgKzMxNCwyMiBAQCB2 b2lkIFNjcm9sbGJhclRoZW1lR3RrOjpwYWludFRyYWNrQmFja2dyb3VuZChHcmFwaGljc0NvbnRl eHQmIGNvbnRleHQsIFNjcm9sbGJhcgogICAgIGlmICh0cm91Z2hVbmRlclN0ZXBwZXJzKHNjcm9s bGJhcikpCiAgICAgICAgIGZ1bGxTY3JvbGxiYXJSZWN0ID0gSW50UmVjdChzY3JvbGxiYXIueCgp LCBzY3JvbGxiYXIueSgpLCBzY3JvbGxiYXIud2lkdGgoKSwgc2Nyb2xsYmFyLmhlaWdodCgpKTsK IAotICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBzdHlsZUNvbnRleHQgPSBjcmVhdGVDaGls ZFN0eWxlQ29udGV4dChwYXJlbnRTdHlsZUNvbnRleHQuZ2V0KCksICJ0cm91Z2giKTsKLSAgICBh ZGp1c3RSZWN0QWNjb3JkaW5nVG9NYXJnaW4oc3R5bGVDb250ZXh0LmdldCgpLCBmdWxsU2Nyb2xs YmFyUmVjdCk7Ci0gICAgZ3RrX3JlbmRlcl9iYWNrZ3JvdW5kKHN0eWxlQ29udGV4dC5nZXQoKSwg Y29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgZnVsbFNjcm9sbGJhclJlY3QueCgpLCBm dWxsU2Nyb2xsYmFyUmVjdC55KCksIGZ1bGxTY3JvbGxiYXJSZWN0LndpZHRoKCksIGZ1bGxTY3Jv bGxiYXJSZWN0LmhlaWdodCgpKTsKLSAgICBndGtfcmVuZGVyX2ZyYW1lKHN0eWxlQ29udGV4dC5n ZXQoKSwgY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgZnVsbFNjcm9sbGJhclJlY3Qu eCgpLCBmdWxsU2Nyb2xsYmFyUmVjdC55KCksIGZ1bGxTY3JvbGxiYXJSZWN0LndpZHRoKCksIGZ1 bGxTY3JvbGxiYXJSZWN0LmhlaWdodCgpKTsKKyAgICBJbnRSZWN0IGFkanVzdGVkUmVjdCA9IGZ1 bGxTY3JvbGxiYXJSZWN0OworICAgIGFkanVzdFJlY3RBY2NvcmRpbmdUb01hcmdpbihwYXJlbnRT dHlsZUNvbnRleHQuZ2V0KCksIGFkanVzdGVkUmVjdCk7CisgICAgZ3RrX3JlbmRlcl9iYWNrZ3Jv dW5kKHBhcmVudFN0eWxlQ29udGV4dC5nZXQoKSwgY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKS0+ Y3IoKSwgYWRqdXN0ZWRSZWN0LngoKSwgYWRqdXN0ZWRSZWN0LnkoKSwgYWRqdXN0ZWRSZWN0Lndp ZHRoKCksIGFkanVzdGVkUmVjdC5oZWlnaHQoKSk7CisgICAgZ3RrX3JlbmRlcl9mcmFtZShwYXJl bnRTdHlsZUNvbnRleHQuZ2V0KCksIGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCktPmNyKCksIGFk anVzdGVkUmVjdC54KCksIGFkanVzdGVkUmVjdC55KCksIGFkanVzdGVkUmVjdC53aWR0aCgpLCBh ZGp1c3RlZFJlY3QuaGVpZ2h0KCkpOworCisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IGNv bnRlbnRzU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQocGFyZW50U3R5bGVD b250ZXh0LmdldCgpLCAiY29udGVudHMiKTsKKyAgICBhZGp1c3RlZFJlY3QgPSBmdWxsU2Nyb2xs YmFyUmVjdDsKKyAgICBhZGp1c3RSZWN0QWNjb3JkaW5nVG9NYXJnaW4oY29udGVudHNTdHlsZUNv bnRleHQuZ2V0KCksIGFkanVzdGVkUmVjdCk7CisgICAgZ3RrX3JlbmRlcl9iYWNrZ3JvdW5kKGNv bnRlbnRzU3R5bGVDb250ZXh0LmdldCgpLCBjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5jcigp LCBhZGp1c3RlZFJlY3QueCgpLCBhZGp1c3RlZFJlY3QueSgpLCBhZGp1c3RlZFJlY3Qud2lkdGgo KSwgYWRqdXN0ZWRSZWN0LmhlaWdodCgpKTsKKyAgICBndGtfcmVuZGVyX2ZyYW1lKGNvbnRlbnRz U3R5bGVDb250ZXh0LmdldCgpLCBjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5jcigpLCBhZGp1 c3RlZFJlY3QueCgpLCBhZGp1c3RlZFJlY3QueSgpLCBhZGp1c3RlZFJlY3Qud2lkdGgoKSwgYWRq dXN0ZWRSZWN0LmhlaWdodCgpKTsKKworICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiB0cm91 Z2hTdHlsZUNvbnRleHQgPSBjcmVhdGVDaGlsZFN0eWxlQ29udGV4dChjb250ZW50c1N0eWxlQ29u dGV4dC5nZXQoKSwgInRyb3VnaCIpOworICAgIGFkanVzdGVkUmVjdCA9IGZ1bGxTY3JvbGxiYXJS ZWN0OworICAgIGFkanVzdFJlY3RBY2NvcmRpbmdUb01hcmdpbih0cm91Z2hTdHlsZUNvbnRleHQu Z2V0KCksIGFkanVzdGVkUmVjdCk7CisgICAgZ3RrX3JlbmRlcl9iYWNrZ3JvdW5kKHRyb3VnaFN0 eWxlQ29udGV4dC5nZXQoKSwgY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgYWRqdXN0 ZWRSZWN0LngoKSwgYWRqdXN0ZWRSZWN0LnkoKSwgYWRqdXN0ZWRSZWN0LndpZHRoKCksIGFkanVz dGVkUmVjdC5oZWlnaHQoKSk7CisgICAgZ3RrX3JlbmRlcl9mcmFtZSh0cm91Z2hTdHlsZUNvbnRl eHQuZ2V0KCksIGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCktPmNyKCksIGFkanVzdGVkUmVjdC54 KCksIGFkanVzdGVkUmVjdC55KCksIGFkanVzdGVkUmVjdC53aWR0aCgpLCBhZGp1c3RlZFJlY3Qu aGVpZ2h0KCkpOwogfQogCiB2b2lkIFNjcm9sbGJhclRoZW1lR3RrOjpwYWludFNjcm9sbGJhckJh Y2tncm91bmQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBTY3JvbGxiYXImIHNjcm9sbGJhcikK QEAgLTMzMyw3ICszNDIsOCBAQCB2b2lkIFNjcm9sbGJhclRoZW1lR3RrOjpwYWludFRodW1iKEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCwgU2Nyb2xsYmFyJiBzY3JvbGxiYQogewogICAgIFNjcm9s bGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0gc2Nyb2xsYmFyLm9yaWVudGF0aW9uKCk7CiAg ICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHBhcmVudFN0eWxlQ29udGV4dCA9IGdldE9yQ3Jl YXRlU3R5bGVDb250ZXh0KCZzY3JvbGxiYXIsIFN0eWxlQ29udGV4dE1vZGU6OlBhaW50KTsKLSAg ICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hp bGRTdHlsZUNvbnRleHQocGFyZW50U3R5bGVDb250ZXh0LmdldCgpLCAidHJvdWdoIik7CisgICAg R1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IGNvbnRlbnRzU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hp bGRTdHlsZUNvbnRleHQocGFyZW50U3R5bGVDb250ZXh0LmdldCgpLCAiY29udGVudHMiKTsKKyAg ICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hp bGRTdHlsZUNvbnRleHQoY29udGVudHNTdHlsZUNvbnRleHQuZ2V0KCksICJ0cm91Z2giKTsKICAg ICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gc3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHls ZUNvbnRleHQodHJvdWdoU3R5bGVDb250ZXh0LmdldCgpLCAic2xpZGVyIik7CiAKICAgICB1bnNp Z25lZCBmbGFncyA9IDA7CkBAIC0zNjYsNyArMzc2LDggQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUd0 azo6cGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBTY3JvbGxiYXImIHNjcm9s bGIKIHsKICAgICBTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiA9IHNjcm9sbGJhci5v cmllbnRhdGlvbigpOwogICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBwYXJlbnRTdHlsZUNv bnRleHQgPSBnZXRPckNyZWF0ZVN0eWxlQ29udGV4dCgmc2Nyb2xsYmFyLCBTdHlsZUNvbnRleHRN b2RlOjpQYWludCk7Ci0gICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHN0eWxlQ29udGV4dCA9 IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KHBhcmVudFN0eWxlQ29udGV4dC5nZXQoKSwgImJ1dHRv biIpOworICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBjb250ZW50c1N0eWxlQ29udGV4dCA9 IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KHBhcmVudFN0eWxlQ29udGV4dC5nZXQoKSwgImNvbnRl bnRzIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHN0eWxlQ29udGV4dCA9IGNyZWF0 ZUNoaWxkU3R5bGVDb250ZXh0KGNvbnRlbnRzU3R5bGVDb250ZXh0LmdldCgpLCAiYnV0dG9uIik7 CiAKICAgICB1bnNpZ25lZCBmbGFncyA9IDA7CiAgICAgaWYgKChCYWNrQnV0dG9uU3RhcnRQYXJ0 ID09IHBhcnQgJiYgc2Nyb2xsYmFyLmN1cnJlbnRQb3MoKSkKQEAgLTUzNywxMCArNTQ4LDE4IEBA IGludCBTY3JvbGxiYXJUaGVtZUd0azo6c2Nyb2xsYmFyVGhpY2tuZXNzKEd0a1N0eWxlQ29udGV4 dCogc3R5bGVDb250ZXh0LCBTY3JvbGxiCiB7CiAgICAgR3RrQm9yZGVyIHRyb3VnaEJvcmRlcjsK ICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAxOSwgMTEpCi0gICAgR1JlZlB0cjxHdGtTdHlsZUNv bnRleHQ+IHRyb3VnaFN0eWxlQ29udGV4dCA9IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KHN0eWxl Q29udGV4dCwgInRyb3VnaCIpOworICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBjb250ZW50 c1N0eWxlQ29udGV4dCA9IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KHN0eWxlQ29udGV4dCwgImNv bnRlbnRzIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHRyb3VnaFN0eWxlQ29udGV4 dCA9IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KGNvbnRlbnRzU3R5bGVDb250ZXh0LmdldCgpLCAi dHJvdWdoIik7CiAgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHNsaWRlclN0eWxlQ29udGV4 dCA9IGNyZWF0ZUNoaWxkU3R5bGVDb250ZXh0KHRyb3VnaFN0eWxlQ29udGV4dC5nZXQoKSwgInNs aWRlciIpOwogICAgIGludCB0aHVtYkZhdCA9IHRodW1iRmF0bmVzcyhzbGlkZXJTdHlsZUNvbnRl eHQuZ2V0KCksIG9yaWVudGF0aW9uKTsKICAgICBnZXRUcm91Z2hCb3JkZXIodHJvdWdoU3R5bGVD b250ZXh0LmdldCgpLCAmdHJvdWdoQm9yZGVyKTsKKyAgICAvLyBTaW5jZSBHVEsrIDMuMTkgdGhl IHNjcm9sbGJhciBjYW4gaGF2ZSBpdHMgb3duIGJvcmRlciB0b28uCisgICAgR3RrQm9yZGVyIGJv cmRlcjsKKyAgICBndGtfc3R5bGVfY29udGV4dF9nZXRfYm9yZGVyKHN0eWxlQ29udGV4dCwgZ3Rr X3N0eWxlX2NvbnRleHRfZ2V0X3N0YXRlKHN0eWxlQ29udGV4dCksICZib3JkZXIpOworICAgIHRy b3VnaEJvcmRlci5sZWZ0ICs9IGJvcmRlci5sZWZ0OworICAgIHRyb3VnaEJvcmRlci5yaWdodCAr PSBib3JkZXIucmlnaHQ7CisgICAgdHJvdWdoQm9yZGVyLnRvcCArPSBib3JkZXIudG9wOworICAg IHRyb3VnaEJvcmRlci5ib3R0b20gKz0gYm9yZGVyLmJvdHRvbTsKICNlbHNlCiAgICAgaW50IHRo dW1iRmF0ID0gdGh1bWJGYXRuZXNzKHN0eWxlQ29udGV4dCwgb3JpZW50YXRpb24pOwogICAgIGdl dFRyb3VnaEJvcmRlcihzdHlsZUNvbnRleHQsICZ0cm91Z2hCb3JkZXIpOwpAQCAtNTYwLDcgKzU3 OSw4IEBAIEludFNpemUgU2Nyb2xsYmFyVGhlbWVHdGs6OmJ1dHRvblNpemUoU2Nyb2xsYmFyJiBz Y3JvbGxiYXIsIFNjcm9sbGJhclBhcnQgYnV0dG9uCiB7CiAgICAgR1JlZlB0cjxHdGtTdHlsZUNv bnRleHQ+IHN0eWxlQ29udGV4dCA9IGdldE9yQ3JlYXRlU3R5bGVDb250ZXh0KCZzY3JvbGxiYXIp OwogI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDE5LCAxMSkKLSAgICBHUmVmUHRyPEd0a1N0eWxl Q29udGV4dD4gYnV0dG9uU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5 bGVDb250ZXh0LmdldCgpLCAiYnV0dG9uIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+ IGNvbnRlbnRzU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250 ZXh0LmdldCgpLCAiY29udGVudHMiKTsKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gYnV0 dG9uU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoY29udGVudHNTdHlsZUNv bnRleHQuZ2V0KCksICJidXR0b24iKTsKICAgICBzd2l0Y2ggKGJ1dHRvblBhcnQpIHsKICAgICBj YXNlIEJhY2tCdXR0b25TdGFydFBhcnQ6CiAgICAgY2FzZSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0 OgpAQCAtNTk5LDcgKzYxOSw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OmdldFN0ZXBwZXJT cGFjaW5nKFNjcm9sbGJhciYgc2Nyb2xsYmFyLCBTY3JvbGxiYXJQYXJ0IGJ1CiB7CiAgICAgR1Jl ZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHN0eWxlQ29udGV4dCA9IGdldE9yQ3JlYXRlU3R5bGVDb250 ZXh0KCZzY3JvbGxiYXIpOwogI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDE5LCAxMSkKLSAgICBH UmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gYnV0dG9uU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRT dHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgpLCAiYnV0dG9uIik7CisgICAgR1JlZlB0cjxH dGtTdHlsZUNvbnRleHQ+IGNvbnRlbnRzU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNv bnRleHQoc3R5bGVDb250ZXh0LmdldCgpLCAiY29udGVudHMiKTsKKyAgICBHUmVmUHRyPEd0a1N0 eWxlQ29udGV4dD4gYnV0dG9uU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQo Y29udGVudHNTdHlsZUNvbnRleHQuZ2V0KCksICJidXR0b24iKTsKICAgICBzd2l0Y2ggKGJ1dHRv blBhcnQpIHsKICAgICBjYXNlIEJhY2tCdXR0b25TdGFydFBhcnQ6CiAgICAgY2FzZSBGb3J3YXJk QnV0dG9uU3RhcnRQYXJ0OgpAQCAtNjM5LDcgKzY2MCw4IEBAIGludCBTY3JvbGxiYXJUaGVtZUd0 azo6bWluaW11bVRodW1iTGVuZ3RoKFNjcm9sbGJhciYgc2Nyb2xsYmFyKQogICAgIEdSZWZQdHI8 R3RrU3R5bGVDb250ZXh0PiBzdHlsZUNvbnRleHQgPSBnZXRPckNyZWF0ZVN0eWxlQ29udGV4dCgm c2Nyb2xsYmFyKTsKICAgICBpbnQgbWluVGh1bWJMZW5ndGggPSAwOwogI2lmIEdUS19DSEVDS19W RVJTSU9OKDMsIDE5LCAxMSkKLSAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5 bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgpLCAi dHJvdWdoIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IGNvbnRlbnRzU3R5bGVDb250 ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgpLCAiY29udGVu dHMiKTsKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5bGVDb250ZXh0ID0g Y3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoY29udGVudHNTdHlsZUNvbnRleHQuZ2V0KCksICJ0cm91 Z2giKTsKICAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gc2xpZGVyU3R5bGVDb250ZXh0ID0g Y3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQodHJvdWdoU3R5bGVDb250ZXh0LmdldCgpLCAic2xpZGVy Iik7CiAgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0KHNsaWRlclN0eWxlQ29udGV4dC5nZXQoKSwg Z3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0YXRlKHNsaWRlclN0eWxlQ29udGV4dC5nZXQoKSksCiAg ICAgICAgIHNjcm9sbGJhci5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Nyb2xsYmFyID8gIm1p bi1oZWlnaHQiIDogIm1pbi13aWR0aCIsICZtaW5UaHVtYkxlbmd0aCwgbnVsbHB0cik7CkBAIC02 NzQsNyArNjk2LDggQEAgaW50IFNjcm9sbGJhclRoZW1lR3RrOjp0aHVtYkZhdG5lc3MoU2Nyb2xs YmFyJiBzY3JvbGxiYXIpCiB7CiAgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHN0eWxlQ29u dGV4dCA9IGdldE9yQ3JlYXRlU3R5bGVDb250ZXh0KCZzY3JvbGxiYXIpOwogI2lmIEdUS19DSEVD S19WRVJTSU9OKDMsIDE5LCAxMSkKLSAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdo U3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgp LCAidHJvdWdoIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IGNvbnRlbnRzU3R5bGVD b250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgpLCAiY29u dGVudHMiKTsKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5bGVDb250ZXh0 ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoY29udGVudHNTdHlsZUNvbnRleHQuZ2V0KCksICJ0 cm91Z2giKTsKICAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gc2xpZGVyU3R5bGVDb250ZXh0 ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQodHJvdWdoU3R5bGVDb250ZXh0LmdldCgpLCAic2xp ZGVyIik7CiAgICAgcmV0dXJuIHRodW1iRmF0bmVzcyhzbGlkZXJTdHlsZUNvbnRleHQuZ2V0KCks IHNjcm9sbGJhci5vcmllbnRhdGlvbigpKTsKICNlbHNlCkBAIC02OTcsOCArNzIwLDE2IEBAIHZv aWQgU2Nyb2xsYmFyVGhlbWVHdGs6OmdldFRyb3VnaEJvcmRlcihTY3JvbGxiYXImIHNjcm9sbGJh ciwgR3RrQm9yZGVyKiBib3JkZXIpCiB7CiAgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHN0 eWxlQ29udGV4dCA9IGdldE9yQ3JlYXRlU3R5bGVDb250ZXh0KCZzY3JvbGxiYXIpOwogI2lmIEdU S19DSEVDS19WRVJTSU9OKDMsIDE5LCAxMSkKLSAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4g dHJvdWdoU3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0 LmdldCgpLCAidHJvdWdoIik7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IGNvbnRlbnRz U3R5bGVDb250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoc3R5bGVDb250ZXh0LmdldCgp LCAiY29udGVudHMiKTsKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoU3R5bGVD b250ZXh0ID0gY3JlYXRlQ2hpbGRTdHlsZUNvbnRleHQoY29udGVudHNTdHlsZUNvbnRleHQuZ2V0 KCksICJ0cm91Z2giKTsKICAgICBnZXRUcm91Z2hCb3JkZXIodHJvdWdoU3R5bGVDb250ZXh0Lmdl dCgpLCBib3JkZXIpOworICAgIC8vIFNpbmNlIEdUSysgMy4xOSB0aGUgc2Nyb2xsYmFyIGNhbiBo YXZlIGl0cyBvd24gYm9yZGVyIHRvby4KKyAgICBHdGtCb3JkZXIgc2Nyb2xsYmFyQm9yZGVyOwor ICAgIGd0a19zdHlsZV9jb250ZXh0X2dldF9ib3JkZXIoc3R5bGVDb250ZXh0LmdldCgpLCBndGtf c3R5bGVfY29udGV4dF9nZXRfc3RhdGUoc3R5bGVDb250ZXh0LmdldCgpKSwgJnNjcm9sbGJhckJv cmRlcik7CisgICAgYm9yZGVyLT5sZWZ0ICs9IHNjcm9sbGJhckJvcmRlci5sZWZ0OworICAgIGJv cmRlci0+cmlnaHQgKz0gc2Nyb2xsYmFyQm9yZGVyLnJpZ2h0OworICAgIGJvcmRlci0+dG9wICs9 IHNjcm9sbGJhckJvcmRlci50b3A7CisgICAgYm9yZGVyLT5ib3R0b20gKz0gc2Nyb2xsYmFyQm9y ZGVyLmJvdHRvbTsKICNlbHNlCiAgICAgZ2V0VHJvdWdoQm9yZGVyKHN0eWxlQ29udGV4dC5nZXQo KSwgYm9yZGVyKTsKICNlbmRpZgo=