130476 2014-03-19 14:26:51 -0700 Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser 2014-03-19 16:45:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca commit-queue mitz simon.fraser oldest_to_newest 992254 0 simon.fraser 2014-03-19 14:26:51 -0700 Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser 992258 1 227217 simon.fraser 2014-03-19 14:28:59 -0700 Created attachment 227217 Patch 992263 2 commit-queue 2014-03-19 14:30:55 -0700 Attachment 227217 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h:111: Missing spaces around = [whitespace/operators] [4] ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h:112: Missing spaces around = [whitespace/operators] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 992284 3 227217 andersca 2014-03-19 15:05:56 -0700 Comment on attachment 227217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227217&action=review > Tools/MiniBrowser/mac/WK2BrowserWindowController.m:247 > + return [self currentZoomFactor] * DefaultZoomFactorRatio < DefaultMaximumZoomFactor; dot syntax. > Tools/MiniBrowser/mac/WK2BrowserWindowController.m:261 > + return [self currentZoomFactor] / DefaultZoomFactorRatio > DefaultMinimumZoomFactor; dot syntax. 992316 4 simon.fraser 2014-03-19 16:45:21 -0700 https://trac.webkit.org/r165930 227217 2014-03-19 14:28:59 -0700 2014-03-19 15:05:55 -0700 Patch bug-130476-20140319142929.patch text/plain 8561 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1ODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTk1OWU5MDIyNjU2YmE3 NTFkOWVhYTA3MmNjMmQ0ZGNlOWYxN2U2Mi4uODcxMjg1ZWMwOTY2MjE1NjMwMDc0NjVjNWFiYzEw NjI4YTNiYzQyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZSB0ZXh0 IGFuZCBwYWdlIHpvb20gaW4gV0syIFNQSSwgYW5kIGhvb2sgdGhlbSB1cCBpbiBNaW5pQnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNDc2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAg ICBFeHBvc2UgcGFnZSBhbmQgdGV4dCB6b29tIGFzIFNQSS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3N1cHBvcnRz VGV4dFpvb21dKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF90ZXh0Wm9vbUZhY3Rvcl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX3NldFRleHRab29tRmFjdG9yOl0pOgorICAgICAgICAoLVtXS1dl YlZpZXcgX3BhZ2Vab29tRmFjdG9yXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0UGFnZVpv b21GYWN0b3I6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2 YXRlLmg6CisKIDIwMTQtMDMtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgRGFuIHNheXMgdGhhdCBvcHRpb25zIHNob3VsZCBiZSB1bnNpZ25lZCwg YW5kIGVudW1zIHNob3VsZCBiZSBzaWduZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGU0ZmJiNzA4YmUxYjk2ZWIyODYxZTM4NTE4 YmIwNGU5MmRjZWVlYzkuLjZmYzVkNzQ1YWJiYmUwODUzZDcyYTQyNDY2YzkyN2NjMTdhOTZkMmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CkBAIC05ODEsNiArOTgxLDMxIEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29yZTo6TGF5b3V0TWlsZXN0 b25lcyBsYXlvdXRNaWxlc3RvbmVzKF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlCiAgICAgcmV0dXJu IF9wYWdlLT5wYWdlQ291bnQoKTsKIH0KIAorLSAoQk9PTClfc3VwcG9ydHNUZXh0Wm9vbQorewor ICAgIHJldHVybiBfcGFnZS0+c3VwcG9ydHNUZXh0Wm9vbSgpOworfQorCistIChkb3VibGUpX3Rl eHRab29tRmFjdG9yCit7CisgICAgcmV0dXJuIF9wYWdlLT50ZXh0Wm9vbUZhY3RvcigpOworfQor CistICh2b2lkKV9zZXRUZXh0Wm9vbUZhY3RvcjooZG91YmxlKXpvb21GYWN0b3IKK3sKKyAgICBf cGFnZS0+c2V0VGV4dFpvb21GYWN0b3Ioem9vbUZhY3Rvcik7Cit9CisKKy0gKGRvdWJsZSlfcGFn ZVpvb21GYWN0b3IKK3sKKyAgICByZXR1cm4gX3BhZ2UtPnBhZ2Vab29tRmFjdG9yKCk7Cit9CisK Ky0gKHZvaWQpX3NldFBhZ2Vab29tRmFjdG9yOihkb3VibGUpem9vbUZhY3RvcgoreworICAgIF9w YWdlLT5zZXRQYWdlWm9vbUZhY3Rvcih6b29tRmFjdG9yKTsKK30KKwogI3ByYWdtYSBtYXJrIGlP Uy1zcGVjaWZpYyBtZXRob2RzCiAKICNpZiBQTEFURk9STShJT1MpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDk1 ZjdhOTg2Y2RkYzJkZTFhYmYyOTFhNDA0MGQwNTY3ODgwMTk2MWMuLjI1OTI3ODcwMjUwN2FkM2Mx OWVlOGRhOTNhODFjMjc5MmZmNmRjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC0xMDMsNiArMTAzLDEwIEBA IHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9XS1BhZ2luYXRpb25Nb2RlKSB7CiBAcHJvcGVy dHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRHYXBCZXR3ZWVuUGFnZXM6KSBDR0Zsb2F0IF9nYXBC ZXR3ZWVuUGFnZXM7CiBAcHJvcGVydHkgKHJlYWRvbmx5KSBOU1VJbnRlZ2VyIF9wYWdlQ291bnQ7 CiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQk9PTCBfc3VwcG9ydHNUZXh0Wm9v bTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFRleHRab29tRmFjdG9yOikgZG91 YmxlIF90ZXh0Wm9vbUZhY3RvcjsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFBh Z2Vab29tRmFjdG9yOikgZG91YmxlIF9wYWdlWm9vbUZhY3RvcjsKKwogQGVuZAogCiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZTYy OWM0MTU3MTQ2YjMzMTcwMjBkZDVjMTg5NWY5NWEyZjg3NDc3Li5iN2M3ZmMyYTJhZmQxYzc0NzBj MjEwY2M3NTVhNmI1NmYzMzBiMmEwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTQtMDMtMTkgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIHRleHQgYW5kIHBh Z2Ugem9vbSBpbiBXSzIgU1BJLCBhbmQgaG9vayB0aGVtIHVwIGluIE1pbmlCcm93c2VyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA0NzYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEhvb2sg dXAgcGFnZS90ZXh0IHpvb20gaW4gTWluaUJyb3dzZXIsIG1ha2UgcmVsb2FkIHdvcmssIHJlbW92 ZSBzb21lIGxvZ2dpbmcuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIg d2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnJlcXVlc3Q6ZnJhbWU6ZGVj aXNpb25MaXN0ZW5lcjpdKToKKyAgICAgICAgUmVtb3ZlIGxvZy4KKyAgICAgICAgKiBNaW5pQnJv d3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0syQnJv d3NlcldpbmRvd0NvbnRyb2xsZXIgYXdha2VGcm9tTmliXSk6CisgICAgICAgICgtW1dLMkJyb3dz ZXJXaW5kb3dDb250cm9sbGVyIHZhbGlkYXRlTWVudUl0ZW06XSk6CisgICAgICAgICgtW1dLMkJy b3dzZXJXaW5kb3dDb250cm9sbGVyIHJlbG9hZDpdKToKKyAgICAgICAgSG9vayB1cCByZWxvYWQu CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHRvZ2dsZVpvb21Nb2RlOl0p OgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciByZXNldFpvb206XSk6Cisg ICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGNhblJlc2V0Wm9vbV0pOgorICAg ICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBjdXJyZW50Wm9vbUZhY3Rvcl0pOgor ICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBzZXRDdXJyZW50Wm9vbUZhY3Rv cjpdKToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgY2FuWm9vbUluXSk6 CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGNhblpvb21PdXRdKToKKwog MjAxNC0wMy0xOCAgRXZhIEJhbGF6c2ZhbHZpICA8ZXZhYi51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1 bmcuY29tPgogCiAgICAgICAgIHdlYmtpdC1wYXRjaCBsYW5kIHNob3VsZG4ndCBhZGQgYSByZXZp ZXdlciBmb3IgdW5yZXZpZXdlZCBidWlsZCBmaXhlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJy b3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nl ci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCBmMzFlYzQ1ZjAwYjZjMzhm OTk3MDk3OWNkMmE0ZjJiYjZiOGJiNjBkLi4wMWIwM2E1YzY5ZmQzNDk3NDAxYTQ0ZGI1MjNlZmMy NDk4NzY2M2JiIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIubQpAQCAtMjYwLDggKzI2MCw2IEBAIC0gKElCQWN0aW9uKWR1bXBTb3Vy Y2VUb0NvbnNvbGU6KGlkKXNlbmRlcgogCiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJW aWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KE5TRGljdGlvbmFyeSAqKWFjdGlv bkluZm9ybWF0aW9uIHJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QgZnJhbWU6KFdlYkZy YW1lICopZnJhbWUgZGVjaXNpb25MaXN0ZW5lcjooaWQ8V2ViUG9saWN5RGVjaXNpb25MaXN0ZW5l cj4pbGlzdGVuZXIKIHsKLSAgICBOU0xvZyhAInJlcXVlc3QgJUAgYWN0aW9uSW5mb3JtYXRpb24g JUAiLCByZXF1ZXN0LCBhY3Rpb25JbmZvcm1hdGlvbik7Ci0KICAgICBbbGlzdGVuZXIgdXNlXTsK IH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dD b250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRy b2xsZXIubQppbmRleCA3ZmM2OWVkNjEwYWU5YzJlMzlhODZhNTBjOGQwYTM4NDM3OTM2MzA4Li5k ODAyZjNkZDdhMTIyZmZjMDE1OTliODUyYjMyMzA3OGM4NmJiYzI2IDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtNDIsNiAr NDIsNyBAQCBAaW50ZXJmYWNlIFdLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyICgpIDxXS05hdmln YXRpb25EZWxlZ2F0ZSwgV0tVSURlbGVnYXRlPgogCiBAaW1wbGVtZW50YXRpb24gV0syQnJvd3Nl cldpbmRvd0NvbnRyb2xsZXIgewogICAgIFdLV2ViVmlldyAqX3dlYlZpZXc7CisgICAgQk9PTCBf em9vbVRleHRPbmx5OwogfQogCiAtICh2b2lkKWF3YWtlRnJvbU5pYgpAQCAtNjIsNiArNjMsOCBA QCAtICh2b2lkKWF3YWtlRnJvbU5pYgogCiAgICAgX3dlYlZpZXcubmF2aWdhdGlvbkRlbGVnYXRl ID0gc2VsZjsKICAgICBfd2ViVmlldy5VSURlbGVnYXRlID0gc2VsZjsKKyAgICAKKyAgICBfem9v bVRleHRPbmx5ID0gTk87CiB9CiAKIC0gKHZvaWQpZGVhbGxvYwpAQCAtMTE0LDEwICsxMTcsNyBA QCAtIChCT09MKXZhbGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51SXRlbQogICAgICAg ICByZXR1cm4gW3NlbGYgY2FuUmVzZXRab29tXTsKICAgICAKICAgICAvLyBEaXNhYmxlZCB1bnRp bCBtaXNzaW5nIFdLMiBmdW5jdGlvbmFsaXR5IGlzIGV4cG9zZWQgdmlhIEFQSS9TUEkuCi0gICAg aWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IocmVsb2FkOikKLSAgICAgICAgfHwgYWN0aW9uID09IEBz ZWxlY3Rvcih0b2dnbGVab29tTW9kZTopCi0gICAgICAgIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3Io cmVzZXRab29tOikKLSAgICAgICAgfHwgYWN0aW9uID09IEBzZWxlY3RvcihkdW1wU291cmNlVG9D b25zb2xlOikKKyAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihkdW1wU291cmNlVG9Db25zb2xl OikKICAgICAgICAgfHwgYWN0aW9uID09IEBzZWxlY3RvcihmaW5kOikpCiAgICAgICAgIHJldHVy biBOTzsKICAgICAKQEAgLTEyNSw2ICsxMjUsOCBAQCAtIChCT09MKXZhbGlkYXRlTWVudUl0ZW06 KE5TTWVudUl0ZW0gKiltZW51SXRlbQogICAgICAgICBbbWVudUl0ZW0gc2V0VGl0bGU6W193ZWJW aWV3IGlzSGlkZGVuXSA/IEAiU2hvdyBXZWIgVmlldyIgOiBAIkhpZGUgV2ViIFZpZXciXTsKICAg ICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHJlbW92ZVJlaW5zZXJ0V2ViVmlldzopKQog ICAgICAgICBbbWVudUl0ZW0gc2V0VGl0bGU6W193ZWJWaWV3IHdpbmRvd10gPyBAIlJlbW92ZSBX ZWIgVmlldyIgOiBAIkluc2VydCBXZWIgVmlldyJdOworICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBA c2VsZWN0b3IodG9nZ2xlWm9vbU1vZGU6KSkKKyAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOl96 b29tVGV4dE9ubHkgPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKICAgICBlbHNlIGlmIChbbWVu dUl0ZW0gYWN0aW9uXSA9PSBAc2VsZWN0b3IodG9nZ2xlUGFnaW5hdGlvbk1vZGU6KSkKICAgICAg ICAgW21lbnVJdGVtIHNldFN0YXRlOltzZWxmIGlzUGFnaW5hdGVkXSA/IE5TT25TdGF0ZSA6IE5T T2ZmU3RhdGVdOwogICAgIGVsc2UgaWYgKFttZW51SXRlbSBhY3Rpb25dID09IEBzZWxlY3Rvcih0 b2dnbGVUcmFuc3BhcmVudFdpbmRvdzopKQpAQCAtMTM3LDYgKzEzOSw3IEBAIC0gKEJPT0wpdmFs aWRhdGVNZW51SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiAKIC0gKElCQWN0aW9uKXJlbG9h ZDooaWQpc2VuZGVyCiB7CisgICAgW193ZWJWaWV3IF9yZWxvYWRdOwogfQogCiAtIChJQkFjdGlv bilmb3JjZVJlcGFpbnQ6KGlkKXNlbmRlcgpAQCAtMTU2LDE1ICsxNTksMzMgQEAgLSAoSUJBY3Rp b24pZ29Gb3J3YXJkOihpZClzZW5kZXIKIAogLSAoSUJBY3Rpb24pdG9nZ2xlWm9vbU1vZGU6KGlk KXNlbmRlcgogeworICAgIGlmIChfem9vbVRleHRPbmx5KSB7CisgICAgICAgIF96b29tVGV4dE9u bHkgPSBOTzsKKyAgICAgICAgZG91YmxlIGN1cnJlbnRUZXh0Wm9vbSA9IF93ZWJWaWV3Ll90ZXh0 Wm9vbUZhY3RvcjsKKyAgICAgICAgX3dlYlZpZXcuX3RleHRab29tRmFjdG9yID0gMTsKKyAgICAg ICAgX3dlYlZpZXcuX3BhZ2Vab29tRmFjdG9yID0gY3VycmVudFRleHRab29tOworICAgIH0gZWxz ZSB7CisgICAgICAgIF96b29tVGV4dE9ubHkgPSBZRVM7CisgICAgICAgIGRvdWJsZSBjdXJyZW50 UGFnZVpvb20gPSBfd2ViVmlldy5fcGFnZVpvb21GYWN0b3I7CisgICAgICAgIF93ZWJWaWV3Ll90 ZXh0Wm9vbUZhY3RvciA9IGN1cnJlbnRQYWdlWm9vbTsKKyAgICAgICAgX3dlYlZpZXcuX3BhZ2Va b29tRmFjdG9yID0gMTsKKyAgICB9CiB9CiAKIC0gKElCQWN0aW9uKXJlc2V0Wm9vbTooaWQpc2Vu ZGVyCiB7CisgICAgaWYgKCFbc2VsZiBjYW5SZXNldFpvb21dKQorICAgICAgICByZXR1cm47CisK KyAgICBpZiAoX3pvb21UZXh0T25seSkKKyAgICAgICAgX3dlYlZpZXcuX3RleHRab29tRmFjdG9y ID0gMTsKKyAgICBlbHNlCisgICAgICAgIF93ZWJWaWV3Ll9wYWdlWm9vbUZhY3RvciA9IDE7CiB9 CiAKIC0gKEJPT0wpY2FuUmVzZXRab29tCiB7Ci0gICAgcmV0dXJuIE5POworICAgIHJldHVybiBf em9vbVRleHRPbmx5ID8gKF93ZWJWaWV3Ll90ZXh0Wm9vbUZhY3RvciAhPSAxKSA6IChfd2ViVmll dy5fcGFnZVpvb21GYWN0b3IgIT0gMSk7CiB9CiAKIC0gKElCQWN0aW9uKWR1bXBTb3VyY2VUb0Nv bnNvbGU6KGlkKXNlbmRlcgpAQCAtMjEwLDE2ICsyMzEsMjAgQEAgLSAodm9pZClhcHBsaWNhdGlv blRlcm1pbmF0aW5nCiAKIC0gKENHRmxvYXQpY3VycmVudFpvb21GYWN0b3IKIHsKLSAgICByZXR1 cm4gMTsKKyAgICByZXR1cm4gX3pvb21UZXh0T25seSA/IF93ZWJWaWV3Ll90ZXh0Wm9vbUZhY3Rv ciA6IF93ZWJWaWV3Ll9wYWdlWm9vbUZhY3RvcjsKIH0KIAogLSAodm9pZClzZXRDdXJyZW50Wm9v bUZhY3RvcjooQ0dGbG9hdClmYWN0b3IKIHsKKyAgICBpZiAoX3pvb21UZXh0T25seSkKKyAgICAg ICAgX3dlYlZpZXcuX3RleHRab29tRmFjdG9yID0gZmFjdG9yOworICAgIGVsc2UKKyAgICAgICAg X3dlYlZpZXcuX3BhZ2Vab29tRmFjdG9yID0gZmFjdG9yOwogfQogCiAtIChCT09MKWNhblpvb21J bgogewotICAgIHJldHVybiBOTzsKKyAgICByZXR1cm4gW3NlbGYgY3VycmVudFpvb21GYWN0b3Jd ICogRGVmYXVsdFpvb21GYWN0b3JSYXRpbyA8IERlZmF1bHRNYXhpbXVtWm9vbUZhY3RvcjsKIH0K IAogLSAodm9pZCl6b29tSW46KGlkKXNlbmRlcgpAQCAtMjMzLDcgKzI1OCw3IEBAIC0gKHZvaWQp em9vbUluOihpZClzZW5kZXIKIAogLSAoQk9PTCljYW5ab29tT3V0CiB7Ci0gICAgcmV0dXJuIE5P OworICAgIHJldHVybiBbc2VsZiBjdXJyZW50Wm9vbUZhY3Rvcl0gLyBEZWZhdWx0Wm9vbUZhY3Rv clJhdGlvID4gRGVmYXVsdE1pbmltdW1ab29tRmFjdG9yOwogfQogCiAtICh2b2lkKXpvb21PdXQ6 KGlkKXNlbmRlcgo=