122299 2013-10-03 14:05:03 -0700 [mac][wk2] ScrollPinningBehaviors, SpacebarScrolling, and ScrollByLineCommands fail after r156793 2013-10-04 11:38:21 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton ap bdakin simon.fraser oldest_to_newest 935964 0 thorton 2013-10-03 14:05:03 -0700 http://trac.webkit.org/changeset/156793 means that threaded scrolling is enabled by default for the WebKit2 API tests. This happened to break three tests. I’ve fixed the two relatively straightforward tests by using our synchronously-wait-for-the-scrolling-thread-to-tell-the-main-thread-the-new-position code that happens to be a part of the force repaint logic (unfortunately). I’ve fixed one other where that wasn’t working correctly by disabling threaded scrolling for that test. 935973 1 213295 thorton 2013-10-03 14:16:15 -0700 Created attachment 213295 patch 936019 2 thorton 2013-10-03 16:11:03 -0700 http://trac.webkit.org/changeset/156864 936263 3 thorton 2013-10-04 11:22:27 -0700 This is still happening flakily; I’ll just turn off threaded scrolling for all three tests. 936265 4 213379 thorton 2013-10-04 11:24:35 -0700 Created attachment 213379 new patch, turn off threaded scrolling everywhere 936282 5 thorton 2013-10-04 11:38:21 -0700 http://trac.webkit.org/changeset/156898 213295 2013-10-03 14:16:15 -0700 2013-10-04 11:24:35 -0700 patch apitest.diff text/plain 6067 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNzFj NTlkLi5kMGQ0YjNmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMTAtMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY11bd2syXSBTY3JvbGxQaW5uaW5nQmVo YXZpb3JzLCBTcGFjZWJhclNjcm9sbGluZywgYW5kIFNjcm9sbEJ5TGluZUNvbW1hbmRzIGZhaWwg YWZ0ZXIgcjE1Njc5MworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTIyMjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvU2Nyb2xsUGlubmluZ0JlaGF2aW9y cy5jcHA6CisgICAgICAgIERpc2FibGUgdGhyZWFkZWQgc2Nyb2xsaW5nLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1NwYWNlYmFyU2Nyb2xsaW5nLmNwcDoKKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvbWFjL0VkaXRvckNvbW1hbmRzLm1tOgor ICAgICAgICBTeW5jaHJvbm91c2x5IHdhaXQgZm9yIHRoZSBzY3JvbGxpbmcgdGhyZWFkIHRvIGlu Zm9ybSB0aGUgbWFpbiB0aHJlYWQgb2YgdGhlIG5ldyBzY3JvbGwgcG9zaXRpb24uCisKIDIwMTMt MTAtMDMgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OIChyMTU2ODExKTogT2JqZWN0aXZlLUMgSmF2YVNjcmlwdENvcmUgQVBJIHRlc3QgZmFpbGlu ZyBvbiBNb3VudGFpbiBMaW9uIGJvdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mi9TY3JvbGxQaW5uaW5nQmVoYXZpb3JzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mi9TY3JvbGxQaW5uaW5nQmVoYXZpb3JzLmNwcAppbmRleCA2OTVl OTEyLi41YWQxNDgzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDIvU2Nyb2xsUGlubmluZ0JlaGF2aW9ycy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyL1Njcm9sbFBpbm5pbmdCZWhhdmlvcnMuY3BwCkBAIC0zMSw2ICszMSw3IEBA CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNDb250ZXh0UmVmLmg+CiAjaW5jbHVkZSA8V2Vi S2l0Mi9XS0NvbnRleHRQcml2YXRlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1BhZ2VQcml2YXRl Lmg+CisjaW5jbHVkZSA8V2ViS2l0Mi9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oPgogI2luY2x1ZGUg PFdlYktpdDIvV0tTZXJpYWxpemVkU2NyaXB0VmFsdWUuaD4KIAogbmFtZXNwYWNlIFRlc3RXZWJL aXRBUEkgewpAQCAtNjgsNyArNjksMTUgQEAgc3RhdGljIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRM b2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHkKIFRFU1Qo V2ViS2l0MiwgU2Nyb2xsUGlubmluZ0JlaGF2aW9ycykKIHsKICAgICBXS1JldGFpblB0cjxXS0Nv bnRleHRSZWY+IGNvbnRleHQoQWRvcHRXSywgV0tDb250ZXh0Q3JlYXRlKCkpOwotICAgIFBsYXRm b3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCkpOworCisgICAgLy8gVHVybiBvZmYgdGhy ZWFkZWQgc2Nyb2xsaW5nOyBzeW5jaHJvbm91c2x5IHdhaXRpbmcgZm9yIHRoZSBtYWluIHRocmVh ZCBzY3JvbGwgcG9zaXRpb24gdG8KKyAgICAvLyB1cGRhdGUgdXNpbmcgV0tQYWdlRm9yY2VSZXBh aW50IHdvdWxkIGJlIGJldHRlciwgYnV0IGZvciBzb21lIHJlYXNvbiBkb2Vzbid0IGJsb2NrIHVu dGlsCisgICAgLy8gaXQncyB1cGRhdGVkIGFmdGVyIHRoZSBpbml0aWFsIFdLUGFnZVNldFNjcm9s bFBpbm5pbmdCZWhhdmlvciBhYm92ZS4KKyAgICBXS1JldGFpblB0cjxXS1BhZ2VHcm91cFJlZj4g cGFnZUdyb3VwKEFkb3B0V0ssIFdLUGFnZUdyb3VwQ3JlYXRlV2l0aElkZW50aWZpZXIoVXRpbDo6 dG9XSygiTm9UaHJlYWRlZFNjcm9sbGluZ1BhZ2VHcm91cCIpLmdldCgpKSk7CisgICAgV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyA9IFdLUGFnZUdyb3VwR2V0UHJlZmVyZW5jZXMocGFnZUdy b3VwLmdldCgpKTsKKyAgICBXS1ByZWZlcmVuY2VzU2V0VGhyZWFkZWRTY3JvbGxpbmdFbmFibGVk KHByZWZlcmVuY2VzLCBmYWxzZSk7CisKKyAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhjb250 ZXh0LmdldCgpLCBwYWdlR3JvdXAuZ2V0KCkpOwogCiAgICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxv YWRlckNsaWVudDsKICAgICBtZW1zZXQoJmxvYWRlckNsaWVudCwgMCwgc2l6ZW9mKGxvYWRlckNs aWVudCkpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1Nw YWNlYmFyU2Nyb2xsaW5nLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9T cGFjZWJhclNjcm9sbGluZy5jcHAKaW5kZXggZDZhNzg3MC4uYzExNzEzMiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1NwYWNlYmFyU2Nyb2xsaW5nLmNwcAor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvU3BhY2ViYXJTY3JvbGxpbmcu Y3BwCkBAIC0zMyw2ICszMyw3IEBAIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIAogc3RhdGlj IGJvb2wgZGlkRmluaXNoTG9hZDsKIHN0YXRpYyBib29sIGRpZE5vdEhhbmRsZUtleURvd25FdmVu dDsKK3N0YXRpYyBib29sIGRpZEZpbmlzaEZvcmNlUmVwYWludDsKIAogc3RhdGljIHZvaWQgZGlk RmluaXNoTG9hZEZvckZyYW1lKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tUeXBlUmVmLCBjb25z dCB2b2lkKikKIHsKQEAgLTQ1LDYgKzQ2LDIwIEBAIHN0YXRpYyB2b2lkIGRpZE5vdEhhbmRsZUtl eUV2ZW50Q2FsbGJhY2soV0tQYWdlUmVmLCBXS05hdGl2ZUV2ZW50UHRyIGV2ZW50LCBjb25zCiAg ICAgICAgIGRpZE5vdEhhbmRsZUtleURvd25FdmVudCA9IHRydWU7CiB9CiAKK3N0YXRpYyB2b2lk IGZvcmNlUmVwYWludERvbmVDYWxsYmFjayhXS0Vycm9yUmVmLCB2b2lkKikKK3sKKyAgICBkaWRG aW5pc2hGb3JjZVJlcGFpbnQgPSB0cnVlOworfQorCitzdGF0aWMgdm9pZCB3YWl0Rm9yU2Nyb2xs UG9zaXRpb25VcGRhdGUoV0tQYWdlUmVmIHBhZ2UpCit7CisgICAgLy8gRm9yY2luZyBhIHJlcGFp bnQgYWxzbyBlbnN1cmVzIHRoYXQgdGhlIG1haW4gdGhyZWFkJ3Mgbm90aW9uIG9mIHRoZSBzY3Jv bGwgcG9zaXRpb24KKyAgICAvLyBpcyB1cCB0byBkYXRlLCB3aGVuIHVzaW5nIHRocmVhZGVkIHNj cm9sbGluZy4KKyAgICBkaWRGaW5pc2hGb3JjZVJlcGFpbnQgPSBmYWxzZTsKKyAgICBXS1BhZ2VG b3JjZVJlcGFpbnQocGFnZSwgbnVsbHB0ciwgZm9yY2VSZXBhaW50RG9uZUNhbGxiYWNrKTsKKyAg ICBVdGlsOjpydW4oJmRpZEZpbmlzaEZvcmNlUmVwYWludCk7Cit9CisKIFRFU1QoV2ViS2l0Miwg U3BhY2ViYXJTY3JvbGxpbmcpCiB7CiAgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250 ZXh0KEFkb3B0V0ssIFV0aWw6OmNyZWF0ZUNvbnRleHRXaXRoSW5qZWN0ZWRCdW5kbGUoKSk7CkBA IC03MSw2ICs4Niw3IEBAIFRFU1QoV2ViS2l0MiwgU3BhY2ViYXJTY3JvbGxpbmcpCiAgICAgRVhQ RUNUX0pTX0ZBTFNFKHdlYlZpZXcucGFnZSgpLCAidGV4dEZpZWxkQ29udGFpbnNTcGFjZSgpIik7 CiAKICAgICB3ZWJWaWV3LnNpbXVsYXRlU3BhY2ViYXJLZXlQcmVzcygpOworICAgIHdhaXRGb3JT Y3JvbGxQb3NpdGlvblVwZGF0ZSh3ZWJWaWV3LnBhZ2UoKSk7CiAKICAgICBFWFBFQ1RfSlNfRkFM U0Uod2ViVmlldy5wYWdlKCksICJpc0RvY3VtZW50U2Nyb2xsZWQoKSIpOwogICAgIEVYUEVDVF9K U19UUlVFKHdlYlZpZXcucGFnZSgpLCAidGV4dEZpZWxkQ29udGFpbnNTcGFjZSgpIik7CkBAIC04 OCw2ICsxMDQsNyBAQCBURVNUKFdlYktpdDIsIFNwYWNlYmFyU2Nyb2xsaW5nKQogCiAgICAgZGlk Tm90SGFuZGxlS2V5RG93bkV2ZW50ID0gZmFsc2U7CiAgICAgd2ViVmlldy5zaW11bGF0ZVNwYWNl YmFyS2V5UHJlc3MoKTsKKyAgICB3YWl0Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUod2ViVmlldy5w YWdlKCkpOwogCiAgICAgLy8gVGhpcyBFWFBFQ1RfSlNfVFJVRSB0ZXN0IGZhaWxzIG9uIFdpbmRv d3MgcG9ydAogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NDk2MQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL21hYy9F ZGl0b3JDb21tYW5kcy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9tYWMv RWRpdG9yQ29tbWFuZHMubW0KaW5kZXggNTgzZGM3YS4uZjNiY2NhNyAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL21hYy9FZGl0b3JDb21tYW5kcy5tbQorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvbWFjL0VkaXRvckNvbW1hbmRzLm1t CkBAIC0yOCwxNiArMjgsMzIgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVV0aWxpdGllcy5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgogI2luY2x1ZGUgPFdlYktpdDIvV0tSZXRhaW5QdHIu aD4KKyNpbmNsdWRlIDxXZWJLaXQyL1dLUGFnZS5oPgogCiBuYW1lc3BhY2UgVGVzdFdlYktpdEFQ SSB7CiAKIHN0YXRpYyBib29sIGRpZEZpbmlzaExvYWQ7CitzdGF0aWMgYm9vbCBkaWRGaW5pc2hG b3JjZVJlcGFpbnQ7CiAKIHN0YXRpYyB2b2lkIGRpZEZpbmlzaExvYWRGb3JGcmFtZShXS1BhZ2VS ZWYsIFdLRnJhbWVSZWYsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCopCiB7CiAgICAgZGlkRmluaXNo TG9hZCA9IHRydWU7CiB9CiAKK3N0YXRpYyB2b2lkIGZvcmNlUmVwYWludERvbmVDYWxsYmFjayhX S0Vycm9yUmVmLCB2b2lkKikKK3sKKyAgICBkaWRGaW5pc2hGb3JjZVJlcGFpbnQgPSB0cnVlOwor fQorCitzdGF0aWMgdm9pZCB3YWl0Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUoV0tQYWdlUmVmIHBh Z2UpCit7CisgICAgLy8gRm9yY2luZyBhIHJlcGFpbnQgYWxzbyBlbnN1cmVzIHRoYXQgdGhlIG1h aW4gdGhyZWFkJ3Mgbm90aW9uIG9mIHRoZSBzY3JvbGwgcG9zaXRpb24KKyAgICAvLyBpcyB1cCB0 byBkYXRlLCB3aGVuIHVzaW5nIHRocmVhZGVkIHNjcm9sbGluZy4KKyAgICBkaWRGaW5pc2hGb3Jj ZVJlcGFpbnQgPSBmYWxzZTsKKyAgICBXS1BhZ2VGb3JjZVJlcGFpbnQocGFnZSwgbnVsbHB0ciwg Zm9yY2VSZXBhaW50RG9uZUNhbGxiYWNrKTsKKyAgICBVdGlsOjpydW4oJmRpZEZpbmlzaEZvcmNl UmVwYWludCk7Cit9CisKIFRFU1QoV2ViS2l0MiwgU2Nyb2xsQnlMaW5lQ29tbWFuZHMpCiB7CiAg ICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFV0aWw6OmNyZWF0 ZUNvbnRleHRXaXRoSW5qZWN0ZWRCdW5kbGUoKSk7CkBAIC01OCwxMSArNzQsMTUgQEAgVEVTVChX ZWJLaXQyLCBTY3JvbGxCeUxpbmVDb21tYW5kcykKICAgICBBU1NFUlRfVFJVRShbd2ViVmlldy5w bGF0Zm9ybVZpZXcoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNjcm9sbExpbmVEb3du OildKTsKICAgICBbd2ViVmlldy5wbGF0Zm9ybVZpZXcoKSBzY3JvbGxMaW5lRG93bjpuaWxdOwog CisgICAgd2FpdEZvclNjcm9sbFBvc2l0aW9uVXBkYXRlKHdlYlZpZXcucGFnZSgpKTsKKwogICAg IEVYUEVDVF9KU19FUSh3ZWJWaWV3LnBhZ2UoKSwgIndpbmRvdy5zY3JvbGxZIiwgIjQwIik7CiAK ICAgICBBU1NFUlRfVFJVRShbd2ViVmlldy5wbGF0Zm9ybVZpZXcoKSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHNjcm9sbExpbmVVcDopXSk7CiAgICAgW3dlYlZpZXcucGxhdGZvcm1WaWV3 KCkgc2Nyb2xsTGluZVVwOm5pbF07CiAKKyAgICB3YWl0Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUo d2ViVmlldy5wYWdlKCkpOworCiAgICAgRVhQRUNUX0pTX0VRKHdlYlZpZXcucGFnZSgpLCAid2lu ZG93LnNjcm9sbFkiLCAiMCIpOwogfQogCg== 213379 2013-10-04 11:24:35 -0700 2013-10-04 11:26:50 -0700 new patch, turn off threaded scrolling everywhere apitest2.diff text/plain 6124 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlYzVi YTRhLi43NjQ2ZGY2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMTAtMDQgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY11bd2syXSBTY3JvbGxQaW5uaW5nQmVo YXZpb3JzLCBTcGFjZWJhclNjcm9sbGluZywgYW5kIFNjcm9sbEJ5TGluZUNvbW1hbmRzIGZhaWwg YWZ0ZXIgcjE1Njc5MworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTIyMjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvU3BhY2ViYXJTY3JvbGxpbmcuY3Bw OgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9tYWMvRWRpdG9yQ29tbWFu ZHMubW06CisgICAgICAgIFRoZSBsYXN0IGZpeCBkaWRuJ3Qgd29yazsgaW5zdGVhZCBvZiB0cnlp bmcgdG8gYmxvY2ssIHR1cm4gb2ZmIHRocmVhZGVkIHNjcm9sbGluZyBmb3IgYWxsIHRocmVlIHRl c3RzLgorCiAyMDEzLTEwLTAzICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkIG15c2VsZiB0byBzb21lIHdhdGNobGlzdHMu CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvU3BhY2ViYXJT Y3JvbGxpbmcuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1NwYWNlYmFy U2Nyb2xsaW5nLmNwcAppbmRleCBjMTE3MTMyLi5mNTUwNjNjIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvU3BhY2ViYXJTY3JvbGxpbmcuY3BwCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9TcGFjZWJhclNjcm9sbGluZy5jcHAKQEAg LTI4LDEyICsyOCwxMiBAQAogI2luY2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW5jbHVk ZSAiUGxhdGZvcm1XZWJWaWV3LmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1JldGFpblB0ci5oPgor I2luY2x1ZGUgPFdlYktpdDIvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaD4KIAogbmFtZXNwYWNlIFRl c3RXZWJLaXRBUEkgewogCiBzdGF0aWMgYm9vbCBkaWRGaW5pc2hMb2FkOwogc3RhdGljIGJvb2wg ZGlkTm90SGFuZGxlS2V5RG93bkV2ZW50Owotc3RhdGljIGJvb2wgZGlkRmluaXNoRm9yY2VSZXBh aW50OwogCiBzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0Zy YW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKQogewpAQCAtNDYsMjggKzQ2LDIxIEBAIHN0 YXRpYyB2b2lkIGRpZE5vdEhhbmRsZUtleUV2ZW50Q2FsbGJhY2soV0tQYWdlUmVmLCBXS05hdGl2 ZUV2ZW50UHRyIGV2ZW50LCBjb25zCiAgICAgICAgIGRpZE5vdEhhbmRsZUtleURvd25FdmVudCA9 IHRydWU7CiB9CiAKLXN0YXRpYyB2b2lkIGZvcmNlUmVwYWludERvbmVDYWxsYmFjayhXS0Vycm9y UmVmLCB2b2lkKikKLXsKLSAgICBkaWRGaW5pc2hGb3JjZVJlcGFpbnQgPSB0cnVlOwotfQotCi1z dGF0aWMgdm9pZCB3YWl0Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUoV0tQYWdlUmVmIHBhZ2UpCi17 Ci0gICAgLy8gRm9yY2luZyBhIHJlcGFpbnQgYWxzbyBlbnN1cmVzIHRoYXQgdGhlIG1haW4gdGhy ZWFkJ3Mgbm90aW9uIG9mIHRoZSBzY3JvbGwgcG9zaXRpb24KLSAgICAvLyBpcyB1cCB0byBkYXRl LCB3aGVuIHVzaW5nIHRocmVhZGVkIHNjcm9sbGluZy4KLSAgICBkaWRGaW5pc2hGb3JjZVJlcGFp bnQgPSBmYWxzZTsKLSAgICBXS1BhZ2VGb3JjZVJlcGFpbnQocGFnZSwgbnVsbHB0ciwgZm9yY2VS ZXBhaW50RG9uZUNhbGxiYWNrKTsKLSAgICBVdGlsOjpydW4oJmRpZEZpbmlzaEZvcmNlUmVwYWlu dCk7Ci19Ci0KIFRFU1QoV2ViS2l0MiwgU3BhY2ViYXJTY3JvbGxpbmcpCiB7CiAgICAgV0tSZXRh aW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFV0aWw6OmNyZWF0ZUNvbnRleHRX aXRoSW5qZWN0ZWRCdW5kbGUoKSk7Ci0gICAgUGxhdGZvcm1XZWJWaWV3IHdlYlZpZXcoY29udGV4 dC5nZXQoKSk7CisKKyAgICAvLyBUdXJuIG9mZiB0aHJlYWRlZCBzY3JvbGxpbmc7IHN5bmNocm9u b3VzbHkgd2FpdGluZyBmb3IgdGhlIG1haW4gdGhyZWFkIHNjcm9sbCBwb3NpdGlvbiB0bworICAg IC8vIHVwZGF0ZSB1c2luZyBXS1BhZ2VGb3JjZVJlcGFpbnQgd291bGQgYmUgYmV0dGVyLCBidXQg Zm9yIHNvbWUgcmVhc29uIHRoZSB0ZXN0IHN0aWxsIGZhaWxzIG9jY2FzaW9uYWxseS4KKyAgICBX S1JldGFpblB0cjxXS1BhZ2VHcm91cFJlZj4gcGFnZUdyb3VwKEFkb3B0V0ssIFdLUGFnZUdyb3Vw Q3JlYXRlV2l0aElkZW50aWZpZXIoVXRpbDo6dG9XSygiTm9UaHJlYWRlZFNjcm9sbGluZ1BhZ2VH cm91cCIpLmdldCgpKSk7CisgICAgV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyA9IFdLUGFn ZUdyb3VwR2V0UHJlZmVyZW5jZXMocGFnZUdyb3VwLmdldCgpKTsKKyAgICBXS1ByZWZlcmVuY2Vz U2V0VGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkKHByZWZlcmVuY2VzLCBmYWxzZSk7CisKKyAgICBQ bGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhjb250ZXh0LmdldCgpLCBwYWdlR3JvdXAuZ2V0KCkpOwog CiAgICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRlckNsaWVudDsKICAgICBtZW1zZXQoJmxvYWRl ckNsaWVudCwgMCwgc2l6ZW9mKGxvYWRlckNsaWVudCkpOwotICAgIAorCiAgICAgbG9hZGVyQ2xp ZW50LnZlcnNpb24gPSAwOwogICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUg PSBkaWRGaW5pc2hMb2FkRm9yRnJhbWU7CiAgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudCh3 ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVudCk7CkBAIC04Niw3ICs3OSw2IEBAIFRFU1QoV2Vi S2l0MiwgU3BhY2ViYXJTY3JvbGxpbmcpCiAgICAgRVhQRUNUX0pTX0ZBTFNFKHdlYlZpZXcucGFn ZSgpLCAidGV4dEZpZWxkQ29udGFpbnNTcGFjZSgpIik7CiAKICAgICB3ZWJWaWV3LnNpbXVsYXRl U3BhY2ViYXJLZXlQcmVzcygpOwotICAgIHdhaXRGb3JTY3JvbGxQb3NpdGlvblVwZGF0ZSh3ZWJW aWV3LnBhZ2UoKSk7CiAKICAgICBFWFBFQ1RfSlNfRkFMU0Uod2ViVmlldy5wYWdlKCksICJpc0Rv Y3VtZW50U2Nyb2xsZWQoKSIpOwogICAgIEVYUEVDVF9KU19UUlVFKHdlYlZpZXcucGFnZSgpLCAi dGV4dEZpZWxkQ29udGFpbnNTcGFjZSgpIik7CkBAIC0xMDQsNyArOTYsNiBAQCBURVNUKFdlYktp dDIsIFNwYWNlYmFyU2Nyb2xsaW5nKQogCiAgICAgZGlkTm90SGFuZGxlS2V5RG93bkV2ZW50ID0g ZmFsc2U7CiAgICAgd2ViVmlldy5zaW11bGF0ZVNwYWNlYmFyS2V5UHJlc3MoKTsKLSAgICB3YWl0 Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUod2ViVmlldy5wYWdlKCkpOwogCiAgICAgLy8gVGhpcyBF WFBFQ1RfSlNfVFJVRSB0ZXN0IGZhaWxzIG9uIFdpbmRvd3MgcG9ydAogICAgIC8vIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDk2MQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL21hYy9FZGl0b3JDb21tYW5kcy5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9tYWMvRWRpdG9yQ29tbWFuZHMubW0KaW5kZXgg ZjNiY2NhNy4uMWUwNzkzMyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyL21hYy9FZGl0b3JDb21tYW5kcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDIvbWFjL0VkaXRvckNvbW1hbmRzLm1tCkBAIC0yOSwzNSArMjksMjggQEAKICNp bmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKICNpbmNsdWRlIDxXZWJLaXQyL1dLUmV0YWluUHRy Lmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1BhZ2UuaD4KKyNpbmNsdWRlIDxXZWJLaXQyL1dLUHJl ZmVyZW5jZXNQcml2YXRlLmg+CiAKIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIAogc3RhdGlj IGJvb2wgZGlkRmluaXNoTG9hZDsKLXN0YXRpYyBib29sIGRpZEZpbmlzaEZvcmNlUmVwYWludDsK IAogc3RhdGljIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKFdLUGFnZVJlZiwgV0tGcmFtZVJl ZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKikKIHsKICAgICBkaWRGaW5pc2hMb2FkID0gdHJ1ZTsK IH0KIAotc3RhdGljIHZvaWQgZm9yY2VSZXBhaW50RG9uZUNhbGxiYWNrKFdLRXJyb3JSZWYsIHZv aWQqKQotewotICAgIGRpZEZpbmlzaEZvcmNlUmVwYWludCA9IHRydWU7Ci19Ci0KLXN0YXRpYyB2 b2lkIHdhaXRGb3JTY3JvbGxQb3NpdGlvblVwZGF0ZShXS1BhZ2VSZWYgcGFnZSkKLXsKLSAgICAv LyBGb3JjaW5nIGEgcmVwYWludCBhbHNvIGVuc3VyZXMgdGhhdCB0aGUgbWFpbiB0aHJlYWQncyBu b3Rpb24gb2YgdGhlIHNjcm9sbCBwb3NpdGlvbgotICAgIC8vIGlzIHVwIHRvIGRhdGUsIHdoZW4g dXNpbmcgdGhyZWFkZWQgc2Nyb2xsaW5nLgotICAgIGRpZEZpbmlzaEZvcmNlUmVwYWludCA9IGZh bHNlOwotICAgIFdLUGFnZUZvcmNlUmVwYWludChwYWdlLCBudWxscHRyLCBmb3JjZVJlcGFpbnRE b25lQ2FsbGJhY2spOwotICAgIFV0aWw6OnJ1bigmZGlkRmluaXNoRm9yY2VSZXBhaW50KTsKLX0K LQogVEVTVChXZWJLaXQyLCBTY3JvbGxCeUxpbmVDb21tYW5kcykKIHsKICAgICBXS1JldGFpblB0 cjxXS0NvbnRleHRSZWY+IGNvbnRleHQoQWRvcHRXSywgVXRpbDo6Y3JlYXRlQ29udGV4dFdpdGhJ bmplY3RlZEJ1bmRsZSgpKTsKLSAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhjb250ZXh0Lmdl dCgpKTsKKworICAgIC8vIFR1cm4gb2ZmIHRocmVhZGVkIHNjcm9sbGluZzsgc3luY2hyb25vdXNs eSB3YWl0aW5nIGZvciB0aGUgbWFpbiB0aHJlYWQgc2Nyb2xsIHBvc2l0aW9uIHRvCisgICAgLy8g dXBkYXRlIHVzaW5nIFdLUGFnZUZvcmNlUmVwYWludCB3b3VsZCBiZSBiZXR0ZXIsIGJ1dCBmb3Ig c29tZSByZWFzb24gdGhlIHRlc3Qgc3RpbGwgZmFpbHMgb2NjYXNpb25hbGx5LgorICAgIFdLUmV0 YWluUHRyPFdLUGFnZUdyb3VwUmVmPiBwYWdlR3JvdXAoQWRvcHRXSywgV0tQYWdlR3JvdXBDcmVh dGVXaXRoSWRlbnRpZmllcihVdGlsOjp0b1dLKCJOb1RocmVhZGVkU2Nyb2xsaW5nUGFnZUdyb3Vw IikuZ2V0KCkpKTsKKyAgICBXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzID0gV0tQYWdlR3Jv dXBHZXRQcmVmZXJlbmNlcyhwYWdlR3JvdXAuZ2V0KCkpOworICAgIFdLUHJlZmVyZW5jZXNTZXRU aHJlYWRlZFNjcm9sbGluZ0VuYWJsZWQocHJlZmVyZW5jZXMsIGZhbHNlKTsKKworICAgIFBsYXRm b3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCksIHBhZ2VHcm91cC5nZXQoKSk7CiAKICAg ICBXS1BhZ2VMb2FkZXJDbGllbnQgbG9hZGVyQ2xpZW50OwogICAgIG1lbXNldCgmbG9hZGVyQ2xp ZW50LCAwLCBzaXplb2YobG9hZGVyQ2xpZW50KSk7CkBAIC03NCwxNSArNjcsMTEgQEAgVEVTVChX ZWJLaXQyLCBTY3JvbGxCeUxpbmVDb21tYW5kcykKICAgICBBU1NFUlRfVFJVRShbd2ViVmlldy5w bGF0Zm9ybVZpZXcoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNjcm9sbExpbmVEb3du OildKTsKICAgICBbd2ViVmlldy5wbGF0Zm9ybVZpZXcoKSBzY3JvbGxMaW5lRG93bjpuaWxdOwog Ci0gICAgd2FpdEZvclNjcm9sbFBvc2l0aW9uVXBkYXRlKHdlYlZpZXcucGFnZSgpKTsKLQogICAg IEVYUEVDVF9KU19FUSh3ZWJWaWV3LnBhZ2UoKSwgIndpbmRvdy5zY3JvbGxZIiwgIjQwIik7CiAK ICAgICBBU1NFUlRfVFJVRShbd2ViVmlldy5wbGF0Zm9ybVZpZXcoKSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHNjcm9sbExpbmVVcDopXSk7CiAgICAgW3dlYlZpZXcucGxhdGZvcm1WaWV3 KCkgc2Nyb2xsTGluZVVwOm5pbF07CiAKLSAgICB3YWl0Rm9yU2Nyb2xsUG9zaXRpb25VcGRhdGUo d2ViVmlldy5wYWdlKCkpOwotCiAgICAgRVhQRUNUX0pTX0VRKHdlYlZpZXcucGFnZSgpLCAid2lu ZG93LnNjcm9sbFkiLCAiMCIpOwogfQogCg==