211056 2020-04-26 16:06:42 -0700 Text interaction tests should ensure view is not scroll instead of looking for a zoom change 2020-04-27 08:45:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210939 InRadar P2 Normal --- 1 dbates dbates dino webkit-bug-importer oldest_to_newest 1645847 0 dbates 2020-04-26 16:06:42 -0700 Currently the text interaction tests in RequestTextInputContext.mm look for a zoom scale change as an indirect way to know whether or not the web view zoomed to reveal the focused element. However the way the tests do so by changing the zoom scale without ensuring the editable element is still semi-occluded is racy. It works out so long as the call to focus the editable element (aka -focusTextInputContext) is processed by the web process BEFORE it receives a visible content rect update (as a result of the zoomScale change). Instead write these tests to check if the scroll view actually scrolled or not. 1645848 1 397632 dbates 2020-04-26 16:23:58 -0700 Created attachment 397632 Patch 1646017 2 397632 dbates 2020-04-27 08:44:29 -0700 Comment on attachment 397632 Patch Clearing flags on attachment: 397632 Committed r260756: <https://trac.webkit.org/changeset/260756> 1646018 3 dbates 2020-04-27 08:44:31 -0700 All reviewed patches have been landed. Closing bug. 1646019 4 webkit-bug-importer 2020-04-27 08:45:18 -0700 <rdar://problem/62453615> 397632 2020-04-26 16:23:58 -0700 2020-04-27 08:44:29 -0700 Patch bug-211056-20200426162358.patch text/plain 14860 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODAyM2Q3ODI1YTI3YzU0NjAwZmQzNGY1Y2Y2MGQwZmNl YWIyODNmMi4uZWQzMDQ3NDkxNjUzZjJmYjZkNDQ1NWQ0OTNiMjUzYTY1YjE1YmE3OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTA0LTI2ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBUZXh0IGludGVyYWN0aW9uIHRlc3RzIHNob3VsZCBlbnN1cmUgdmlldyBpcyBub3Qgc2Ny b2xsIGluc3RlYWQgb2YgbG9va2luZyBmb3IgYSB6b29tIGNoYW5nZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMDU2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIHRoZSB0ZXh0IGludGVyYWN0aW9u IHN1Yi10ZXN0cywgb3ZlcnJpZGUgdGhlIHNjcm9sbCB2aWV3J3MgZGVsZWdhdGUgc28gYXMgdG8g dHJhY2sKKyAgICAgICAgd2hldGhlciBhIHNjcm9sbCBvY2N1cnJlZCBvciBub3QgaW5zdGVhZCBv ZiBsb29raW5nIGF0IHRoZSB6b29tIHNjYWxlLiBBcyB0aGUgdGVzdHMgYXJlCisgICAgICAgIHdy aXR0ZW4gbG9va2luZyBhdCB0aGUgem9vbSBzY2FsZSBpcyByYWN5LiBJdCBpcyBzaW1wbGVyIGFu ZCBkZXRlcm1pbmlzdGljIHRvIGRldGVjdAorICAgICAgICB3aGV0aGVyIHRoZSBzY3JvbGwgdmll dyBzY3JvbGxlZC4KKworICAgICAgICBUaGUgcHVycG9zZSBvZiB0aGUgdGV4dCBpbnRlcmFjdGlv biBzdWItdGVzdHMgYXJlIHRvIGVuc3VyZSB0aGF0IHpvb21pbmcgdG8gcmV2ZWFsCisgICAgICAg IHRoZSBmb2N1c2VkIGVsZW1lbnQgaXMgc3VwcHJlc3NlZCB1bnRpbCB0aGUgaW50ZXJhY3Rpb24g Y29tcGxldGVzIHdpdGggYSBjYWxsIHRvCisgICAgICAgIC1fZGlkRmluaXNoVGV4dEludGVyYWN0 aW9uSW5UZXh0SW5wdXRDb250ZXh0LiBJIGFkZGVkIHNvbWUgbW9yZSBhc3NlcnRpb25zIHRvIGVu c3VyZSB0aGlzLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9S ZXF1ZXN0VGV4dElucHV0Q29udGV4dC5tbToKKyAgICAgICAgKC1bVGV4dEludGVyYWN0aW9uU2Ny b2xsRGVsZWdhdGUgc2Nyb2xsVmlld0RpZFNjcm9sbDpdKToKKyAgICAgICAgKFRlc3RXZWJLaXRB UEk6OlRFU1QpOgorCiAyMDIwLTA0LTIyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBJbXBsZW1lbnQgVUlLaXQgU1BJIF9pc0hvcml6b250YWxXcml0 aW5nTW9kZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9SZXF1ZXN0VGV4dElucHV0Q29udGV4dC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUmVxdWVzdFRleHRJbnB1dENvbnRleHQubW0KaW5kZXggZmYxOWU2YmNmYjUx OWY1M2U5MmRmZjdiMWU0ZDQ2ZTU0MWQ4NTU0OC4uNzJiODhlMWRmMzdjNTAxMDg4MzY2NWNmZjll NWI0ZTcxMTc2OTkzNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9SZXF1ZXN0VGV4dElucHV0Q29udGV4dC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1JlcXVlc3RUZXh0SW5wdXRDb250ZXh0Lm1tCkBAIC02Myw2 ICs2MywyMyBAQCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCiAKK3N0 YXRpYyBib29sIGRpZFNjcm9sbDsKKworQGludGVyZmFjZSBUZXh0SW50ZXJhY3Rpb25TY3JvbGxE ZWxlZ2F0ZSA6IE5TT2JqZWN0IDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4KK0BlbmQKKworLy8gSWRl YWxseSB0aGlzIHdvdWxkIGVuc3VyZSB0aGF0IHRoZSBmb2N1c2VkIGVsZW1lbnQgaXMgYWN0dWFs bHkgaW4gdmlldy4KKy8vIEZvciB0aGUgcHVycG9zZXMgb2YgdGhlIHRlc3RzIGluIHRoaXMgZmls ZSBpdCBpcyBlbm91Z2ggdG8ga25vdyB3aGV0aGVyCisvLyBhIHNjcm9sbCBvY2N1cnJlZC4KK0Bp bXBsZW1lbnRhdGlvbiBUZXh0SW50ZXJhY3Rpb25TY3JvbGxEZWxlZ2F0ZQorCistICh2b2lkKXNj cm9sbFZpZXdEaWRTY3JvbGw6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKK3sKKyAgICBkaWRT Y3JvbGwgPSB0cnVlOworfQorCitAZW5kCisKIEBpbXBsZW1lbnRhdGlvbiBUZXN0V0tXZWJWaWV3 IChTeW5jaHJvbm91c1RleHRJbnB1dENvbnRleHQpCiAKIC0gKE5TQXJyYXk8X1dLVGV4dElucHV0 Q29udGV4dCAqPiAqKXN5bmNocm9ub3VzbHlSZXF1ZXN0VGV4dElucHV0Q29udGV4dHNJblJlY3Q6 KENHUmVjdClyZWN0CkBAIC01NTEsNyArNTY4LDcgQEAgVEVTVChSZXF1ZXN0VGV4dElucHV0Q29u dGV4dCwgRm9jdXNpbmdBc3Npc3RlZEVsZW1lbnRTaG91bGROb3RTY3JvbGxQYWdlKQogICAgIEVY UEVDVF9FUSgyMDAwLCBbW3dlYlZpZXcgb2JqZWN0QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndp bmRvdy5zY3JvbGxZIl0gaW50VmFsdWVdKTsKIH0KIAotVEVTVChSZXF1ZXN0VGV4dElucHV0Q29u dGV4dCwgVGV4dEludGVyYWN0aW9uX0ZvY3VzaW5nUmVhZE9ubHlFbGVtZW50Q2hhbmdlc1pvb21T Y2FsZSkKK1RFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1 c2luZ1JlYWRPbmx5RWxlbWVudFNob3VsZFNjcm9sbFRvUmV2ZWFsKQogewogICAgIElQaG9uZVVz ZXJJbnRlcmZhY2VTd2l6emxlciB1c2VySW50ZXJmYWNlU3dpenpsZXI7CiAKQEAgLTU2NSwxNSAr NTgyLDIwIEBAIFRFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9G b2N1c2luZ1JlYWRPbmx5RWxlbWVudENoYW5nZXNab29tCiAKICAgICBFWFBFQ1RfV0tfU1RSRVEo IkJPRFkiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQu YWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwogICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGlu Z0phdmFTY3JpcHQ6QCJpbnB1dC5yZWFkT25seSA9IHRydWUiXTsKLSAgICBbd2ViVmlldyBzY3Jv bGxWaWV3XS56b29tU2NhbGUgPSAyOwogCi0gICAgLy8gRm9jdXMgdGhlIGZpZWxkIHVzaW5nIC1m b2N1c1RleHRJbnB1dENvbnRleHQ7IHpvb20gc2NhbGUgb2Ygc2Nyb2xsIHZpZXcgc2hvdWxkIGNo YW5nZSB0byByZXZlYWwgdGhlIGZvY3VzZWQgZWxlbWVudC4KKyAgICBkaWRTY3JvbGwgPSBmYWxz ZTsKKyAgICBhdXRvIHNjcm9sbERlbGVnYXRlID0gYWRvcHROUyhbW1RleHRJbnRlcmFjdGlvblNj cm9sbERlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2Nyb2xsVmlld10uZGVs ZWdhdGUgPSBzY3JvbGxEZWxlZ2F0ZS5nZXQoKTsKKworICAgIC8vIEZvY3VzIHRoZSBmaWVsZCB1 c2luZyAtZm9jdXNUZXh0SW5wdXRDb250ZXh0OyBzY3JvbGwgdmlldyBzaG91bGQgc2Nyb2xsIHRv IHJldmVhbCB0aGUgZm9jdXNlZCBlbGVtZW50LgogICAgIHsKICAgICAgICAgVGV4dEludGVyYWN0 aW9uRm9yU2NvcGUgc2NvcGUgeyB3ZWJWaWV3LCBpbnB1dEVsZW1lbnQgfTsKICAgICAgICAgRVhQ RUNUX05VTEwoW3dlYlZpZXcgc3luY2hyb25vdXNseUZvY3VzVGV4dElucHV0Q29udGV4dDppbnB1 dEVsZW1lbnQuZ2V0KCkgcGxhY2VDYXJldEF0OltpbnB1dEVsZW1lbnQgYm91bmRpbmdSZWN0XS5v cmlnaW5dKTsKKyAgICAgICAgRVhQRUNUX0ZBTFNFKGRpZFNjcm9sbCk7CiAgICAgfQorCiAgICAg RVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFT Y3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05hbWUiXSk7Ci0gICAgRVhQRUNUX0xU KFt3ZWJWaWV3IHNjcm9sbFZpZXddLnpvb21TY2FsZSwgMik7CisgICAgRVhQRUNUX1RSVUUoZGlk U2Nyb2xsKTsKIH0KIAogVEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVyYWN0 aW9uX0ZvY3VzRWxlbWVudEluRGV0YWNoZWREb2N1bWVudCkKQEAgLTU5MCw3ICs2MTIsMTAgQEAg VEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVyYWN0aW9uX0ZvY3VzRWxlbWVu dEluRGV0YWNoZWREb2N1bWVudCkKICAgICBSZXRhaW5QdHI8X1dLVGV4dElucHV0Q29udGV4dD4g aW5wdXRFbGVtZW50ID0gY29udGV4dHNbMF07CiAKICAgICBFWFBFQ1RfV0tfU1RSRVEoIkJPRFki LCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlT ZWxlY3RvcignaWZyYW1lJykuY29udGVudERvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJd KTsKLSAgICBbd2ViVmlldyBzY3JvbGxWaWV3XS56b29tU2NhbGUgPSAyOworCisgICAgZGlkU2Ny b2xsID0gZmFsc2U7CisgICAgYXV0byBzY3JvbGxEZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXh0SW50 ZXJhY3Rpb25TY3JvbGxEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNjcm9s bFZpZXddLmRlbGVnYXRlID0gc2Nyb2xsRGVsZWdhdGUuZ2V0KCk7CiAKICAgICAvLyBTYXZlIGEg cmVmZXJlbmNlIHRvIHRoZSBmcmFtZWQgZG9jdW1lbnQgKHRvIHByZXZlbnQgaXRzIGRlc3RydWN0 aW9uIHdoZW4gaXRzIGZyYW1lIGlzIHJlbW92ZWQpCiAgICAgLy8gYW5kIHJlbW92ZSB0aGUgZnJh bWUuCkBAIC01OTksMTEgKzYyNCwxMiBAQCBURVNUKFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0LCBU ZXh0SW50ZXJhY3Rpb25fRm9jdXNFbGVtZW50SW5EZXRhY2hlZERvY3VtZW50KQogICAgICAgICBU ZXh0SW50ZXJhY3Rpb25Gb3JTY29wZSBzY29wZSB7IHdlYlZpZXcsIGlucHV0RWxlbWVudCB9Owog ICAgICAgICBFWFBFQ1RfTlVMTChbd2ViVmlldyBzeW5jaHJvbm91c2x5Rm9jdXNUZXh0SW5wdXRD b250ZXh0OmlucHV0RWxlbWVudC5nZXQoKSBwbGFjZUNhcmV0QXQ6W2lucHV0RWxlbWVudCBib3Vu ZGluZ1JlY3RdLm9yaWdpbl0pOwogICAgIH0KKwogICAgIEVYUEVDVF9XS19TVFJFUSgiQk9EWSIs IFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnX2ZyYW1lZERvY3VtZW50 LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKLSAgICBFWFBFQ1RfRVEoMiwgW3dlYlZpZXcgc2Ny b2xsVmlld10uem9vbVNjYWxlKTsKKyAgICBFWFBFQ1RfRkFMU0UoZGlkU2Nyb2xsKTsKIH0KIAot VEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVyYWN0aW9uX0ZvY3VzaW5nRWxl bWVudENoYW5nZXNab29tU2NhbGUpCitURVNUKFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0LCBUZXh0 SW50ZXJhY3Rpb25fRm9jdXNpbmdFbGVtZW50U2hvdWxkU2Nyb2xsVG9SZXZlYWwpCiB7CiAgICAg SVBob25lVXNlckludGVyZmFjZVN3aXp6bGVyIHVzZXJJbnRlcmZhY2VTd2l6emxlcjsKIApAQCAt NjE2LDE4ICs2NDIsMjMgQEAgVEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVy YWN0aW9uX0ZvY3VzaW5nRWxlbWVudENoYW5nZXNab29tU2NhbGUpCiAgICAgUmV0YWluUHRyPF9X S1RleHRJbnB1dENvbnRleHQ+IGlucHV0RWxlbWVudCA9IGNvbnRleHRzWzBdOwogCiAgICAgRVhQ RUNUX1dLX1NUUkVRKCJCT0RZIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKLSAgICBbd2ViVmlldyBzY3Jv bGxWaWV3XS56b29tU2NhbGUgPSAyOwogCi0gICAgLy8gWm9vbSBzY2FsZSBvZiBzY3JvbGwgdmll dyBzaG91bGQgY2hhbmdlIHRvIHJldmVhbCB0aGUgZm9jdXNlZCBlbGVtZW50LgorICAgIGRpZFNj cm9sbCA9IGZhbHNlOworICAgIGF1dG8gc2Nyb2xsRGVsZWdhdGUgPSBhZG9wdE5TKFtbVGV4dElu dGVyYWN0aW9uU2Nyb2xsRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzY3Jv bGxWaWV3XS5kZWxlZ2F0ZSA9IHNjcm9sbERlbGVnYXRlLmdldCgpOworCisgICAgLy8gU2Nyb2xs IHZpZXcgc2hvdWxkIHNjcm9sbCB0byByZXZlYWwgdGhlIGZvY3VzZWQgZWxlbWVudC4KICAgICB7 CiAgICAgICAgIFRleHRJbnRlcmFjdGlvbkZvclNjb3BlIHNjb3BlIHsgd2ViVmlldywgaW5wdXRF bGVtZW50IH07CiAgICAgICAgIEVYUEVDVF9FUSgoVUlSZXNwb25kZXI8VUlUZXh0SW5wdXQ+ICop W3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddLCBbd2ViVmlldyBzeW5jaHJvbm91c2x5Rm9j dXNUZXh0SW5wdXRDb250ZXh0OmlucHV0RWxlbWVudC5nZXQoKSBwbGFjZUNhcmV0QXQ6W2lucHV0 RWxlbWVudCBib3VuZGluZ1JlY3RdLm9yaWdpbl0pOworICAgICAgICBFWFBFQ1RfRkFMU0UoZGlk U2Nyb2xsKTsKICAgICB9CisKICAgICBFWFBFQ1RfV0tfU1RSRVEoIklOUFVUIiwgW3dlYlZpZXcg c3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFn TmFtZSJdKTsKLSAgICBFWFBFQ1RfTFQoW3dlYlZpZXcgc2Nyb2xsVmlld10uem9vbVNjYWxlLCAy KTsKKyAgICBFWFBFQ1RfVFJVRShkaWRTY3JvbGwpOwogfQogCi1URVNUKFJlcXVlc3RUZXh0SW5w dXRDb250ZXh0LCBUZXh0SW50ZXJhY3Rpb25fRm9jdXNpbmdFbGVtZW50TXVsdGlwbGVUaW1lc0No YW5nZXNab29tU2NhbGUpCitURVNUKFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0LCBUZXh0SW50ZXJh Y3Rpb25fRm9jdXNpbmdFbGVtZW50TXVsdGlwbGVUaW1lc1Nob3VsZFNjcm9sbFRvUmV2ZWFsKQog ewogICAgIElQaG9uZVVzZXJJbnRlcmZhY2VTd2l6emxlciB1c2VySW50ZXJmYWNlU3dpenpsZXI7 CiAKQEAgLTY0MCwyMCArNjcxLDI1IEBAIFRFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRl eHRJbnRlcmFjdGlvbl9Gb2N1c2luZ0VsZW1lbnRNdWx0aXBsZVRpbWVzQ2hhbmdlCiAgICAgUmV0 YWluUHRyPF9XS1RleHRJbnB1dENvbnRleHQ+IGlucHV0RWxlbWVudCA9IGNvbnRleHRzWzBdOwog CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJCT0RZIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5n SmF2YVNjcmlwdDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKLSAgICBbd2Vi VmlldyBzY3JvbGxWaWV3XS56b29tU2NhbGUgPSAyOwogCi0gICAgLy8gWm9vbSBzY2FsZSBvZiBz Y3JvbGwgdmlldyBzaG91bGQgY2hhbmdlIHRvIHJldmVhbCB0aGUgZm9jdXNlZCBlbGVtZW50Lgor ICAgIGRpZFNjcm9sbCA9IGZhbHNlOworICAgIGF1dG8gc2Nyb2xsRGVsZWdhdGUgPSBhZG9wdE5T KFtbVGV4dEludGVyYWN0aW9uU2Nyb2xsRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi VmlldyBzY3JvbGxWaWV3XS5kZWxlZ2F0ZSA9IHNjcm9sbERlbGVnYXRlLmdldCgpOworCisgICAg Ly8gU2Nyb2xsIHZpZXcgc2hvdWxkIHNjcm9sbCB0byByZXZlYWwgdGhlIGZvY3VzZWQgZWxlbWVu dC4KICAgICB7CiAgICAgICAgIFRleHRJbnRlcmFjdGlvbkZvclNjb3BlIHNjb3BlIHsgd2ViVmll dywgaW5wdXRFbGVtZW50IH07CiAgICAgICAgIEVYUEVDVF9FUSgoVUlSZXNwb25kZXI8VUlUZXh0 SW5wdXQ+ICopW3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddLCBbd2ViVmlldyBzeW5jaHJv bm91c2x5Rm9jdXNUZXh0SW5wdXRDb250ZXh0OmlucHV0RWxlbWVudC5nZXQoKSBwbGFjZUNhcmV0 QXQ6W2lucHV0RWxlbWVudCBib3VuZGluZ1JlY3RdLm9yaWdpbl0pOwogICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoIklOUFVUIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpA ImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKICAgICAgICAgRVhQRUNUX0VRKChV SVJlc3BvbmRlcjxVSVRleHRJbnB1dD4gKilbd2ViVmlldyB0ZXh0SW5wdXRDb250ZW50Vmlld10s IFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlGb2N1c1RleHRJbnB1dENvbnRleHQ6aW5wdXRFbGVtZW50 LmdldCgpIHBsYWNlQ2FyZXRBdDpbaW5wdXRFbGVtZW50IGJvdW5kaW5nUmVjdF0ub3JpZ2luXSk7 CisgICAgICAgIEVYUEVDVF9GQUxTRShkaWRTY3JvbGwpOwogICAgIH0KKwogICAgIEVYUEVDVF9X S19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAi ZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwotICAgIEVYUEVDVF9MVChbd2ViVmll dyBzY3JvbGxWaWV3XS56b29tU2NhbGUsIDIpOworICAgIEVYUEVDVF9UUlVFKGRpZFNjcm9sbCk7 CiB9CiAKLVRFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1 c0RlZm9jdXNEaXNhYmxlRm9jdXNBZ2FpblNob3VsZE5vdENoYW5nZVpvb21TY2FsZSkKK1RFU1Qo UmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1c0RlZm9jdXNEaXNh YmxlRm9jdXNBZ2FpblNob3VsZE5vdFNjcm9sbFRvUmV2ZWFsKQogewogICAgIElQaG9uZVVzZXJJ bnRlcmZhY2VTd2l6emxlciB1c2VySW50ZXJmYWNlU3dpenpsZXI7CiAKQEAgLTY2Niw3ICs3MDIs MTAgQEAgVEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVyYWN0aW9uX0ZvY3Vz RGVmb2N1c0Rpc2FibGVGb2N1c0FnYWluU2hvdWwKICAgICBSZXRhaW5QdHI8X1dLVGV4dElucHV0 Q29udGV4dD4gaW5wdXRFbGVtZW50ID0gY29udGV4dHNbMF07CiAKICAgICBFWFBFQ1RfV0tfU1RS RVEoIkJPRFkiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1l bnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwotICAgIFt3ZWJWaWV3IHNjcm9sbFZpZXddLnpv b21TY2FsZSA9IDI7CisKKyAgICBkaWRTY3JvbGwgPSBmYWxzZTsKKyAgICBhdXRvIHNjcm9sbERl bGVnYXRlID0gYWRvcHROUyhbW1RleHRJbnRlcmFjdGlvblNjcm9sbERlbGVnYXRlIGFsbG9jXSBp bml0XSk7CisgICAgW3dlYlZpZXcgc2Nyb2xsVmlld10uZGVsZWdhdGUgPSBzY3JvbGxEZWxlZ2F0 ZS5nZXQoKTsKIAogICAgIHsKICAgICAgICAgVGV4dEludGVyYWN0aW9uRm9yU2NvcGUgc2NvcGUg eyB3ZWJWaWV3LCBpbnB1dEVsZW1lbnQgfTsKQEAgLTY4MSwxNCArNzIwLDE1IEBAIFRFU1QoUmVx dWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1c0RlZm9jdXNEaXNhYmxl Rm9jdXNBZ2FpblNob3VsCiAgICAgICAgIC8vIDMuIERpc2FibGUKICAgICAgICAgW3dlYlZpZXcg c3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImlucHV0LmRpc2FibGVkID0gdHJ1ZSJdOwog Ci0gICAgICAgIC8vIDQuIEZvY3VzIGFnYWluOyBmb2N1c2VkIGVsZW1lbnQgYW5kIHpvb20gc2Nh bGUgb2Ygc2Nyb2xsIHZpZXcgc2hvdWxkIGJlIHVuY2hhbmdlZC4KKyAgICAgICAgLy8gNC4gRm9j dXMgYWdhaW47IGZvY3VzZWQgZWxlbWVudCBzaG91bGQgYmUgdW5jaGFuZ2VkIGFuZCBzY3JvbGwg dmlldyBzaG91bGQgbm90IHNjcm9sbC4KICAgICAgICAgRVhQRUNUX05VTEwoW3dlYlZpZXcgc3lu Y2hyb25vdXNseUZvY3VzVGV4dElucHV0Q29udGV4dDppbnB1dEVsZW1lbnQuZ2V0KCkgcGxhY2VD YXJldEF0OltpbnB1dEVsZW1lbnQgYm91bmRpbmdSZWN0XS5vcmlnaW5dKTsKICAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKCJCT0RZIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKICAgICB9Ci0gICAgRVhQRUNU X0VRKDIsIFt3ZWJWaWV3IHNjcm9sbFZpZXddLnpvb21TY2FsZSk7CisKKyAgICBFWFBFQ1RfRkFM U0UoZGlkU2Nyb2xsKTsKIH0KIAotVEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dElu dGVyYWN0aW9uX0ZvY3VzRGVmb2N1c0ZvY3VzQWdhaW5TaG91bGRDaGFuZ2Vab29tU2NhbGUpCitU RVNUKFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0LCBUZXh0SW50ZXJhY3Rpb25fRm9jdXNEZWZvY3Vz Rm9jdXNBZ2FpblNob3VsZFNjcm9sbFRvUmV2ZWFsKQogewogICAgIElQaG9uZVVzZXJJbnRlcmZh Y2VTd2l6emxlciB1c2VySW50ZXJmYWNlU3dpenpsZXI7CiAKQEAgLTcwMSw3ICs3NDEsMTAgQEAg VEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dEludGVyYWN0aW9uX0ZvY3VzRGVmb2N1 c0ZvY3VzQWdhaW5TaG91bGRDaGFuZ2UKICAgICBSZXRhaW5QdHI8X1dLVGV4dElucHV0Q29udGV4 dD4gaW5wdXRFbGVtZW50ID0gY29udGV4dHNbMF07CiAKICAgICBFWFBFQ1RfV0tfU1RSRVEoIkJP RFkiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0 aXZlRWxlbWVudC50YWdOYW1lIl0pOwotICAgIFt3ZWJWaWV3IHNjcm9sbFZpZXddLnpvb21TY2Fs ZSA9IDI7CisKKyAgICBkaWRTY3JvbGwgPSBmYWxzZTsKKyAgICBhdXRvIHNjcm9sbERlbGVnYXRl ID0gYWRvcHROUyhbW1RleHRJbnRlcmFjdGlvblNjcm9sbERlbGVnYXRlIGFsbG9jXSBpbml0XSk7 CisgICAgW3dlYlZpZXcgc2Nyb2xsVmlld10uZGVsZWdhdGUgPSBzY3JvbGxEZWxlZ2F0ZS5nZXQo KTsKIAogICAgIHsKICAgICAgICAgVGV4dEludGVyYWN0aW9uRm9yU2NvcGUgc2NvcGUgeyB3ZWJW aWV3LCBpbnB1dEVsZW1lbnQgfTsKQEAgLTcxMywxNCArNzU2LDE2IEBAIFRFU1QoUmVxdWVzdFRl eHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1c0RlZm9jdXNGb2N1c0FnYWluU2hv dWxkQ2hhbmdlCiAgICAgICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6 QCJpbnB1dC5ibHVyKCkiXTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKCJCT0RZIiwgW3dlYlZp ZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQu dGFnTmFtZSJdKTsKIAotICAgICAgICAvLyAzLiBGb2N1cyBhZ2FpbjsgZm9jdXNlZCBlbGVtZW50 IGFuZCB6b29tIHNjYWxlIG9mIHNjcm9sbCB2aWV3IHNob3VsZCBjaGFuZ2UuCisgICAgICAgIC8v IDMuIEZvY3VzIGFnYWluOyBmb2N1c2VkIGVsZW1lbnQgc2hvdWxkIGNoYW5nZSBhbmQgc2Nyb2xs IHZpZXcgc2hvdWxkIHNjcm9sbCB0byByZXZlYWwgZm9jdXNlZCBlbGVtZW50LgogICAgICAgICBF WFBFQ1RfRVEoKFVJUmVzcG9uZGVyPFVJVGV4dElucHV0PiAqKVt3ZWJWaWV3IHRleHRJbnB1dENv bnRlbnRWaWV3XSwgW3dlYlZpZXcgc3luY2hyb25vdXNseUZvY3VzVGV4dElucHV0Q29udGV4dDpp bnB1dEVsZW1lbnQuZ2V0KCkgcGxhY2VDYXJldEF0OltpbnB1dEVsZW1lbnQgYm91bmRpbmdSZWN0 XS5vcmlnaW5dKTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05h bWUiXSk7CisgICAgICAgIEVYUEVDVF9GQUxTRShkaWRTY3JvbGwpOwogICAgIH0KLSAgICBFWFBF Q1RfTFQoW3dlYlZpZXcgc2Nyb2xsVmlld10uem9vbVNjYWxlLCAyKTsKKworICAgIEVYUEVDVF9U UlVFKGRpZFNjcm9sbCk7CiB9CiAKLVRFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJ bnRlcmFjdGlvbl9Gb2N1c2luZ0Fzc2lzdGVkRWxlbWVudFNob3VsZE5vdENoYW5nZVpvb21TY2Fs ZSkKK1RFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9Gb2N1c2lu Z0Fzc2lzdGVkRWxlbWVudFNob3VsZE5vdFNjcm9sbFRvUmV2ZWFsKQogewogICAgIElQaG9uZVVz ZXJJbnRlcmZhY2VTd2l6emxlciB1c2VySW50ZXJmYWNlU3dpenpsZXI7CiAKQEAgLTczNywxOCAr NzgyLDIyIEBAIFRFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlvbl9G b2N1c2luZ0Fzc2lzdGVkRWxlbWVudFNob3VsZE5vdENoCiAKICAgICBbd2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uVG9DaGFuZ2U6QCJpbnB1dC5mb2N1cygp Il07CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVh dGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05hbWUiXSk7Ci0gICAg W3dlYlZpZXcgc2Nyb2xsVmlld10uem9vbVNjYWxlID0gMjsKIAotICAgIC8vIEZvY3VzIHRoZSBm aWVsZCB1c2luZyAtZm9jdXNUZXh0SW5wdXRDb250ZXh0OyB6b29tIHNjYWxlIG9mIHNjcm9sbCB2 aWV3IHNob3VsZCBiZSB1bmNoYW5nZWQuCisgICAgZGlkU2Nyb2xsID0gZmFsc2U7CisgICAgYXV0 byBzY3JvbGxEZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXh0SW50ZXJhY3Rpb25TY3JvbGxEZWxlZ2F0 ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNjcm9sbFZpZXddLmRlbGVnYXRlID0gc2Ny b2xsRGVsZWdhdGUuZ2V0KCk7CisKKyAgICAvLyBGb2N1cyB0aGUgZmllbGQgdXNpbmcgLWZvY3Vz VGV4dElucHV0Q29udGV4dDsgc2Nyb2xsIHZpZXcgc2hvdWxkIG5vdCBzY3JvbGwgdG8gcmV2ZWFs IGZvY3VzZWQgZWxlbWVudC4KICAgICB7CiAgICAgICAgIFRleHRJbnRlcmFjdGlvbkZvclNjb3Bl IHNjb3BlIHsgd2ViVmlldywgaW5wdXRFbGVtZW50IH07CiAgICAgICAgIEVYUEVDVF9FUSgoVUlS ZXNwb25kZXI8VUlUZXh0SW5wdXQ+ICopW3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddLCBb d2ViVmlldyBzeW5jaHJvbm91c2x5Rm9jdXNUZXh0SW5wdXRDb250ZXh0OmlucHV0RWxlbWVudC5n ZXQoKSBwbGFjZUNhcmV0QXQ6W2lucHV0RWxlbWVudCBib3VuZGluZ1JlY3RdLm9yaWdpbl0pOwog ICAgIH0KKwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2 YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwot ICAgIEVYUEVDVF9FUSgyLCBbd2ViVmlldyBzY3JvbGxWaWV3XS56b29tU2NhbGUpOworICAgIEVY UEVDVF9GQUxTRShkaWRTY3JvbGwpOwogfQogCi1URVNUKFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0 LCBUZXh0SW50ZXJhY3Rpb25fRm9jdXNpbmdOb25Bc3Npc3RlZEZvY3VzZWRFbGVtZW50Q2hhbmdl c1pvb21TY2FsZSkKK1RFU1QoUmVxdWVzdFRleHRJbnB1dENvbnRleHQsIFRleHRJbnRlcmFjdGlv bl9Gb2N1c2luZ05vbkFzc2lzdGVkRm9jdXNlZEVsZW1lbnRTY3JvbGxzVG9SZXZlYWwpCiB7CiAg ICAgSVBob25lVXNlckludGVyZmFjZVN3aXp6bGVyIHVzZXJJbnRlcmZhY2VTd2l6emxlcjsKIApA QCAtNzY1LDE3ICs4MTQsMjIgQEAgVEVTVChSZXF1ZXN0VGV4dElucHV0Q29udGV4dCwgVGV4dElu dGVyYWN0aW9uX0ZvY3VzaW5nTm9uQXNzaXN0ZWRGb2N1c2VkRWxlbWVudEMKICAgICBbaW5wdXRE ZWxlZ2F0ZSBzZXRGb2N1c1N0YXJ0c0lucHV0U2Vzc2lvblBvbGljeUhhbmRsZXI6W10gKFdLV2Vi VmlldyAqLCBpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPikgeyByZXR1cm4gX1dLRm9jdXNTdGFy dHNJbnB1dFNlc3Npb25Qb2xpY3lEaXNhbGxvdzsgfV07CiAgICAgW3dlYlZpZXcgc3RyaW5nQnlF dmFsdWF0aW5nSmF2YVNjcmlwdDpAImlucHV0LmZvY3VzKCkiXTsgLy8gV2lsbCBub3Qgc3RhcnQg aW5wdXQgYXNzaXN0YW5jZQogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBz dHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdO YW1lIl0pOwotICAgIFt3ZWJWaWV3IHNjcm9sbFZpZXddLnpvb21TY2FsZSA9IDI7CiAKLSAgICAv LyBGb2N1cyB0aGUgZmllbGQgdXNpbmcgLWZvY3VzVGV4dElucHV0Q29udGV4dDsgem9vbSBzY2Fs ZSBvZiBzY3JvbGwgdmlldyBzaG91bGQgY2hhbmdlIHRvIHJldmVhbCB0aGUgZm9jdXNlZCBlbGVt ZW50LgorICAgIGRpZFNjcm9sbCA9IGZhbHNlOworICAgIGF1dG8gc2Nyb2xsRGVsZWdhdGUgPSBh ZG9wdE5TKFtbVGV4dEludGVyYWN0aW9uU2Nyb2xsRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAg ICBbd2ViVmlldyBzY3JvbGxWaWV3XS5kZWxlZ2F0ZSA9IHNjcm9sbERlbGVnYXRlLmdldCgpOwor CisgICAgLy8gRm9jdXMgdGhlIGZpZWxkIHVzaW5nIC1mb2N1c1RleHRJbnB1dENvbnRleHQ7IHNj cm9sbCB2aWV3IHNob3VsZCBzY3JvbGwgdG8gcmV2ZWFsIHRoZSBmb2N1c2VkIGVsZW1lbnQuCiAg ICAgW2lucHV0RGVsZWdhdGUgc2V0Rm9jdXNTdGFydHNJbnB1dFNlc3Npb25Qb2xpY3lIYW5kbGVy OltdIChXS1dlYlZpZXcgKiwgaWQgPF9XS0ZvY3VzZWRFbGVtZW50SW5mbz4pIHsgcmV0dXJuIF9X S0ZvY3VzU3RhcnRzSW5wdXRTZXNzaW9uUG9saWN5QWxsb3c7IH1dOwogICAgIHsKICAgICAgICAg VGV4dEludGVyYWN0aW9uRm9yU2NvcGUgc2NvcGUgeyB3ZWJWaWV3LCBpbnB1dEVsZW1lbnQgfTsK ICAgICAgICAgLy8gV2lsbCBzdGFydCBpbnB1dCBhc3Npc3RhbmNlCiAgICAgICAgIEVYUEVDVF9F USgoVUlSZXNwb25kZXI8VUlUZXh0SW5wdXQ+ICopW3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZp ZXddLCBbd2ViVmlldyBzeW5jaHJvbm91c2x5Rm9jdXNUZXh0SW5wdXRDb250ZXh0OmlucHV0RWxl bWVudC5nZXQoKSBwbGFjZUNhcmV0QXQ6W2lucHV0RWxlbWVudCBib3VuZGluZ1JlY3RdLm9yaWdp bl0pOworICAgICAgICBFWFBFQ1RfRkFMU0UoZGlkU2Nyb2xsKTsKICAgICB9CisKICAgICBFWFBF Q1RfV0tfU1RSRVEoIklOUFVUIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsKLSAgICBFWFBFQ1RfTFQoW3dl YlZpZXcgc2Nyb2xsVmlld10uem9vbVNjYWxlLCAyKTsKKyAgICBFWFBFQ1RfVFJVRShkaWRTY3Jv bGwpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==