184222 2018-03-31 21:30:11 -0700 [Extra zoom mode] Zoom level is sometimes excessive when zooming to focused form controls 2018-04-02 12:06:50 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin commit-queue thorton timothy webkit-bug-importer oldest_to_newest 1410930 0 wenson_hsieh 2018-03-31 21:30:11 -0700 <rdar://problem/39063886> 1410935 1 336953 wenson_hsieh 2018-03-31 22:37:11 -0700 Created attachment 336953 Patch 1411078 2 336984 wenson_hsieh 2018-04-02 08:13:05 -0700 Created attachment 336984 Define min/max zoom margins in web view coordinates 1411188 3 336984 commit-queue 2018-04-02 12:06:48 -0700 Comment on attachment 336984 Define min/max zoom margins in web view coordinates Clearing flags on attachment: 336984 Committed r230171: <https://trac.webkit.org/changeset/230171> 1411189 4 commit-queue 2018-04-02 12:06:50 -0700 All reviewed patches have been landed. Closing bug. 336953 2018-03-31 22:37:11 -0700 2018-04-02 08:13:04 -0700 Patch bug-184222-20180331223710.patch text/plain 11439 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGEzZDM5ZWQ5OGIyNzE4YTU4 ODFkNmUwZmE3NGYyMjViZjljZjhmOGEuLjUyYjNlZGNhYzQzNzhlZDJjN2M0MzMyMjUwMDMxZTYy Yzk4NTYzMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTgtMDMtMzEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW0V4dHJhIHpvb20gbW9k ZV0gWm9vbSBsZXZlbCBpcyBzb21ldGltZXMgZXhjZXNzaXZlIHdoZW4gem9vbWluZyB0byBmb2N1 c2VkIGZvcm0gY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NDIyMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkwNjM4ODY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBvbiBpbnRlcmFj dGl2ZWx5IGZvY3VzaW5nIGFuIGVsZW1lbnQsIHdlIHpvb20gYW5kIHNjcm9sbCB0byByZXZlYWwg dGhhdCBlbGVtZW50LiBUaGUgaGV1cmlzdGljcyBpbnRyb2R1Y2VkIGluCisgICAgICAgIDxodHRw czovL3RyYWMud2Via2l0Lm9yZy9yMTY4NzQ0PiB3b3JrIGJ5IGNvbXB1dGluZyBhIHRhcmdldCBz Y2FsZSwgYW5kIHRoZW4gYSBwb2ludCB0byB6b29tIHRvIGdpdmVuIHRoYXQKKyAgICAgICAgc2Nh bGUuIEN1cnJlbnRseSwgdGhpcyBzY2FsZSBpcyBkZXBlbmRlbnQgb24gdGhlIGNvbXB1dGVkIGZv bnQgc2l6ZSBvZiB0aGUgZm9ybSBjb250cm9sLCBzdWNoIHRoYXQgdGhlIGZvcm0KKyAgICAgICAg Y29udHJvbCB3b3VsZCBiZSBzY2FsZWQgdG8gaGF2ZSBhbiBlZmZlY3RpdmUgZm9udCBzaXplIG9m IDE2LgorCisgICAgICAgIEhvd2V2ZXIsIGluIGV4dHJhIHpvb20gbW9kZSwgYXBwbHlpbmcgdGhl c2Ugc2FtZSBoZXVyaXN0aWNzIChpcm9uaWNhbGx5KSByZXN1bHRzIGluIGV4Y2Vzc2l2ZSB6b29t IGxldmVscywgc2luY2UKKyAgICAgICAgc2NhbGluZyB0aGUgZm9udCB1cCB0byAxNiB3b3VsZCBj YXVzZSBtb3N0IGZvcm0gY29udHJvbHMgdG8gem9vbSBzbyBmYXIgaW4gdGhhdCB3ZSBsb3NlIGNv bnRleHQgb2Ygc3Vycm91bmRpbmcKKyAgICAgICAgZWxlbWVudHMgc3VjaCBhcyBsYWJlbHMgYW5k IG90aGVyIGZvcm0gY29udHJvbHM7IHRoZSBmYWN0IHRoYXQgdGhlIGVsZW1lbnQgaXMgaGlnaGxp Z2h0ZWQgYnkgdGhlIGZvY3VzZWQgZm9ybQorICAgICAgICBjb250cm9sIG92ZXJsYXkgbWFrZXMg dGhpcyBldmVuIG1vcmUgY29uZnVzaW5nLCBzaW5jZSBwYXJ0IG9mIHRoZSBmb2N1cyBvdmVybGF5 IGhpZ2hsaWdodCByZWN0IG9mdGVuIGVuZHMgdXAKKyAgICAgICAgb3V0c2lkZSB0aGUgdmlld3Bv cnQuCisKKyAgICAgICAgVG8gZml4IHRoaXMsIHdlIG1ha2UgYSBjb3VwbGUgb2YgdHdlYWtzIHRv IGZvY3VzIHJlY3Qgem9vbWluZyBpbiBleHRyYSB6b29tIG1vZGUuICgxKSBJbnN0ZWFkIG9mIGNv bXB1dGluZworICAgICAgICB0YXJnZXQgem9vbSBsZXZlbCBiYXNlZCBvbiBmb250IHNpemUsIHRy eSB0byB6b29tIHN1Y2ggdGhhdCB0aGUgZm9jdXNlZCBlbGVtZW50IHJlY3QgZmlsbHMgdXAgbW9z dCBvZiB0aGUKKyAgICAgICAgdmlld3BvcnQgKHNpbWlsYXIgdG8gZG91YmxlLXRhcCB6b29taW5n KS4gVGhpcyBlbnN1cmVzIHRoYXQgdGhlIGZvY3VzZWQgZm9ybSBjb250cm9sIG92ZXJsYXkncyBo aWdobGlnaHQgcmVjdAorICAgICAgICBtYWtlcyBzZW5zZSBpbiBtb3N0IGNhc2VzLCB3aXRoIGZl dyBleGNlcHRpb25zIChlLmcuIHRoZSBlbGVtZW50IGZyYW1lIGlzIGxhcmdlciB0aGFuIHRoZSB2 aWV3cG9ydCkuICgyKQorICAgICAgICBJbnRyb2R1Y2UgYSBtaW5pbXVtIGxlZ2libGUgZm9udCBz aXplIG9mIDExLCBhbmQgY29tcHV0ZSB0aGUgbWluaW1pdW0gc2NhbGUgbmVlZGVkIHN1Y2ggdGhh dCB0aGUgZm9ybSBjb250cm9sCisgICAgICAgIGZvbnQgd291bGQgYXBwZWFyIHRvIGJlIGF0IGxl YXN0IHRoaXMgbGVnaWJsZSBmb250IHNpemUuIFRoZW4sIGNsYW1wIHRoZSB0YXJnZXQgc2NhbGUg Y2hvc2VuIGJ5ICgxKSB0byB0aGlzCisgICAgICAgIG1pbmltdW0gc2NhbGUuCisKKyAgICAgICAg T25lIGFkZGl0aW9uYWwgY29uc2lkZXJhdGlvbiBmb3IgKDEpIGlzIHRoYXQgbmFpdmVseSBzY2Fs aW5nIHRvIGZpdCB0aGUgZWxlbWVudCByZWN0IHRvIHRoZSB2aWV3cG9ydCAod2l0aCBzb21lCisg ICAgICAgIGZpeGVkIG1hcmdpbnMpIHdvdWxkIGNhdXNlIHRoZSB2aWV3cG9ydCBzY2FsZSB0byBh bHdheXMgY2hhbmdlIHdoZW4gbW92aW5nIGZvY3VzIGJldHdlZW4gZm9ybSBjb250cm9scyBvZgor ICAgICAgICBkaWZmZXJlbnQgZGltZW5zaW9ucywgZXZlbiBpZiB0aGUgY3VycmVudCBzY2FsZSBp cyBtb3JlIG9yIGxlc3MgYXBwcm9wcmlhdGUgZm9yIGFsbCB0aGUgZm9jdXNhYmxlIGVsZW1lbnRz LiBUbworICAgICAgICBhZGRyZXNzIHRoaXMsIGluc3RlYWQgb2YgY29tcHV0aW5nIGEgc2luZ2xl IHRhcmdldCB6b29tIHNjYWxlIGZvciBhbiBlbGVtZW50IHJlY3QsIGNvbXB1dGUgYSByYW5nZSBv ZiBwb3NzaWJsZQorICAgICAgICB0YXJnZXQgem9vbSBzY2FsZXMgKHdoZXJlIHRoZSBtaW5pbXVt IGFuZCBtYXhpbXVtIHZhbHVlcyBkZXBlbmQgb24gdGhlIG1hcmdpbiB3ZSBhZGQgYXJvdW5kIHRo ZSBlbGVtZW50IHJlY3QpLgorICAgICAgICBJZiB0aGUgY3VycmVudCBzY2FsZSBhbHJlYWR5IGZh bGxzIHdpdGhpbiB0aGlzIHRhcmdldCBzY2FsZSByYW5nZSwgdGhlbiB3ZSB3b24ndCBib3RoZXIg YWRqdXN0aW5nIHRoZSBzY2FsZSBhdAorICAgICAgICBhbGwgKHVubGVzcyB0aGUgZm9udCBzaXpl IGlzIHRvbyBzbWFsbCDigJQgc2VlICgyKSkuIElmIHRoZSBjdXJyZW50IHNjYWxlIGZhbGxzIG91 dHNpZGUgdGhlIHRhcmdldCBzY2FsZSByYW5nZSwgd2UKKyAgICAgICAgdGhlbiBtYWtlIHRoZSBt aW5pbWFsIGFkanVzdG1lbnQgbmVlZGVkIHRvIGVuc3VyZSB0aGF0IHRoZSBlbGVtZW50IHJlY3Qg Zml0cyB3ZWxsIHdpdGhpbiB0aGUgdmlld3BvcnQgd2l0aG91dAorICAgICAgICBiZWluZyB0b28g c21hbGwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF96b29tVG9Gb2N1c1JlY3Q6c2VsZWN0aW9uUmVjdDppbnNpZGVG aXhlZDpmb250U2l6ZTptaW5pbXVtU2NhbGU6bWF4aW11bVNjYWxlOmFsbG93U2NhbGluZzpmb3Jj ZVNjcm9sbDpdKToKKworICAgICAgICBNb3ZlIHNvbWUgbG9naWMgYXJvdW5kIHNvIHRoYXQgdGhl IHRhcmdldCBzY2FsZSBpcyBjb21wdXRlZCBhZnRlciBjb21wdXRpbmcgdGhlIHZpc2libGUgc2l6 ZS4gQWxzbyByZW5hbWVzIHNvbWUKKyAgICAgICAgY29uc3RhbnRzIGxvY2FsIHRvIHRoaXMgZnVu Y3Rpb24gKFdLV2ViVmlld1N0YW5kYXJkRm9udFNpemUsIGtNaW5pbXVtSGVpZ2h0VG9TaG93Q29u dGVudEFib3ZlS2V5Ym9hcmQsCisgICAgICAgIFVJV2ViRm9ybUFuaW1hdGlvbkR1cmF0aW9uLCBD YXJldE9mZnNldEZyb21XaW5kb3dFZGdlKSBzdWNoIHRoYXQgdGhleSBub3cgc2hhcmUgYSBjb25z aXN0ZW50IG5hbWluZyBzdHlsZS4KKwogMjAxOC0wMy0zMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZG9wdCBsaXN0 IHZpZXcgY29udHJvbGxlciBVSSBmb3IgbnVtZXJpYyBpbnB1dCB0eXBlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMGQxOGUxNWIzYTM3 MGU2M2U5ZDVlOTEyODczYjAwNzU2OTBhMDAyMC4uM2ZkMDg5MDdkODkxNzU5ZmFlYWZmZmQ4Y2Jl Y2MzMDM4NGYxZGI0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC0yMTIwLDIyICsyMTIwLDEyIEBAIC0gKHZvaWQpX3pvb21Ub0ZvY3Vz UmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KWZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29y ZGluCiAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICJfem9vbVRv Rm9jdXNSZWN0OiIgPDwgZm9jdXNlZEVsZW1lbnRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzIDw8 ICIgc2VsZWN0aW9uUmVjdDoiIDw8IHNlbGVjdGlvblJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMp OwogICAgIFVOVVNFRF9QQVJBTShpbnNpZGVGaXhlZCk7CiAKLSAgICBjb25zdCBkb3VibGUgV0tX ZWJWaWV3U3RhbmRhcmRGb250U2l6ZSA9IDE2OwotICAgIGNvbnN0IGRvdWJsZSBrTWluaW11bUhl aWdodFRvU2hvd0NvbnRlbnRBYm92ZUtleWJvYXJkID0gMTA2OwotICAgIGNvbnN0IENGVGltZUlu dGVydmFsIFVJV2ViRm9ybUFuaW1hdGlvbkR1cmF0aW9uID0gMC4yNTsKLSAgICBjb25zdCBkb3Vi bGUgQ2FyZXRPZmZzZXRGcm9tV2luZG93RWRnZSA9IDIwOwotCi0gICAgLy8gWm9vbSBhcm91bmQg dGhlIGVsZW1lbnQncyBib3VuZGluZyBmcmFtZS4gV2UgdXNlIGEgInN0YW5kYXJkIiBzaXplIHRv IGRldGVybWluZSB0aGUgcHJvcGVyIGZyYW1lLgotICAgIGRvdWJsZSBzY2FsZSA9IGFsbG93U2Nh bGluZyA/IHN0ZDo6bWluKHN0ZDo6bWF4KFdLV2ViVmlld1N0YW5kYXJkRm9udFNpemUgLyBmb250 U2l6ZSwgbWluaW11bVNjYWxlKSwgbWF4aW11bVNjYWxlKSA6IGNvbnRlbnRab29tU2NhbGUoc2Vs Zik7Ci0gICAgQ0dGbG9hdCBkb2N1bWVudFdpZHRoID0gW19jb250ZW50VmlldyBib3VuZHNdLnNp emUud2lkdGg7Ci0gICAgc2NhbGUgPSBDR1JvdW5kKGRvY3VtZW50V2lkdGggKiBzY2FsZSkgLyBk b2N1bWVudFdpZHRoOworICAgIGNvbnN0IGRvdWJsZSBtaW5pbXVtSGVpZ2h0VG9TaG93Q29udGVu dEFib3ZlS2V5Ym9hcmQgPSAxMDY7CisgICAgY29uc3QgQ0ZUaW1lSW50ZXJ2YWwgZm9ybUNvbnRy b2xab29tQW5pbWF0aW9uRHVyYXRpb24gPSAwLjI1OworICAgIGNvbnN0IGRvdWJsZSBjYXJldE9m ZnNldEZyb21XaW5kb3dFZGdlID0gMjA7CiAKICAgICBVSVdpbmRvdyAqd2luZG93ID0gW19zY3Jv bGxWaWV3IHdpbmRvd107CiAKLSAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZm9jdXNlZEVsZW1lbnRS ZWN0SW5OZXdTY2FsZSA9IGZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29yZGluYXRlczsK LSAgICBmb2N1c2VkRWxlbWVudFJlY3RJbk5ld1NjYWxlLnNjYWxlKHNjYWxlKTsKLSAgICBmb2N1 c2VkRWxlbWVudFJlY3RJbk5ld1NjYWxlLm1vdmVCeShbX2NvbnRlbnRWaWV3IGZyYW1lXS5vcmln aW4pOwotCiAgICAgLy8gRmluZCB0aGUgcG9ydGlvbiBvZiB0aGUgdmlldyB0aGF0IGlzIHZpc2li bGUgb24gdGhlIHNjcmVlbi4KICAgICBVSVZpZXdDb250cm9sbGVyICp0b3BWaWV3Q29udHJvbGxl ciA9IFtbW19zY3JvbGxWaWV3IF92aWV3Q29udHJvbGxlckZvckFuY2VzdG9yXSBfcm9vdEFuY2Vz dG9yVmlld0NvbnRyb2xsZXJdIF92aWV3Q29udHJvbGxlckZvclN1cHBvcnRlZEludGVyZmFjZU9y aWVudGF0aW9uc107CiAgICAgVUlWaWV3ICpmdWxsU2NyZWVuVmlldyA9IHRvcFZpZXdDb250cm9s bGVyLnZpZXc7CkBAIC0yMTUzLDcgKzIxNDMsNyBAQCAtICh2b2lkKV96b29tVG9Gb2N1c1JlY3Q6 KFdlYkNvcmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50Q29vcmRpbgog ICAgICAgICBDR0Zsb2F0IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQgPSBDR1JlY3RH ZXRNaW5ZKGludGVyc2VjdGlvbkJldHdlZW5TY3JvbGxWaWV3QW5kRm9ybUFzc2lzdGFudCkgLSBD R1JlY3RHZXRNaW5ZKHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29vcmRpbmF0ZXMp OwogICAgICAgICBDR0Zsb2F0IGhlaWdodFZpc2libGVCZWxvd0Zvcm1Bc3Npc3RhbnQgPSBDR1Jl Y3RHZXRNYXhZKHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29vcmRpbmF0ZXMpIC0g Q0dSZWN0R2V0TWF4WShpbnRlcnNlY3Rpb25CZXR3ZWVuU2Nyb2xsVmlld0FuZEZvcm1Bc3Npc3Rh bnQpOwogCi0gICAgICAgIGlmIChoZWlnaHRWaXNpYmxlQWJvdmVGb3JtQXNzaXN0YW50ID49IGtN aW5pbXVtSGVpZ2h0VG9TaG93Q29udGVudEFib3ZlS2V5Ym9hcmQgfHwgaGVpZ2h0VmlzaWJsZUJl bG93Rm9ybUFzc2lzdGFudCA8IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQpCisgICAg ICAgIGlmIChoZWlnaHRWaXNpYmxlQWJvdmVGb3JtQXNzaXN0YW50ID49IG1pbmltdW1IZWlnaHRU b1Nob3dDb250ZW50QWJvdmVLZXlib2FyZCB8fCBoZWlnaHRWaXNpYmxlQmVsb3dGb3JtQXNzaXN0 YW50IDwgaGVpZ2h0VmlzaWJsZUFib3ZlRm9ybUFzc2lzdGFudCkKICAgICAgICAgICAgIHZpc2li bGVTaXplLmhlaWdodCA9IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQ7CiAgICAgICAg IGVsc2UgewogICAgICAgICAgICAgdmlzaWJsZVNpemUuaGVpZ2h0ID0gaGVpZ2h0VmlzaWJsZUJl bG93Rm9ybUFzc2lzdGFudDsKQEAgLTIxNjEsNiArMjE1MSwzNSBAQCAtICh2b2lkKV96b29tVG9G b2N1c1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50 Q29vcmRpbgogICAgICAgICB9CiAgICAgfQogCisgICAgLy8gWm9vbSBhcm91bmQgdGhlIGVsZW1l bnQncyBib3VuZGluZyBmcmFtZS4gV2UgdXNlIGEgInN0YW5kYXJkIiBzaXplIHRvIGRldGVybWlu ZSB0aGUgcHJvcGVyIGZyYW1lLgorICAgIGRvdWJsZSBjdXJyZW50U2NhbGUgPSBjb250ZW50Wm9v bVNjYWxlKHNlbGYpOworICAgIGRvdWJsZSBzY2FsZSA9IGN1cnJlbnRTY2FsZTsKKyAgICBpZiAo YWxsb3dTY2FsaW5nKSB7CisjaWYgRU5BQkxFKEVYVFJBX1pPT01fTU9ERSkKKyAgICAgICAgY29u c3QgZG91YmxlIG1pbmltdW1MZWdpYmxlRm9udFNpemUgPSAxMTsKKyAgICAgICAgY29uc3QgQ0dG bG9hdCBtaW5pbXVtTWFyZ2luRm9yWm9vbWluZ1RvRW50aXJlRm9jdXNSZWN0SW5Eb2N1bWVudENv b3JkaW5hdGVzID0gMTA7CisgICAgICAgIGNvbnN0IENHRmxvYXQgbWF4aW11bU1hcmdpbkZvclpv b21pbmdUb0VudGlyZUZvY3VzUmVjdEluRG9jdW1lbnRDb29yZGluYXRlcyA9IDMwOworCisgICAg ICAgIENHUmVjdCBtaW5pbXVtVGFyZ2V0UmVjdEluRG9jdW1lbnRDb29yZGluYXRlcyA9IFVJUmVj dEluc2V0RWRnZXMoZm9jdXNlZEVsZW1lbnRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzLCBVSVJl Y3RFZGdlQWxsLCAtbWluaW11bU1hcmdpbkZvclpvb21pbmdUb0VudGlyZUZvY3VzUmVjdEluRG9j dW1lbnRDb29yZGluYXRlcyk7CisgICAgICAgIENHUmVjdCBtYXhpbXVtVGFyZ2V0UmVjdEluRG9j dW1lbnRDb29yZGluYXRlcyA9IFVJUmVjdEluc2V0RWRnZXMoZm9jdXNlZEVsZW1lbnRSZWN0SW5E b2N1bWVudENvb3JkaW5hdGVzLCBVSVJlY3RFZGdlQWxsLCAtbWF4aW11bU1hcmdpbkZvclpvb21p bmdUb0VudGlyZUZvY3VzUmVjdEluRG9jdW1lbnRDb29yZGluYXRlcyk7CisKKyAgICAgICAgZG91 YmxlIGNsYW1wZWRNYXhpbXVtVGFyZ2V0U2NhbGUgPSBjbGFtcFRvPGRvdWJsZT4oc3RkOjptaW4o dmlzaWJsZVNpemUud2lkdGggLyBDR1JlY3RHZXRXaWR0aChtaW5pbXVtVGFyZ2V0UmVjdEluRG9j dW1lbnRDb29yZGluYXRlcyksIHZpc2libGVTaXplLmhlaWdodCAvIENHUmVjdEdldEhlaWdodCht aW5pbXVtVGFyZ2V0UmVjdEluRG9jdW1lbnRDb29yZGluYXRlcykpLCBtaW5pbXVtU2NhbGUsIG1h eGltdW1TY2FsZSk7CisgICAgICAgIGRvdWJsZSBjbGFtcGVkTWluaW11bVRhcmdldFNjYWxlID0g Y2xhbXBUbzxkb3VibGU+KHN0ZDo6bWluKHZpc2libGVTaXplLndpZHRoIC8gQ0dSZWN0R2V0V2lk dGgobWF4aW11bVRhcmdldFJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMpLCB2aXNpYmxlU2l6ZS5o ZWlnaHQgLyBDR1JlY3RHZXRIZWlnaHQobWF4aW11bVRhcmdldFJlY3RJbkRvY3VtZW50Q29vcmRp bmF0ZXMpKSwgbWluaW11bVNjYWxlLCBtYXhpbXVtU2NhbGUpOworICAgICAgICBkb3VibGUgdGFy Z2V0U2NhbGVJZ25vcmluZ0ZvbnRTaXplQ29uc3RyYWludHMgPSBjbGFtcFRvPGRvdWJsZT4oY3Vy cmVudFNjYWxlLCBjbGFtcGVkTWluaW11bVRhcmdldFNjYWxlLCBjbGFtcGVkTWF4aW11bVRhcmdl dFNjYWxlKTsKKyAgICAgICAgc2NhbGUgPSBzdGQ6Om1heDxkb3VibGU+KG1pbmltdW1MZWdpYmxl Rm9udFNpemUgLyBmb250U2l6ZSwgdGFyZ2V0U2NhbGVJZ25vcmluZ0ZvbnRTaXplQ29uc3RyYWlu dHMpOworI2Vsc2UKKyAgICAgICAgY29uc3QgZG91YmxlIHdlYlZpZXdTdGFuZGFyZEZvbnRTaXpl ID0gMTY7CisgICAgICAgIHNjYWxlID0gY2xhbXBUbzxkb3VibGU+KHdlYlZpZXdTdGFuZGFyZEZv bnRTaXplIC8gZm9udFNpemUsIG1pbmltdW1TY2FsZSwgbWF4aW11bVNjYWxlKTsKKyNlbmRpZgor ICAgIH0KKworICAgIENHRmxvYXQgZG9jdW1lbnRXaWR0aCA9IFtfY29udGVudFZpZXcgYm91bmRz XS5zaXplLndpZHRoOworICAgIHNjYWxlID0gQ0dSb3VuZChkb2N1bWVudFdpZHRoICogc2NhbGUp IC8gZG9jdW1lbnRXaWR0aDsKKworICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBmb2N1c2VkRWxlbWVu dFJlY3RJbk5ld1NjYWxlID0gZm9jdXNlZEVsZW1lbnRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVz OworICAgIGZvY3VzZWRFbGVtZW50UmVjdEluTmV3U2NhbGUuc2NhbGUoc2NhbGUpOworICAgIGZv Y3VzZWRFbGVtZW50UmVjdEluTmV3U2NhbGUubW92ZUJ5KFtfY29udGVudFZpZXcgZnJhbWVdLm9y aWdpbik7CisKICAgICBCT09MIHNlbGVjdGlvblJlY3RJc05vdE51bGwgPSAhc2VsZWN0aW9uUmVj dEluRG9jdW1lbnRDb29yZGluYXRlcy5pc1plcm8oKTsKICAgICBpZiAoIWZvcmNlU2Nyb2xsKSB7 CiAgICAgICAgIENHUmVjdCBjdXJyZW50bHlWaXNpYmxlUmVnaW9uSW5XZWJWaWV3Q29vcmRpbmF0 ZXM7CkBAIC0yMTkzLDggKzIyMTIsOCBAQCAtICh2b2lkKV96b29tVG9Gb2N1c1JlY3Q6KFdlYkNv cmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50Q29vcmRpbgogICAgICAg ICBXZWJDb3JlOjpGbG9hdFJlY3Qgc2VsZWN0aW9uUmVjdEluTmV3U2NhbGUgPSBzZWxlY3Rpb25S ZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzOwogICAgICAgICBzZWxlY3Rpb25SZWN0SW5OZXdTY2Fs ZS5zY2FsZShzY2FsZSk7CiAgICAgICAgIHNlbGVjdGlvblJlY3RJbk5ld1NjYWxlLm1vdmVCeShb X2NvbnRlbnRWaWV3IGZyYW1lXS5vcmlnaW4pOwotICAgICAgICBtaW5pbXVtQWxsb3dhYmxlSG9y aXpvbnRhbE9mZnNldEluV2ViVmlld0Nvb3JkaW5hdGVzID0gQ0dSZWN0R2V0TWF4WChzZWxlY3Rp b25SZWN0SW5OZXdTY2FsZSkgKyBDYXJldE9mZnNldEZyb21XaW5kb3dFZGdlIC0gdmlzaWJsZVNp emUud2lkdGg7Ci0gICAgICAgIG1pbmltdW1BbGxvd2FibGVWZXJ0aWNhbE9mZnNldEluV2ViVmll d0Nvb3JkaW5hdGVzID0gQ0dSZWN0R2V0TWF4WShzZWxlY3Rpb25SZWN0SW5OZXdTY2FsZSkgKyBD YXJldE9mZnNldEZyb21XaW5kb3dFZGdlIC0gdmlzaWJsZVNpemUuaGVpZ2h0IC0gdmlzaWJsZU9m ZnNldEZyb21Ub3A7CisgICAgICAgIG1pbmltdW1BbGxvd2FibGVIb3Jpem9udGFsT2Zmc2V0SW5X ZWJWaWV3Q29vcmRpbmF0ZXMgPSBDR1JlY3RHZXRNYXhYKHNlbGVjdGlvblJlY3RJbk5ld1NjYWxl KSArIGNhcmV0T2Zmc2V0RnJvbVdpbmRvd0VkZ2UgLSB2aXNpYmxlU2l6ZS53aWR0aDsKKyAgICAg ICAgbWluaW11bUFsbG93YWJsZVZlcnRpY2FsT2Zmc2V0SW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSBD R1JlY3RHZXRNYXhZKHNlbGVjdGlvblJlY3RJbk5ld1NjYWxlKSArIGNhcmV0T2Zmc2V0RnJvbVdp bmRvd0VkZ2UgLSB2aXNpYmxlU2l6ZS5oZWlnaHQgLSB2aXNpYmxlT2Zmc2V0RnJvbVRvcDsKICAg ICB9CiAKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZG9jdW1lbnRCb3VuZHNJbk5ld1NjYWxlID0g W19jb250ZW50VmlldyBib3VuZHNdOwpAQCAtMjIyNSwxNyArMjI0NCwxNCBAQCAtICh2b2lkKV96 b29tVG9Gb2N1c1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRv Y3VtZW50Q29vcmRpbgogCiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBuZXdDZW50ZXIgPSBDR1Bv aW50TWFrZSh0b3BMZWZ0LnggKyB1bm9ic2N1cmVkU2Nyb2xsVmlld1JlY3RJbldlYlZpZXdDb29y ZGluYXRlcy5zaXplLndpZHRoIC8gMi4wLCB0b3BMZWZ0LnkgKyB1bm9ic2N1cmVkU2Nyb2xsVmll d1JlY3RJbldlYlZpZXdDb29yZGluYXRlcy5zaXplLmhlaWdodCAvIDIuMCk7CiAKLSAgICBpZiAo c2NhbGUgIT0gY29udGVudFpvb21TY2FsZShzZWxmKSkKKyAgICBpZiAoc2NhbGUgIT0gY3VycmVu dFNjYWxlKQogICAgICAgICBfcGFnZS0+d2lsbFN0YXJ0VXNlclRyaWdnZXJlZFpvb21pbmcoKTsK IAogICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxlUmVjdHMsIHN0cmVhbSA8PCAiX3pvb21Ub0Zv Y3VzUmVjdDogem9vbWluZyB0byAiIDw8IG5ld0NlbnRlciA8PCAiIHNjYWxlOiIgPDwgc2NhbGUp OwogCiAgICAgLy8gVGhlIG5ld0NlbnRlciBoYXMgYmVlbiBjb21wdXRlZCBpbiB0aGUgbmV3IHNj YWxlLCBidXQgX3pvb21Ub0NlbnRlciBleHBlY3RlZCB0aGUgY2VudGVyIHRvIGJlIGluIHRoZSBv cmlnaW5hbCBzY2FsZS4KICAgICBuZXdDZW50ZXIuc2NhbGUoMSAvIHNjYWxlKTsKLSAgICBbX3Nj cm9sbFZpZXcgX3pvb21Ub0NlbnRlcjpuZXdDZW50ZXIKLSAgICAgICAgICAgICAgICAgICAgICAg IHNjYWxlOnNjYWxlCi0gICAgICAgICAgICAgICAgICAgICBkdXJhdGlvbjpVSVdlYkZvcm1Bbmlt YXRpb25EdXJhdGlvbgotICAgICAgICAgICAgICAgICAgICAgICAgZm9yY2U6WUVTXTsKKyAgICBb X3Njcm9sbFZpZXcgX3pvb21Ub0NlbnRlcjpuZXdDZW50ZXIgc2NhbGU6c2NhbGUgZHVyYXRpb246 Zm9ybUNvbnRyb2xab29tQW5pbWF0aW9uRHVyYXRpb24gZm9yY2U6WUVTXTsKIH0KIAogLSAoQ0dG bG9hdClfdGFyZ2V0Q29udGVudFpvb21TY2FsZUZvclJlY3Q6KGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYpdGFyZ2V0UmVjdCBjdXJyZW50U2NhbGU6KGRvdWJsZSljdXJyZW50U2NhbGUgZml0RW50 aXJlUmVjdDooQk9PTClmaXRFbnRpcmVSZWN0IG1pbmltdW1TY2FsZTooZG91YmxlKW1pbmltdW1T Y2FsZSBtYXhpbXVtU2NhbGU6KGRvdWJsZSltYXhpbXVtU2NhbGUK 336984 2018-04-02 08:13:05 -0700 2018-04-02 12:06:48 -0700 Define min/max zoom margins in web view coordinates bug-184222-20180402081304.patch text/plain 11465 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGEzZDM5ZWQ5OGIyNzE4YTU4 ODFkNmUwZmE3NGYyMjViZjljZjhmOGEuLjUyYjNlZGNhYzQzNzhlZDJjN2M0MzMyMjUwMDMxZTYy Yzk4NTYzMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTgtMDMtMzEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW0V4dHJhIHpvb20gbW9k ZV0gWm9vbSBsZXZlbCBpcyBzb21ldGltZXMgZXhjZXNzaXZlIHdoZW4gem9vbWluZyB0byBmb2N1 c2VkIGZvcm0gY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NDIyMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkwNjM4ODY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBvbiBpbnRlcmFj dGl2ZWx5IGZvY3VzaW5nIGFuIGVsZW1lbnQsIHdlIHpvb20gYW5kIHNjcm9sbCB0byByZXZlYWwg dGhhdCBlbGVtZW50LiBUaGUgaGV1cmlzdGljcyBpbnRyb2R1Y2VkIGluCisgICAgICAgIDxodHRw czovL3RyYWMud2Via2l0Lm9yZy9yMTY4NzQ0PiB3b3JrIGJ5IGNvbXB1dGluZyBhIHRhcmdldCBz Y2FsZSwgYW5kIHRoZW4gYSBwb2ludCB0byB6b29tIHRvIGdpdmVuIHRoYXQKKyAgICAgICAgc2Nh bGUuIEN1cnJlbnRseSwgdGhpcyBzY2FsZSBpcyBkZXBlbmRlbnQgb24gdGhlIGNvbXB1dGVkIGZv bnQgc2l6ZSBvZiB0aGUgZm9ybSBjb250cm9sLCBzdWNoIHRoYXQgdGhlIGZvcm0KKyAgICAgICAg Y29udHJvbCB3b3VsZCBiZSBzY2FsZWQgdG8gaGF2ZSBhbiBlZmZlY3RpdmUgZm9udCBzaXplIG9m IDE2LgorCisgICAgICAgIEhvd2V2ZXIsIGluIGV4dHJhIHpvb20gbW9kZSwgYXBwbHlpbmcgdGhl c2Ugc2FtZSBoZXVyaXN0aWNzIChpcm9uaWNhbGx5KSByZXN1bHRzIGluIGV4Y2Vzc2l2ZSB6b29t IGxldmVscywgc2luY2UKKyAgICAgICAgc2NhbGluZyB0aGUgZm9udCB1cCB0byAxNiB3b3VsZCBj YXVzZSBtb3N0IGZvcm0gY29udHJvbHMgdG8gem9vbSBzbyBmYXIgaW4gdGhhdCB3ZSBsb3NlIGNv bnRleHQgb2Ygc3Vycm91bmRpbmcKKyAgICAgICAgZWxlbWVudHMgc3VjaCBhcyBsYWJlbHMgYW5k IG90aGVyIGZvcm0gY29udHJvbHM7IHRoZSBmYWN0IHRoYXQgdGhlIGVsZW1lbnQgaXMgaGlnaGxp Z2h0ZWQgYnkgdGhlIGZvY3VzZWQgZm9ybQorICAgICAgICBjb250cm9sIG92ZXJsYXkgbWFrZXMg dGhpcyBldmVuIG1vcmUgY29uZnVzaW5nLCBzaW5jZSBwYXJ0IG9mIHRoZSBmb2N1cyBvdmVybGF5 IGhpZ2hsaWdodCByZWN0IG9mdGVuIGVuZHMgdXAKKyAgICAgICAgb3V0c2lkZSB0aGUgdmlld3Bv cnQuCisKKyAgICAgICAgVG8gZml4IHRoaXMsIHdlIG1ha2UgYSBjb3VwbGUgb2YgdHdlYWtzIHRv IGZvY3VzIHJlY3Qgem9vbWluZyBpbiBleHRyYSB6b29tIG1vZGUuICgxKSBJbnN0ZWFkIG9mIGNv bXB1dGluZworICAgICAgICB0YXJnZXQgem9vbSBsZXZlbCBiYXNlZCBvbiBmb250IHNpemUsIHRy eSB0byB6b29tIHN1Y2ggdGhhdCB0aGUgZm9jdXNlZCBlbGVtZW50IHJlY3QgZmlsbHMgdXAgbW9z dCBvZiB0aGUKKyAgICAgICAgdmlld3BvcnQgKHNpbWlsYXIgdG8gZG91YmxlLXRhcCB6b29taW5n KS4gVGhpcyBlbnN1cmVzIHRoYXQgdGhlIGZvY3VzZWQgZm9ybSBjb250cm9sIG92ZXJsYXkncyBo aWdobGlnaHQgcmVjdAorICAgICAgICBtYWtlcyBzZW5zZSBpbiBtb3N0IGNhc2VzLCB3aXRoIGZl dyBleGNlcHRpb25zIChlLmcuIHRoZSBlbGVtZW50IGZyYW1lIGlzIGxhcmdlciB0aGFuIHRoZSB2 aWV3cG9ydCkuICgyKQorICAgICAgICBJbnRyb2R1Y2UgYSBtaW5pbXVtIGxlZ2libGUgZm9udCBz aXplIG9mIDExLCBhbmQgY29tcHV0ZSB0aGUgbWluaW1pdW0gc2NhbGUgbmVlZGVkIHN1Y2ggdGhh dCB0aGUgZm9ybSBjb250cm9sCisgICAgICAgIGZvbnQgd291bGQgYXBwZWFyIHRvIGJlIGF0IGxl YXN0IHRoaXMgbGVnaWJsZSBmb250IHNpemUuIFRoZW4sIGNsYW1wIHRoZSB0YXJnZXQgc2NhbGUg Y2hvc2VuIGJ5ICgxKSB0byB0aGlzCisgICAgICAgIG1pbmltdW0gc2NhbGUuCisKKyAgICAgICAg T25lIGFkZGl0aW9uYWwgY29uc2lkZXJhdGlvbiBmb3IgKDEpIGlzIHRoYXQgbmFpdmVseSBzY2Fs aW5nIHRvIGZpdCB0aGUgZWxlbWVudCByZWN0IHRvIHRoZSB2aWV3cG9ydCAod2l0aCBzb21lCisg ICAgICAgIGZpeGVkIG1hcmdpbnMpIHdvdWxkIGNhdXNlIHRoZSB2aWV3cG9ydCBzY2FsZSB0byBh bHdheXMgY2hhbmdlIHdoZW4gbW92aW5nIGZvY3VzIGJldHdlZW4gZm9ybSBjb250cm9scyBvZgor ICAgICAgICBkaWZmZXJlbnQgZGltZW5zaW9ucywgZXZlbiBpZiB0aGUgY3VycmVudCBzY2FsZSBp cyBtb3JlIG9yIGxlc3MgYXBwcm9wcmlhdGUgZm9yIGFsbCB0aGUgZm9jdXNhYmxlIGVsZW1lbnRz LiBUbworICAgICAgICBhZGRyZXNzIHRoaXMsIGluc3RlYWQgb2YgY29tcHV0aW5nIGEgc2luZ2xl IHRhcmdldCB6b29tIHNjYWxlIGZvciBhbiBlbGVtZW50IHJlY3QsIGNvbXB1dGUgYSByYW5nZSBv ZiBwb3NzaWJsZQorICAgICAgICB0YXJnZXQgem9vbSBzY2FsZXMgKHdoZXJlIHRoZSBtaW5pbXVt IGFuZCBtYXhpbXVtIHZhbHVlcyBkZXBlbmQgb24gdGhlIG1hcmdpbiB3ZSBhZGQgYXJvdW5kIHRo ZSBlbGVtZW50IHJlY3QpLgorICAgICAgICBJZiB0aGUgY3VycmVudCBzY2FsZSBhbHJlYWR5IGZh bGxzIHdpdGhpbiB0aGlzIHRhcmdldCBzY2FsZSByYW5nZSwgdGhlbiB3ZSB3b24ndCBib3RoZXIg YWRqdXN0aW5nIHRoZSBzY2FsZSBhdAorICAgICAgICBhbGwgKHVubGVzcyB0aGUgZm9udCBzaXpl IGlzIHRvbyBzbWFsbCDigJQgc2VlICgyKSkuIElmIHRoZSBjdXJyZW50IHNjYWxlIGZhbGxzIG91 dHNpZGUgdGhlIHRhcmdldCBzY2FsZSByYW5nZSwgd2UKKyAgICAgICAgdGhlbiBtYWtlIHRoZSBt aW5pbWFsIGFkanVzdG1lbnQgbmVlZGVkIHRvIGVuc3VyZSB0aGF0IHRoZSBlbGVtZW50IHJlY3Qg Zml0cyB3ZWxsIHdpdGhpbiB0aGUgdmlld3BvcnQgd2l0aG91dAorICAgICAgICBiZWluZyB0b28g c21hbGwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF96b29tVG9Gb2N1c1JlY3Q6c2VsZWN0aW9uUmVjdDppbnNpZGVG aXhlZDpmb250U2l6ZTptaW5pbXVtU2NhbGU6bWF4aW11bVNjYWxlOmFsbG93U2NhbGluZzpmb3Jj ZVNjcm9sbDpdKToKKworICAgICAgICBNb3ZlIHNvbWUgbG9naWMgYXJvdW5kIHNvIHRoYXQgdGhl IHRhcmdldCBzY2FsZSBpcyBjb21wdXRlZCBhZnRlciBjb21wdXRpbmcgdGhlIHZpc2libGUgc2l6 ZS4gQWxzbyByZW5hbWVzIHNvbWUKKyAgICAgICAgY29uc3RhbnRzIGxvY2FsIHRvIHRoaXMgZnVu Y3Rpb24gKFdLV2ViVmlld1N0YW5kYXJkRm9udFNpemUsIGtNaW5pbXVtSGVpZ2h0VG9TaG93Q29u dGVudEFib3ZlS2V5Ym9hcmQsCisgICAgICAgIFVJV2ViRm9ybUFuaW1hdGlvbkR1cmF0aW9uLCBD YXJldE9mZnNldEZyb21XaW5kb3dFZGdlKSBzdWNoIHRoYXQgdGhleSBub3cgc2hhcmUgYSBjb25z aXN0ZW50IG5hbWluZyBzdHlsZS4KKwogMjAxOC0wMy0zMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZG9wdCBsaXN0 IHZpZXcgY29udHJvbGxlciBVSSBmb3IgbnVtZXJpYyBpbnB1dCB0eXBlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMGQxOGUxNWIzYTM3 MGU2M2U5ZDVlOTEyODczYjAwNzU2OTBhMDAyMC4uNWZiMGU2ODk5MTAwYzNkN2E4ODI1NTI0NGEy MjVkMTczZWZhZjRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC0yMTIwLDIyICsyMTIwLDEyIEBAIC0gKHZvaWQpX3pvb21Ub0ZvY3Vz UmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KWZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29y ZGluCiAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICJfem9vbVRv Rm9jdXNSZWN0OiIgPDwgZm9jdXNlZEVsZW1lbnRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzIDw8 ICIgc2VsZWN0aW9uUmVjdDoiIDw8IHNlbGVjdGlvblJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMp OwogICAgIFVOVVNFRF9QQVJBTShpbnNpZGVGaXhlZCk7CiAKLSAgICBjb25zdCBkb3VibGUgV0tX ZWJWaWV3U3RhbmRhcmRGb250U2l6ZSA9IDE2OwotICAgIGNvbnN0IGRvdWJsZSBrTWluaW11bUhl aWdodFRvU2hvd0NvbnRlbnRBYm92ZUtleWJvYXJkID0gMTA2OwotICAgIGNvbnN0IENGVGltZUlu dGVydmFsIFVJV2ViRm9ybUFuaW1hdGlvbkR1cmF0aW9uID0gMC4yNTsKLSAgICBjb25zdCBkb3Vi bGUgQ2FyZXRPZmZzZXRGcm9tV2luZG93RWRnZSA9IDIwOwotCi0gICAgLy8gWm9vbSBhcm91bmQg dGhlIGVsZW1lbnQncyBib3VuZGluZyBmcmFtZS4gV2UgdXNlIGEgInN0YW5kYXJkIiBzaXplIHRv IGRldGVybWluZSB0aGUgcHJvcGVyIGZyYW1lLgotICAgIGRvdWJsZSBzY2FsZSA9IGFsbG93U2Nh bGluZyA/IHN0ZDo6bWluKHN0ZDo6bWF4KFdLV2ViVmlld1N0YW5kYXJkRm9udFNpemUgLyBmb250 U2l6ZSwgbWluaW11bVNjYWxlKSwgbWF4aW11bVNjYWxlKSA6IGNvbnRlbnRab29tU2NhbGUoc2Vs Zik7Ci0gICAgQ0dGbG9hdCBkb2N1bWVudFdpZHRoID0gW19jb250ZW50VmlldyBib3VuZHNdLnNp emUud2lkdGg7Ci0gICAgc2NhbGUgPSBDR1JvdW5kKGRvY3VtZW50V2lkdGggKiBzY2FsZSkgLyBk b2N1bWVudFdpZHRoOworICAgIGNvbnN0IGRvdWJsZSBtaW5pbXVtSGVpZ2h0VG9TaG93Q29udGVu dEFib3ZlS2V5Ym9hcmQgPSAxMDY7CisgICAgY29uc3QgQ0ZUaW1lSW50ZXJ2YWwgZm9ybUNvbnRy b2xab29tQW5pbWF0aW9uRHVyYXRpb24gPSAwLjI1OworICAgIGNvbnN0IGRvdWJsZSBjYXJldE9m ZnNldEZyb21XaW5kb3dFZGdlID0gMjA7CiAKICAgICBVSVdpbmRvdyAqd2luZG93ID0gW19zY3Jv bGxWaWV3IHdpbmRvd107CiAKLSAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZm9jdXNlZEVsZW1lbnRS ZWN0SW5OZXdTY2FsZSA9IGZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29yZGluYXRlczsK LSAgICBmb2N1c2VkRWxlbWVudFJlY3RJbk5ld1NjYWxlLnNjYWxlKHNjYWxlKTsKLSAgICBmb2N1 c2VkRWxlbWVudFJlY3RJbk5ld1NjYWxlLm1vdmVCeShbX2NvbnRlbnRWaWV3IGZyYW1lXS5vcmln aW4pOwotCiAgICAgLy8gRmluZCB0aGUgcG9ydGlvbiBvZiB0aGUgdmlldyB0aGF0IGlzIHZpc2li bGUgb24gdGhlIHNjcmVlbi4KICAgICBVSVZpZXdDb250cm9sbGVyICp0b3BWaWV3Q29udHJvbGxl ciA9IFtbW19zY3JvbGxWaWV3IF92aWV3Q29udHJvbGxlckZvckFuY2VzdG9yXSBfcm9vdEFuY2Vz dG9yVmlld0NvbnRyb2xsZXJdIF92aWV3Q29udHJvbGxlckZvclN1cHBvcnRlZEludGVyZmFjZU9y aWVudGF0aW9uc107CiAgICAgVUlWaWV3ICpmdWxsU2NyZWVuVmlldyA9IHRvcFZpZXdDb250cm9s bGVyLnZpZXc7CkBAIC0yMTUzLDcgKzIxNDMsNyBAQCAtICh2b2lkKV96b29tVG9Gb2N1c1JlY3Q6 KFdlYkNvcmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50Q29vcmRpbgog ICAgICAgICBDR0Zsb2F0IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQgPSBDR1JlY3RH ZXRNaW5ZKGludGVyc2VjdGlvbkJldHdlZW5TY3JvbGxWaWV3QW5kRm9ybUFzc2lzdGFudCkgLSBD R1JlY3RHZXRNaW5ZKHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29vcmRpbmF0ZXMp OwogICAgICAgICBDR0Zsb2F0IGhlaWdodFZpc2libGVCZWxvd0Zvcm1Bc3Npc3RhbnQgPSBDR1Jl Y3RHZXRNYXhZKHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29vcmRpbmF0ZXMpIC0g Q0dSZWN0R2V0TWF4WShpbnRlcnNlY3Rpb25CZXR3ZWVuU2Nyb2xsVmlld0FuZEZvcm1Bc3Npc3Rh bnQpOwogCi0gICAgICAgIGlmIChoZWlnaHRWaXNpYmxlQWJvdmVGb3JtQXNzaXN0YW50ID49IGtN aW5pbXVtSGVpZ2h0VG9TaG93Q29udGVudEFib3ZlS2V5Ym9hcmQgfHwgaGVpZ2h0VmlzaWJsZUJl bG93Rm9ybUFzc2lzdGFudCA8IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQpCisgICAg ICAgIGlmIChoZWlnaHRWaXNpYmxlQWJvdmVGb3JtQXNzaXN0YW50ID49IG1pbmltdW1IZWlnaHRU b1Nob3dDb250ZW50QWJvdmVLZXlib2FyZCB8fCBoZWlnaHRWaXNpYmxlQmVsb3dGb3JtQXNzaXN0 YW50IDwgaGVpZ2h0VmlzaWJsZUFib3ZlRm9ybUFzc2lzdGFudCkKICAgICAgICAgICAgIHZpc2li bGVTaXplLmhlaWdodCA9IGhlaWdodFZpc2libGVBYm92ZUZvcm1Bc3Npc3RhbnQ7CiAgICAgICAg IGVsc2UgewogICAgICAgICAgICAgdmlzaWJsZVNpemUuaGVpZ2h0ID0gaGVpZ2h0VmlzaWJsZUJl bG93Rm9ybUFzc2lzdGFudDsKQEAgLTIxNjEsNiArMjE1MSwzNSBAQCAtICh2b2lkKV96b29tVG9G b2N1c1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdClmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50 Q29vcmRpbgogICAgICAgICB9CiAgICAgfQogCisgICAgLy8gWm9vbSBhcm91bmQgdGhlIGVsZW1l bnQncyBib3VuZGluZyBmcmFtZS4gV2UgdXNlIGEgInN0YW5kYXJkIiBzaXplIHRvIGRldGVybWlu ZSB0aGUgcHJvcGVyIGZyYW1lLgorICAgIGRvdWJsZSBjdXJyZW50U2NhbGUgPSBjb250ZW50Wm9v bVNjYWxlKHNlbGYpOworICAgIGRvdWJsZSBzY2FsZSA9IGN1cnJlbnRTY2FsZTsKKyAgICBpZiAo YWxsb3dTY2FsaW5nKSB7CisjaWYgRU5BQkxFKEVYVFJBX1pPT01fTU9ERSkKKyAgICAgICAgY29u c3QgZG91YmxlIG1pbmltdW1MZWdpYmxlRm9udFNpemUgPSAxMTsKKyAgICAgICAgY29uc3QgQ0dG bG9hdCBtaW5pbXVtTWFyZ2luRm9yWm9vbWluZ1RvRW50aXJlRm9jdXNSZWN0SW5XZWJWaWV3Q29v cmRpbmF0ZXMgPSAxMDsKKyAgICAgICAgY29uc3QgQ0dGbG9hdCBtYXhpbXVtTWFyZ2luRm9yWm9v bWluZ1RvRW50aXJlRm9jdXNSZWN0SW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSAzNTsKKworICAgICAg ICBDR1JlY3QgbWluaW11bVRhcmdldFJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMgPSBVSVJlY3RJ bnNldEVkZ2VzKGZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29yZGluYXRlcywgVUlSZWN0 RWRnZUFsbCwgLW1pbmltdW1NYXJnaW5Gb3Jab29taW5nVG9FbnRpcmVGb2N1c1JlY3RJbldlYlZp ZXdDb29yZGluYXRlcyAvIGN1cnJlbnRTY2FsZSk7CisgICAgICAgIENHUmVjdCBtYXhpbXVtVGFy Z2V0UmVjdEluRG9jdW1lbnRDb29yZGluYXRlcyA9IFVJUmVjdEluc2V0RWRnZXMoZm9jdXNlZEVs ZW1lbnRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzLCBVSVJlY3RFZGdlQWxsLCAtbWF4aW11bU1h cmdpbkZvclpvb21pbmdUb0VudGlyZUZvY3VzUmVjdEluV2ViVmlld0Nvb3JkaW5hdGVzIC8gY3Vy cmVudFNjYWxlKTsKKworICAgICAgICBkb3VibGUgY2xhbXBlZE1heGltdW1UYXJnZXRTY2FsZSA9 IGNsYW1wVG88ZG91YmxlPihzdGQ6Om1pbih2aXNpYmxlU2l6ZS53aWR0aCAvIENHUmVjdEdldFdp ZHRoKG1pbmltdW1UYXJnZXRSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzKSwgdmlzaWJsZVNpemUu aGVpZ2h0IC8gQ0dSZWN0R2V0SGVpZ2h0KG1pbmltdW1UYXJnZXRSZWN0SW5Eb2N1bWVudENvb3Jk aW5hdGVzKSksIG1pbmltdW1TY2FsZSwgbWF4aW11bVNjYWxlKTsKKyAgICAgICAgZG91YmxlIGNs YW1wZWRNaW5pbXVtVGFyZ2V0U2NhbGUgPSBjbGFtcFRvPGRvdWJsZT4oc3RkOjptaW4odmlzaWJs ZVNpemUud2lkdGggLyBDR1JlY3RHZXRXaWR0aChtYXhpbXVtVGFyZ2V0UmVjdEluRG9jdW1lbnRD b29yZGluYXRlcyksIHZpc2libGVTaXplLmhlaWdodCAvIENHUmVjdEdldEhlaWdodChtYXhpbXVt VGFyZ2V0UmVjdEluRG9jdW1lbnRDb29yZGluYXRlcykpLCBtaW5pbXVtU2NhbGUsIG1heGltdW1T Y2FsZSk7CisgICAgICAgIGRvdWJsZSB0YXJnZXRTY2FsZUlnbm9yaW5nRm9udFNpemVDb25zdHJh aW50cyA9IGNsYW1wVG88ZG91YmxlPihjdXJyZW50U2NhbGUsIGNsYW1wZWRNaW5pbXVtVGFyZ2V0 U2NhbGUsIGNsYW1wZWRNYXhpbXVtVGFyZ2V0U2NhbGUpOworICAgICAgICBzY2FsZSA9IHN0ZDo6 bWF4PGRvdWJsZT4obWluaW11bUxlZ2libGVGb250U2l6ZSAvIGZvbnRTaXplLCB0YXJnZXRTY2Fs ZUlnbm9yaW5nRm9udFNpemVDb25zdHJhaW50cyk7CisjZWxzZQorICAgICAgICBjb25zdCBkb3Vi bGUgd2ViVmlld1N0YW5kYXJkRm9udFNpemUgPSAxNjsKKyAgICAgICAgc2NhbGUgPSBjbGFtcFRv PGRvdWJsZT4od2ViVmlld1N0YW5kYXJkRm9udFNpemUgLyBmb250U2l6ZSwgbWluaW11bVNjYWxl LCBtYXhpbXVtU2NhbGUpOworI2VuZGlmCisgICAgfQorCisgICAgQ0dGbG9hdCBkb2N1bWVudFdp ZHRoID0gW19jb250ZW50VmlldyBib3VuZHNdLnNpemUud2lkdGg7CisgICAgc2NhbGUgPSBDR1Jv dW5kKGRvY3VtZW50V2lkdGggKiBzY2FsZSkgLyBkb2N1bWVudFdpZHRoOworCisgICAgV2ViQ29y ZTo6RmxvYXRSZWN0IGZvY3VzZWRFbGVtZW50UmVjdEluTmV3U2NhbGUgPSBmb2N1c2VkRWxlbWVu dFJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXM7CisgICAgZm9jdXNlZEVsZW1lbnRSZWN0SW5OZXdT Y2FsZS5zY2FsZShzY2FsZSk7CisgICAgZm9jdXNlZEVsZW1lbnRSZWN0SW5OZXdTY2FsZS5tb3Zl QnkoW19jb250ZW50VmlldyBmcmFtZV0ub3JpZ2luKTsKKwogICAgIEJPT0wgc2VsZWN0aW9uUmVj dElzTm90TnVsbCA9ICFzZWxlY3Rpb25SZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzLmlzWmVybygp OwogICAgIGlmICghZm9yY2VTY3JvbGwpIHsKICAgICAgICAgQ0dSZWN0IGN1cnJlbnRseVZpc2li bGVSZWdpb25JbldlYlZpZXdDb29yZGluYXRlczsKQEAgLTIxOTMsOCArMjIxMiw4IEBAIC0gKHZv aWQpX3pvb21Ub0ZvY3VzUmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KWZvY3VzZWRFbGVtZW50UmVj dEluRG9jdW1lbnRDb29yZGluCiAgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBzZWxlY3Rpb25S ZWN0SW5OZXdTY2FsZSA9IHNlbGVjdGlvblJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXM7CiAgICAg ICAgIHNlbGVjdGlvblJlY3RJbk5ld1NjYWxlLnNjYWxlKHNjYWxlKTsKICAgICAgICAgc2VsZWN0 aW9uUmVjdEluTmV3U2NhbGUubW92ZUJ5KFtfY29udGVudFZpZXcgZnJhbWVdLm9yaWdpbik7Ci0g ICAgICAgIG1pbmltdW1BbGxvd2FibGVIb3Jpem9udGFsT2Zmc2V0SW5XZWJWaWV3Q29vcmRpbmF0 ZXMgPSBDR1JlY3RHZXRNYXhYKHNlbGVjdGlvblJlY3RJbk5ld1NjYWxlKSArIENhcmV0T2Zmc2V0 RnJvbVdpbmRvd0VkZ2UgLSB2aXNpYmxlU2l6ZS53aWR0aDsKLSAgICAgICAgbWluaW11bUFsbG93 YWJsZVZlcnRpY2FsT2Zmc2V0SW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSBDR1JlY3RHZXRNYXhZKHNl bGVjdGlvblJlY3RJbk5ld1NjYWxlKSArIENhcmV0T2Zmc2V0RnJvbVdpbmRvd0VkZ2UgLSB2aXNp YmxlU2l6ZS5oZWlnaHQgLSB2aXNpYmxlT2Zmc2V0RnJvbVRvcDsKKyAgICAgICAgbWluaW11bUFs bG93YWJsZUhvcml6b250YWxPZmZzZXRJbldlYlZpZXdDb29yZGluYXRlcyA9IENHUmVjdEdldE1h eFgoc2VsZWN0aW9uUmVjdEluTmV3U2NhbGUpICsgY2FyZXRPZmZzZXRGcm9tV2luZG93RWRnZSAt IHZpc2libGVTaXplLndpZHRoOworICAgICAgICBtaW5pbXVtQWxsb3dhYmxlVmVydGljYWxPZmZz ZXRJbldlYlZpZXdDb29yZGluYXRlcyA9IENHUmVjdEdldE1heFkoc2VsZWN0aW9uUmVjdEluTmV3 U2NhbGUpICsgY2FyZXRPZmZzZXRGcm9tV2luZG93RWRnZSAtIHZpc2libGVTaXplLmhlaWdodCAt IHZpc2libGVPZmZzZXRGcm9tVG9wOwogICAgIH0KIAogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBk b2N1bWVudEJvdW5kc0luTmV3U2NhbGUgPSBbX2NvbnRlbnRWaWV3IGJvdW5kc107CkBAIC0yMjI1 LDE3ICsyMjQ0LDE0IEBAIC0gKHZvaWQpX3pvb21Ub0ZvY3VzUmVjdDooV2ViQ29yZTo6RmxvYXRS ZWN0KWZvY3VzZWRFbGVtZW50UmVjdEluRG9jdW1lbnRDb29yZGluCiAKICAgICBXZWJDb3JlOjpG bG9hdFBvaW50IG5ld0NlbnRlciA9IENHUG9pbnRNYWtlKHRvcExlZnQueCArIHVub2JzY3VyZWRT Y3JvbGxWaWV3UmVjdEluV2ViVmlld0Nvb3JkaW5hdGVzLnNpemUud2lkdGggLyAyLjAsIHRvcExl ZnQueSArIHVub2JzY3VyZWRTY3JvbGxWaWV3UmVjdEluV2ViVmlld0Nvb3JkaW5hdGVzLnNpemUu aGVpZ2h0IC8gMi4wKTsKIAotICAgIGlmIChzY2FsZSAhPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYp KQorICAgIGlmIChzY2FsZSAhPSBjdXJyZW50U2NhbGUpCiAgICAgICAgIF9wYWdlLT53aWxsU3Rh cnRVc2VyVHJpZ2dlcmVkWm9vbWluZygpOwogCiAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVS ZWN0cywgc3RyZWFtIDw8ICJfem9vbVRvRm9jdXNSZWN0OiB6b29taW5nIHRvICIgPDwgbmV3Q2Vu dGVyIDw8ICIgc2NhbGU6IiA8PCBzY2FsZSk7CiAKICAgICAvLyBUaGUgbmV3Q2VudGVyIGhhcyBi ZWVuIGNvbXB1dGVkIGluIHRoZSBuZXcgc2NhbGUsIGJ1dCBfem9vbVRvQ2VudGVyIGV4cGVjdGVk IHRoZSBjZW50ZXIgdG8gYmUgaW4gdGhlIG9yaWdpbmFsIHNjYWxlLgogICAgIG5ld0NlbnRlci5z Y2FsZSgxIC8gc2NhbGUpOwotICAgIFtfc2Nyb2xsVmlldyBfem9vbVRvQ2VudGVyOm5ld0NlbnRl cgotICAgICAgICAgICAgICAgICAgICAgICAgc2NhbGU6c2NhbGUKLSAgICAgICAgICAgICAgICAg ICAgIGR1cmF0aW9uOlVJV2ViRm9ybUFuaW1hdGlvbkR1cmF0aW9uCi0gICAgICAgICAgICAgICAg ICAgICAgICBmb3JjZTpZRVNdOworICAgIFtfc2Nyb2xsVmlldyBfem9vbVRvQ2VudGVyOm5ld0Nl bnRlciBzY2FsZTpzY2FsZSBkdXJhdGlvbjpmb3JtQ29udHJvbFpvb21BbmltYXRpb25EdXJhdGlv biBmb3JjZTpZRVNdOwogfQogCiAtIChDR0Zsb2F0KV90YXJnZXRDb250ZW50Wm9vbVNjYWxlRm9y UmVjdDooY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jil0YXJnZXRSZWN0IGN1cnJlbnRTY2FsZToo ZG91YmxlKWN1cnJlbnRTY2FsZSBmaXRFbnRpcmVSZWN0OihCT09MKWZpdEVudGlyZVJlY3QgbWlu aW11bVNjYWxlOihkb3VibGUpbWluaW11bVNjYWxlIG1heGltdW1TY2FsZTooZG91YmxlKW1heGlt dW1TY2FsZQo=