155296 2016-03-10 06:13:00 -0800 [GTK] Fix rendering of slider input elements 2016-03-10 23:04:56 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1173071 0 cgarcia 2016-03-10 06:13:00 -0800 Use the new gadgets for newer GTK+ and improve a bit the rendering for previous versions to better match GTK+. 1173072 1 273564 cgarcia 2016-03-10 06:17:23 -0800 Created attachment 273564 Patch 1173077 2 273564 mcatanzaro 2016-03-10 06:54:12 -0800 Comment on attachment 273564 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273564&action=review Sigh > Source/WebCore/ChangeLog:13 > + ScaleHighlight parts that are onlu used with GTK+ 3.19. only > Source/WebCore/rendering/RenderThemeGtk.cpp:1114 > + // the slider track separetly and the track rectasngle we receive here can't be used to apply the GTK+ CSS sizes separately, rectangle 1173614 3 cgarcia 2016-03-10 23:04:56 -0800 Committed r197998: <http://trac.webkit.org/changeset/197998> 273564 2016-03-10 06:17:23 -0800 2016-03-10 06:54:12 -0800 Patch wcore-gtk-slider.diff text/plain 9459 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZTUwMTNiLi44YzNhZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTYtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEZpeCByZW5kZXJpbmcgb2Ygc2xpZGVyIGlucHV0IGVsZW1lbnRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUyOTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhl IG5ldyBnYWRnZXRzIGZvciBuZXdlciBHVEsrIGFuZCBpbXByb3ZlIGEgYml0IHRoZSByZW5kZXJp bmcKKyAgICAgICAgZm9yIHByZXZpb3VzIHZlcnNpb25zIHRvIGJldHRlciBtYXRjaCBHVEsrLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmNyZWF0ZVN0eWxlQ29udGV4dCk6IEFkZCBTY2FsZUNvbnRlbnRzIGFuZAorICAgICAgICBT Y2FsZUhpZ2hsaWdodCBwYXJ0cyB0aGF0IGFyZSBvbmx1IHVzZWQgd2l0aCBHVEsrIDMuMTkuCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRTbGlkZXJUcmFjayk6IFVzZSBh IHNtYWxsZXIgdHJvdWdoLAorICAgICAgICBjZW50ZXJlZCBpbiB0aGUgZ2l2ZW4gcmVjdGFuZ2xl IHRvIGJldHRlciBtYXRjaCBHVEsrLiBBbHNvIHJlbmRlcgorICAgICAgICB0aGUgaGlnaHRsaWdo dCBnYWRnZXQgd2l0aCBHVEsrIDMuMTkuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0 azo6cGFpbnRTbGlkZXJUaHVtYik6IEFsc28gY3JlYXRlIHRoZSBzdHlsZQorICAgICAgICBjb250 ZXh0IGZvciBjb250ZW50cyBnYWRnZXQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0 azo6YWRqdXN0U2xpZGVyVGh1bWJTaXplKTogVGFrZSBpbnRvCisgICAgICAgIGFjY291bnQgdGhl IHNsaWRlciBib3JkZXIgd2hlbiBjYWxjdWxhdGluZyB0aGUgc2xpZGVyIHRodW1iIHNpemUuCisK KzIwMTYtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CiAgICAgICAgIFtHVEtdIFNjcm9sbGJhcnMgYXJlIGJyb2tlbiBvbmNlIGFnYWluIHdpdGggY3Vy cmVudCBHVEsrIG1hc3RlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU1MjkyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVH dGsuY3BwCmluZGV4IGUxMDZkY2EuLmQzZTk0ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtMTUyLDggKzE1MiwxMCBAQCBlbnVtIFJlbmRlclRo ZW1lUGFydCB7CiAgICAgQ29tYm9Cb3hCdXR0b24sCiAgICAgQ29tYm9Cb3hBcnJvdywKICAgICBT Y2FsZSwKKyAgICBTY2FsZUNvbnRlbnRzLAogICAgIFNjYWxlVHJvdWdoLAogICAgIFNjYWxlU2xp ZGVyLAorICAgIFNjYWxlSGlnaGxpZ2h0LAogICAgIFByb2dyZXNzQmFyLAogICAgIFByb2dyZXNz QmFyVHJvdWdoLAogICAgIFByb2dyZXNzQmFyUHJvZ3Jlc3MsCkBAIC0yODEsNiArMjgzLDE1IEBA IHN0YXRpYyBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gY3JlYXRlU3R5bGVDb250ZXh0KFJlbmRl clRoZW1lUGFydCB0aGVtZVBhcnQsIEd0CiAgICAgICAgIGd0a193aWRnZXRfcGF0aF9pdGVyX2Fk ZF9jbGFzcyhwYXRoLmdldCgpLCAtMSwgR1RLX1NUWUxFX0NMQVNTX1NDQUxFKTsKICNlbmRpZgog ICAgICAgICBicmVhazsKKyAgICBjYXNlIFNjYWxlQ29udGVudHM6CisjaWYgR1RLX0NIRUNLX1ZF UlNJT04oMywgMTksIDExKQorICAgICAgICBndGtfd2lkZ2V0X3BhdGhfYXBwZW5kX3R5cGUocGF0 aC5nZXQoKSwgR1RLX1RZUEVfU0NBTEUpOworICAgICAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9z ZXRfb2JqZWN0X25hbWUocGF0aC5nZXQoKSwgLTEsICJjb250ZW50cyIpOworICAgICAgICBndGtf d2lkZ2V0X3BhdGhfaXRlcl9hZGRfY2xhc3MocGF0aC5nZXQoKSwgLTEsIEdUS19TVFlMRV9DTEFT U19TQ0FMRSk7CisjZWxzZQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyNlbmRpZgor ICAgICAgICBicmVhazsKICAgICBjYXNlIFNjYWxlVHJvdWdoOgogICAgICAgICBndGtfd2lkZ2V0 X3BhdGhfYXBwZW5kX3R5cGUocGF0aC5nZXQoKSwgR1RLX1RZUEVfU0NBTEUpOwogI2lmIEdUS19D SEVDS19WRVJTSU9OKDMsIDE5LCAyKQpAQCAtMjk5LDYgKzMxMCwxNSBAQCBzdGF0aWMgR1JlZlB0 cjxHdGtTdHlsZUNvbnRleHQ+IGNyZWF0ZVN0eWxlQ29udGV4dChSZW5kZXJUaGVtZVBhcnQgdGhl bWVQYXJ0LCBHdAogICAgICAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9hZGRfY2xhc3MocGF0aC5n ZXQoKSwgLTEsIEdUS19TVFlMRV9DTEFTU19TTElERVIpOwogI2VuZGlmCiAgICAgICAgIGJyZWFr OworICAgIGNhc2UgU2NhbGVIaWdobGlnaHQ6CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMTks IDExKQorICAgICAgICBndGtfd2lkZ2V0X3BhdGhfYXBwZW5kX3R5cGUocGF0aC5nZXQoKSwgR1RL X1RZUEVfU0NBTEUpOworICAgICAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9zZXRfb2JqZWN0X25h bWUocGF0aC5nZXQoKSwgLTEsICJoaWdobGlnaHQiKTsKKyAgICAgICAgZ3RrX3dpZGdldF9wYXRo X2l0ZXJfYWRkX2NsYXNzKHBhdGguZ2V0KCksIC0xLCBHVEtfU1RZTEVfQ0xBU1NfU0NBTEUpOwor I2Vsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisjZW5kaWYKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBQcm9ncmVzc0JhcjoKICAgICAgICAgZ3RrX3dpZGdldF9wYXRoX2FwcGVu ZF90eXBlKHBhdGguZ2V0KCksIEdUS19UWVBFX1BST0dSRVNTX0JBUik7CiAjaWYgR1RLX0NIRUNL X1ZFUlNJT04oMywgMTksIDIpCkBAIC0xMDc0LDIzICsxMDk0LDYyIEBAIHZvaWQgUmVuZGVyVGhl bWVHdGs6OmFkanVzdFNsaWRlclRodW1iU3R5bGUoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZl ciwgUmVuZGVyCiBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludFNsaWRlclRyYWNrKGNvbnN0IFJl bmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBDb250cm9sUGFydCBwYXJ0ID0gcmVuZGVyT2JqZWN0 LnN0eWxlKCkuYXBwZWFyYW5jZSgpOwotICAgIEFTU0VSVF9VTlVTRUQocGFydCwgcGFydCA9PSBT bGlkZXJIb3Jpem9udGFsUGFydCB8fCBwYXJ0ID09IFNsaWRlclZlcnRpY2FsUGFydCk7CisgICAg QVNTRVJUKHBhcnQgPT0gU2xpZGVySG9yaXpvbnRhbFBhcnQgfHwgcGFydCA9PSBTbGlkZXJWZXJ0 aWNhbFBhcnQpOwogCiAgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHBhcmVudENvbnRleHQg PSBjcmVhdGVTdHlsZUNvbnRleHQoU2NhbGUpOwogICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9j bGFzcyhwYXJlbnRDb250ZXh0LmdldCgpLCBwYXJ0ID09IFNsaWRlckhvcml6b250YWxQYXJ0ID8g R1RLX1NUWUxFX0NMQVNTX0hPUklaT05UQUwgOiBHVEtfU1RZTEVfQ0xBU1NfVkVSVElDQUwpOwor I2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDE5LCAxMSkKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29u dGV4dD4gY29udGVudHNDb250ZXh0ID0gY3JlYXRlU3R5bGVDb250ZXh0KFNjYWxlQ29udGVudHMs IHBhcmVudENvbnRleHQuZ2V0KCkpOworICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBjb250 ZXh0ID0gY3JlYXRlU3R5bGVDb250ZXh0KFNjYWxlVHJvdWdoLCBjb250ZW50c0NvbnRleHQuZ2V0 KCkpOworI2Vsc2UKICAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gY29udGV4dCA9IGNyZWF0 ZVN0eWxlQ29udGV4dChTY2FsZVRyb3VnaCwgcGFyZW50Q29udGV4dC5nZXQoKSk7CisjZW5kaWYK ICAgICBndGtfc3R5bGVfY29udGV4dF9zZXRfZGlyZWN0aW9uKGNvbnRleHQuZ2V0KCksIGd0a1Rl eHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0LnN0eWxlKCkuZGlyZWN0aW9uKCkpKTsKIAogICAgIGlm ICghaXNFbmFibGVkKHJlbmRlck9iamVjdCkpCiAgICAgICAgIGd0a19zdHlsZV9jb250ZXh0X3Nl dF9zdGF0ZShjb250ZXh0LmdldCgpLCBHVEtfU1RBVEVfRkxBR19JTlNFTlNJVElWRSk7CiAKLSAg ICBndGtfcmVuZGVyX2JhY2tncm91bmQoY29udGV4dC5nZXQoKSwgcGFpbnRJbmZvLmNvbnRleHQo KS5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRo KCksIHJlY3QuaGVpZ2h0KCkpOwotICAgIGd0a19yZW5kZXJfZnJhbWUoY29udGV4dC5nZXQoKSwg cGFpbnRJbmZvLmNvbnRleHQoKS5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJl Y3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIEludFJlY3Qgc2xpZGVy UmVjdCA9IHJlY3Q7CisgICAgLy8gR1RLKyB1c2VzIHRoZSBzbGlkZXIgdGh1bWIgc2l6ZSBhbmQg bWFyZ2lucyB0byBjYWxjdWxhdGUgdGhlIHRyb3VnaCBzaXplLCBidXQgaW4gV2ViS2l0IHdlIHJl bmRlciB0aGUgdGh1bWIgYW5kCisgICAgLy8gdGhlIHNsaWRlciB0cmFjayBzZXBhcmV0bHkgYW5k IHRoZSB0cmFjayByZWN0YXNuZ2xlIHdlIHJlY2VpdmUgaGVyZSBjYW4ndCBiZSB1c2VkIHRvIGFw cGx5IHRoZSBHVEsrIENTUyBzaXplcworICAgIC8vIGFuZCBtYXJnaW5zLiBTbyB3ZSB1c2UgYSBt YXhpbXVtIGZpeGVkIHNpemUgZm9yIHRoZSB0cm91Z2ggdG8gbWF0Y2ggYXQgbGVhc3QgQWR3YWl0 YSwgYnV0IHRoYXQgc2hvdWxkIGxvb2sKKyAgICAvLyBnb29kIGluIG90aGVyIHRoZW1lcyBhcyB3 ZWxsLgorICAgIHN0YXRpYyBjb25zdCBpbnQgc2xpZGVyU2l6ZSA9IDQ7CisKKyAgICBpZiAocGFy dCA9PSBTbGlkZXJIb3Jpem9udGFsUGFydCkgeworICAgICAgICBzbGlkZXJSZWN0LnNldEhlaWdo dChzdGQ6Om1pbihyZWN0LmhlaWdodCgpLCBzbGlkZXJTaXplKSk7CisgICAgICAgIHNsaWRlclJl Y3QubW92ZSgwLCAocmVjdC5oZWlnaHQoKSAtIHNsaWRlclJlY3QuaGVpZ2h0KCkpIC8gMik7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgc2xpZGVyUmVjdC5zZXRXaWR0aChzdGQ6Om1pbihyZWN0Lndp ZHRoKCksIHNsaWRlclNpemUpKTsKKyAgICAgICAgc2xpZGVyUmVjdC5tb3ZlKChyZWN0LndpZHRo KCkgLSBzbGlkZXJSZWN0LndpZHRoKCkpIC8gMiwgMCk7CisgICAgfQorCisgICAgZ3RrX3JlbmRl cl9iYWNrZ3JvdW5kKGNvbnRleHQuZ2V0KCksIHBhaW50SW5mby5jb250ZXh0KCkucGxhdGZvcm1D b250ZXh0KCktPmNyKCksIHNsaWRlclJlY3QueCgpLCBzbGlkZXJSZWN0LnkoKSwgc2xpZGVyUmVj dC53aWR0aCgpLCBzbGlkZXJSZWN0LmhlaWdodCgpKTsKKyAgICBndGtfcmVuZGVyX2ZyYW1lKGNv bnRleHQuZ2V0KCksIHBhaW50SW5mby5jb250ZXh0KCkucGxhdGZvcm1Db250ZXh0KCktPmNyKCks IHNsaWRlclJlY3QueCgpLCBzbGlkZXJSZWN0LnkoKSwgc2xpZGVyUmVjdC53aWR0aCgpLCBzbGlk ZXJSZWN0LmhlaWdodCgpKTsKKworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDE5LCAxMSkKKyAg ICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gaGlnaGxpZ2h0Q29udGV4dCA9IGNyZWF0ZVN0eWxl Q29udGV4dChTY2FsZUhpZ2hsaWdodCwgY29udGV4dC5nZXQoKSk7CisgICAgTGF5b3V0UG9pbnQg dGh1bWJMb2NhdGlvbjsKKyAgICBpZiAoaXM8SFRNTElucHV0RWxlbWVudD4ocmVuZGVyT2JqZWN0 Lm5vZGUoKSkpIHsKKyAgICAgICAgYXV0byYgaW5wdXQgPSBkb3duY2FzdDxIVE1MSW5wdXRFbGVt ZW50PigqcmVuZGVyT2JqZWN0Lm5vZGUoKSk7CisgICAgICAgIGlmIChhdXRvKiBlbGVtZW50ID0g aW5wdXQuc2xpZGVyVGh1bWJFbGVtZW50KCkpCisgICAgICAgICAgICB0aHVtYkxvY2F0aW9uID0g ZWxlbWVudC0+cmVuZGVyQm94KCktPmxvY2F0aW9uKCk7CisgICAgfQorCisgICAgSW50UmVjdCBo aWdobGlnaHRSZWN0ID0gc2xpZGVyUmVjdDsKKyAgICBpZiAocGFydCA9PSBTbGlkZXJIb3Jpem9u dGFsUGFydCkKKyAgICAgICAgaGlnaGxpZ2h0UmVjdC5zZXRXaWR0aCh0aHVtYkxvY2F0aW9uLngo KSk7CisgICAgZWxzZQorICAgICAgICBoaWdobGlnaHRSZWN0LnNldEhlaWdodCh0aHVtYkxvY2F0 aW9uLnkoKSk7CisKKyAgICBndGtfcmVuZGVyX2JhY2tncm91bmQoaGlnaGxpZ2h0Q29udGV4dC5n ZXQoKSwgcGFpbnRJbmZvLmNvbnRleHQoKS5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgaGlnaGxp Z2h0UmVjdC54KCksIGhpZ2hsaWdodFJlY3QueSgpLCBoaWdobGlnaHRSZWN0LndpZHRoKCksIGhp Z2hsaWdodFJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19yZW5kZXJfZnJhbWUoaGlnaGxpZ2h0Q29u dGV4dC5nZXQoKSwgcGFpbnRJbmZvLmNvbnRleHQoKS5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwg aGlnaGxpZ2h0UmVjdC54KCksIGhpZ2hsaWdodFJlY3QueSgpLCBoaWdobGlnaHRSZWN0LndpZHRo KCksIGhpZ2hsaWdodFJlY3QuaGVpZ2h0KCkpOworI2VuZGlmCiAKICAgICBpZiAoaXNGb2N1c2Vk KHJlbmRlck9iamVjdCkpIHsKICAgICAgICAgZ2ludCBmb2N1c1dpZHRoLCBmb2N1c1BhZDsKICAg ICAgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0eWxlKGNvbnRleHQuZ2V0KCksICJmb2N1cy1s aW5lLXdpZHRoIiwgJmZvY3VzV2lkdGgsICJmb2N1cy1wYWRkaW5nIiwgJmZvY3VzUGFkLCBudWxs cHRyKTsKLSAgICAgICAgSW50UmVjdCBmb2N1c1JlY3QocmVjdCk7CisgICAgICAgIEludFJlY3Qg Zm9jdXNSZWN0KHNsaWRlclJlY3QpOwogICAgICAgICBmb2N1c1JlY3QuaW5mbGF0ZShmb2N1c1dp ZHRoICsgZm9jdXNQYWQpOwogICAgICAgICBndGtfcmVuZGVyX2ZvY3VzKGNvbnRleHQuZ2V0KCks IHBhaW50SW5mby5jb250ZXh0KCkucGxhdGZvcm1Db250ZXh0KCktPmNyKCksIGZvY3VzUmVjdC54 KCksIGZvY3VzUmVjdC55KCksIGZvY3VzUmVjdC53aWR0aCgpLCBmb2N1c1JlY3QuaGVpZ2h0KCkp OwogICAgIH0KQEAgLTExMDYsNyArMTE2NSwxMiBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWlu dFNsaWRlclRodW1iKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYQog ICAgIC8vIEZJWE1FOiBUaGUgZW50aXJlIHNsaWRlciBpcyB0b28gd2lkZSwgc3RyZXRjaGluZyB0 aGUgdGh1bWIgaW50byBhbiBvdmFsIHJhdGhlciB0aGFuIGEgY2lyY2xlLgogICAgIEdSZWZQdHI8 R3RrU3R5bGVDb250ZXh0PiBwYXJlbnRDb250ZXh0ID0gY3JlYXRlU3R5bGVDb250ZXh0KFNjYWxl KTsKICAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3MocGFyZW50Q29udGV4dC5nZXQoKSwg cGFydCA9PSBTbGlkZXJUaHVtYkhvcml6b250YWxQYXJ0ID8gR1RLX1NUWUxFX0NMQVNTX0hPUkla T05UQUwgOiBHVEtfU1RZTEVfQ0xBU1NfVkVSVElDQUwpOworI2lmIEdUS19DSEVDS19WRVJTSU9O KDMsIDE5LCAxMSkKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gY29udGVudHNDb250ZXh0 ID0gY3JlYXRlU3R5bGVDb250ZXh0KFNjYWxlQ29udGVudHMsIHBhcmVudENvbnRleHQuZ2V0KCkp OworICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiB0cm91Z2hDb250ZXh0ID0gY3JlYXRlU3R5 bGVDb250ZXh0KFNjYWxlVHJvdWdoLCBjb250ZW50c0NvbnRleHQuZ2V0KCkpOworI2Vsc2UKICAg ICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gdHJvdWdoQ29udGV4dCA9IGNyZWF0ZVN0eWxlQ29u dGV4dChTY2FsZVRyb3VnaCwgcGFyZW50Q29udGV4dC5nZXQoKSk7CisjZW5kaWYKICAgICBHUmVm UHRyPEd0a1N0eWxlQ29udGV4dD4gY29udGV4dCA9IGNyZWF0ZVN0eWxlQ29udGV4dChTY2FsZVNs aWRlciwgdHJvdWdoQ29udGV4dC5nZXQoKSk7CiAgICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0X2Rp cmVjdGlvbihjb250ZXh0LmdldCgpLCBndGtUZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC5zdHls ZSgpLmRpcmVjdGlvbigpKSk7CiAKQEAgLTExMzMsNyArMTE5NywxOCBAQCB2b2lkIFJlbmRlclRo ZW1lR3RrOjphZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyU3R5bGUmIHN0eWxlLCBFbGVtZW50 KikgY29uc3QKIAogICAgIEdSZWZQdHI8R3RrU3R5bGVDb250ZXh0PiBjb250ZXh0ID0gY3JlYXRl U3R5bGVDb250ZXh0KFNjYWxlKTsKICAgICBnaW50IHNsaWRlcldpZHRoLCBzbGlkZXJMZW5ndGg7 CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMTksIDExKQorICAgIEdSZWZQdHI8R3RrU3R5bGVD b250ZXh0PiBjb250ZW50c0NvbnRleHQgPSBjcmVhdGVTdHlsZUNvbnRleHQoU2NhbGVDb250ZW50 cywgY29udGV4dC5nZXQoKSk7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHRyb3VnaENv bnRleHQgPSBjcmVhdGVTdHlsZUNvbnRleHQoU2NhbGVUcm91Z2gsIGNvbnRlbnRzQ29udGV4dC5n ZXQoKSk7CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IHNsaWRlckNvbnRleHQgPSBjcmVh dGVTdHlsZUNvbnRleHQoU2NhbGVTbGlkZXIsIHRyb3VnaENvbnRleHQuZ2V0KCkpOworICAgIGd0 a19zdHlsZV9jb250ZXh0X2dldChzbGlkZXJDb250ZXh0LmdldCgpLCBndGtfc3R5bGVfY29udGV4 dF9nZXRfc3RhdGUoc2xpZGVyQ29udGV4dC5nZXQoKSksICJtaW4td2lkdGgiLCAmc2xpZGVyV2lk dGgsICJtaW4taGVpZ2h0IiwgJnNsaWRlckxlbmd0aCwgbnVsbHB0cik7CisgICAgR3RrQm9yZGVy IGJvcmRlcjsKKyAgICBndGtfc3R5bGVfY29udGV4dF9nZXRfYm9yZGVyKHNsaWRlckNvbnRleHQu Z2V0KCksIGd0a19zdHlsZV9jb250ZXh0X2dldF9zdGF0ZShzbGlkZXJDb250ZXh0LmdldCgpKSwg JmJvcmRlcik7CisgICAgc2xpZGVyV2lkdGggKz0gYm9yZGVyLmxlZnQgKyBib3JkZXIucmlnaHQ7 CisgICAgc2xpZGVyTGVuZ3RoICs9IGJvcmRlci50b3AgKyBib3JkZXIuYm90dG9tOworI2Vsc2UK ICAgICBndGtfc3R5bGVfY29udGV4dF9nZXRfc3R5bGUoY29udGV4dC5nZXQoKSwgInNsaWRlci13 aWR0aCIsICZzbGlkZXJXaWR0aCwgInNsaWRlci1sZW5ndGgiLCAmc2xpZGVyTGVuZ3RoLCBudWxs cHRyKTsKKyNlbmRpZgogICAgIGlmIChwYXJ0ID09IFNsaWRlclRodW1iSG9yaXpvbnRhbFBhcnQp IHsKICAgICAgICAgc3R5bGUuc2V0V2lkdGgoTGVuZ3RoKHNsaWRlckxlbmd0aCwgRml4ZWQpKTsK ICAgICAgICAgc3R5bGUuc2V0SGVpZ2h0KExlbmd0aChzbGlkZXJXaWR0aCwgRml4ZWQpKTsK