134992 2014-07-16 15:59:16 -0700 REGRESSION (iOS WebKit2): Cannot scroll while dragging a selection 2014-07-16 17:01:03 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 1022853 0 enrica 2014-07-16 15:59:16 -0700 <rdar://problem/17528020> 1022857 1 235032 enrica 2014-07-16 16:05:31 -0700 Created attachment 235032 Patch 1022866 2 235032 benjamin 2014-07-16 16:39:44 -0700 Comment on attachment 235032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235032&action=review rs=me > Source/WebKit2/ChangeLog:14 > + This patch exposes the scroller and the visible content rect so that > + UIKit can implement autoscroll when dragging the selections. > + It also changes that way we do hit testing to allow hit test outside > + the clipping region and fixes the way we compute the selection rectangle > + for the block selection, ensuring that we consider also non text elements > + like images. I think this would have been better as 3 patches. > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:352 > +- (UIScrollView *)scroller Shouldn't we just override UIKit's _scroller method? > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:357 > +- (CGRect)visibleRect I would prefer keeping the name unobscuredRect. Having [WKContentView visibleRect] returning the unobscuredRect seems very confusing. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:718 > + for (unsigned i = 0; i < size; i++) { WebKit style: i++ -> ++i 1022869 3 enrica 2014-07-16 17:01:03 -0700 Committed revision 171159. 235032 2014-07-16 16:05:31 -0700 2014-07-16 16:39:44 -0700 Patch autoscrollwebkit.txt text/plain 9920 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTE1NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA3LTE2ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAoaU9TIFdl YktpdDIpOiBDYW5ub3Qgc2Nyb2xsIHdoaWxlIGRyYWdnaW5nIGEgc2VsZWN0aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0OTkyCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNzUyODAyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGV4cG9zZXMgdGhlIHNjcm9sbGVyIGFuZCB0 aGUgdmlzaWJsZSBjb250ZW50IHJlY3Qgc28gdGhhdAorICAgICAgICBVSUtpdCBjYW4gaW1wbGVt ZW50IGF1dG9zY3JvbGwgd2hlbiBkcmFnZ2luZyB0aGUgc2VsZWN0aW9ucy4KKyAgICAgICAgSXQg YWxzbyBjaGFuZ2VzIHRoYXQgd2F5IHdlIGRvIGhpdCB0ZXN0aW5nIHRvIGFsbG93IGhpdCB0ZXN0 IG91dHNpZGUKKyAgICAgICAgdGhlIGNsaXBwaW5nIHJlZ2lvbiBhbmQgZml4ZXMgdGhlIHdheSB3 ZSBjb21wdXRlIHRoZSBzZWxlY3Rpb24gcmVjdGFuZ2xlCisgICAgICAgIGZvciB0aGUgYmxvY2sg c2VsZWN0aW9uLCBlbnN1cmluZyB0aGF0IHdlIGNvbnNpZGVyIGFsc28gbm9uIHRleHQgZWxlbWVu dHMKKyAgICAgICAgbGlrZSBpbWFnZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBzY3JvbGxl cl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHZpc2libGVSZWN0XSk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0Ojpz ZWxlY3Rpb25Cb3hGb3JSYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJhbmdlRm9y V2ViU2VsZWN0aW9uQXRQb3NpdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJhbmdl Rm9yQmxvY2tBdFBvaW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZXhwYW5kZWRSYW5n ZUZyb21IYW5kbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb250cmFjdGVkUmFuZ2VG cm9tSGFuZGxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y29tcHV0ZUV4cGFuZEFuZFNo cmlua1RocmVzaG9sZHNGb3JIYW5kbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjaGFu Z2VCbG9ja1NlbGVjdGlvbik6CisKIDIwMTQtMDctMTYgIFRpbW90aHkgSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIERpc3BhdGNoIHRvcCBjb250ZW50IGluc2V0 IGNoYW5nZXMgaW1tZWRpYXRlbHkgaWYgc3luY2hyb25vdXNseSB3YWl0aW5nIGZvciB2aWV3IHN0 YXRlIGNoYW5nZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAxNzExMTQpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQko d29ya2luZyBjb3B5KQpAQCAtMzQ5LDYgKzM0OSwxNiBAQCAtIChDR0Zsb2F0KWludmVyc2VTY2Fs ZQogICAgIHJldHVybiAxIC8gW1tzZWxmIGxheWVyXSB0cmFuc2Zvcm1dLm0xMTsKIH0KIAorLSAo VUlTY3JvbGxWaWV3ICopc2Nyb2xsZXIKK3sKKyAgICByZXR1cm4gW193ZWJWaWV3IHNjcm9sbFZp ZXddOworfQorCistIChDR1JlY3QpdmlzaWJsZVJlY3QKK3sKKyAgICByZXR1cm4gX3BhZ2UtPnVu b2JzY3VyZWRDb250ZW50UmVjdCgpOworfQorCiAtICh2b2lkKW9ic2VydmVWYWx1ZUZvcktleVBh dGg6KE5TU3RyaW5nICopa2V5UGF0aCBvZk9iamVjdDooaWQpb2JqZWN0IGNoYW5nZTooTlNEaWN0 aW9uYXJ5ICopY2hhbmdlIGNvbnRleHQ6KHZvaWQgKiljb250ZXh0CiB7CiAgICAgQVNTRVJUKFtr ZXlQYXRoIGlzRXF1YWxUb1N0cmluZzpAInRyYW5zZm9ybSJdKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlz aW9uIDE3MTExMykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtNzA1LDEzICs3MDUsMzIgQEAgc3RhdGljIElu dFBvaW50IGNvbnN0cmFpblBvaW50KGNvbnN0IEludAogICAgIHJldHVybiBjb25zdHJhaW5lZFBv aW50OwogfQogCitzdGF0aWMgSW50UmVjdCBzZWxlY3Rpb25Cb3hGb3JSYW5nZShXZWJDb3JlOjpS YW5nZSogcmFuZ2UpCit7CisgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgcmV0dXJuIEludFJlY3Qo KTsKKyAgICAKKyAgICBJbnRSZWN0IGJvdW5kaW5nUmVjdDsKKyAgICBWZWN0b3I8U2VsZWN0aW9u UmVjdD4gc2VsZWN0aW9uUmVjdHM7CisgICAgcmFuZ2UtPmNvbGxlY3RTZWxlY3Rpb25SZWN0cyhz ZWxlY3Rpb25SZWN0cyk7CisgICAgdW5zaWduZWQgc2l6ZSA9IHNlbGVjdGlvblJlY3RzLnNpemUo KTsKKyAgICAKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7CisgICAg ICAgIGNvbnN0IEludFJlY3QgJmNvcmVSZWN0ID0gc2VsZWN0aW9uUmVjdHNbaV0ucmVjdCgpOwor ICAgICAgICBpZiAoIWkpCisgICAgICAgICAgICBib3VuZGluZ1JlY3QgPSBjb3JlUmVjdDsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgYm91bmRpbmdSZWN0LnVuaXRlKGNvcmVSZWN0KTsKKyAg ICB9CisgICAgcmV0dXJuIGJvdW5kaW5nUmVjdDsKK30KKwogUGFzc1JlZlB0cjxSYW5nZT4gV2Vi UGFnZTo6cmFuZ2VGb3JXZWJTZWxlY3Rpb25BdFBvc2l0aW9uKGNvbnN0IEludFBvaW50JiBwb2lu dCwgY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBwb3NpdGlvbiwgU2VsZWN0aW9uRmxhZ3MmIGZsYWdz KQogewogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gbV9wYWdlLT5tYWluRnJhbWUoKS5ldmVu dEhhbmRsZXIoKS5oaXRUZXN0UmVzdWx0QXRQb2ludCgocG9pbnQpLCBIaXRUZXN0UmVxdWVzdDo6 UmVhZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkRpc2Fs bG93U2hhZG93Q29udGVudCB8IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd0NoaWxkRnJhbWVDb250ZW50 KTsKIAogICAgIE5vZGUqIGN1cnJlbnROb2RlID0gcmVzdWx0LmlubmVyTm9kZSgpOwogICAgIFJl ZlB0cjxSYW5nZT4gcmFuZ2U7Ci0gICAgSW50UmVjdCBib3VuZGluZ1JlY3Q7CiAgICAgRmxvYXRS ZWN0IGJvdW5kaW5nUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzOwogCiAgICAgaWYgKGN1cnJl bnROb2RlLT5pc1RleHROb2RlKCkpIHsKQEAgLTcyMSwxOCArNzQwLDcgQEAgUGFzc1JlZlB0cjxS YW5nZT4gV2ViUGFnZTo6cmFuZ2VGb3JXZWJTZQogICAgICAgICBpZiAoIXJhbmdlKQogICAgICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAgICAgVmVjdG9yPFNlbGVjdGlvblJlY3Q+IHNl bGVjdGlvblJlY3RzOwotICAgICAgICByYW5nZS0+Y29sbGVjdFNlbGVjdGlvblJlY3RzKHNlbGVj dGlvblJlY3RzKTsKLSAgICAgICAgdW5zaWduZWQgc2l6ZSA9IHNlbGVjdGlvblJlY3RzLnNpemUo KTsKLQotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7Ci0gICAg ICAgICAgICBjb25zdCBJbnRSZWN0ICZjb3JlUmVjdCA9IHNlbGVjdGlvblJlY3RzW2ldLnJlY3Qo KTsKLSAgICAgICAgICAgIGlmIChpID09IDApCi0gICAgICAgICAgICAgICAgYm91bmRpbmdSZWN0 ID0gY29yZVJlY3Q7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgYm91bmRpbmdS ZWN0LnVuaXRlKGNvcmVSZWN0KTsKLSAgICAgICAgfQotICAgICAgICBib3VuZGluZ1JlY3RJblNj cm9sbFZpZXdDb29yZGluYXRlcyA9IGJvdW5kaW5nUmVjdDsKKyAgICAgICAgYm91bmRpbmdSZWN0 SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMgPSBzZWxlY3Rpb25Cb3hGb3JSYW5nZShyYW5nZS5nZXQo KSk7CiAgICAgICAgIGJvdW5kaW5nUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLnNjYWxlKG1f cGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOwogICAgICAgICBpZiAoYm91bmRpbmdSZWN0SW5TY3Jv bGxWaWV3Q29vcmRpbmF0ZXMud2lkdGgoKSA+IG1fYmxvY2tTZWxlY3Rpb25EZXNpcmVkU2l6ZS53 aWR0aCgpICYmIGJvdW5kaW5nUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLmhlaWdodCgpID4g bV9ibG9ja1NlbGVjdGlvbkRlc2lyZWRTaXplLmhlaWdodCgpKQogICAgICAgICAgICAgcmV0dXJu IHdvcmRSYW5nZUZyb21Qb3NpdGlvbihwb3NpdGlvbik7CkBAIC03NDUsOCArNzUzLDcgQEAgUGFz c1JlZlB0cjxSYW5nZT4gV2ViUGFnZTo6cmFuZ2VGb3JXZWJTZQogCiAgICAgTm9kZSogYmVzdENo b2ljZSA9IGN1cnJlbnROb2RlOwogICAgIHdoaWxlIChjdXJyZW50Tm9kZSkgewotICAgICAgICBi b3VuZGluZ1JlY3QgPSBjdXJyZW50Tm9kZS0+cmVuZGVyZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0Jv eFJlY3QodHJ1ZSk7Ci0gICAgICAgIGJvdW5kaW5nUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVz ID0gYm91bmRpbmdSZWN0OworICAgICAgICBib3VuZGluZ1JlY3RJblNjcm9sbFZpZXdDb29yZGlu YXRlcyA9IGN1cnJlbnROb2RlLT5yZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCh0 cnVlKTsKICAgICAgICAgYm91bmRpbmdSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMuc2NhbGUo bV9wYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAgICAgIGlmIChib3VuZGluZ1JlY3RJblNj cm9sbFZpZXdDb29yZGluYXRlcy53aWR0aCgpID4gbV9ibG9ja1NlbGVjdGlvbkRlc2lyZWRTaXpl LndpZHRoKCkgJiYgYm91bmRpbmdSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMuaGVpZ2h0KCkg PiBtX2Jsb2NrU2VsZWN0aW9uRGVzaXJlZFNpemUuaGVpZ2h0KCkpCiAgICAgICAgICAgICBicmVh azsKQEAgLTc4Myw3ICs3OTAsNyBAQCBQYXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdlOjpyYW5nZUZv cldlYlNlCiAKIFBhc3NSZWZQdHI8UmFuZ2U+IFdlYlBhZ2U6OnJhbmdlRm9yQmxvY2tBdFBvaW50 KGNvbnN0IEludFBvaW50JiBwb2ludCkKIHsKLSAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IG1f cGFnZS0+bWFpbkZyYW1lKCkuZXZlbnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQoKHBv aW50KSwgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSB8 IEhpdFRlc3RSZXF1ZXN0OjpEaXNhbGxvd1NoYWRvd0NvbnRlbnQpOworICAgIEhpdFRlc3RSZXN1 bHQgcmVzdWx0ID0gbV9wYWdlLT5tYWluRnJhbWUoKS5ldmVudEhhbmRsZXIoKS5oaXRUZXN0UmVz dWx0QXRQb2ludCgocG9pbnQpLCBIaXRUZXN0UmVxdWVzdDo6UmVhZE9ubHkgfCBIaXRUZXN0UmVx dWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkRpc2FsbG93U2hhZG93Q29udGVudCB8IEhp dFRlc3RSZXF1ZXN0OjpJZ25vcmVDbGlwcGluZyk7CiAKICAgICBOb2RlKiBjdXJyZW50Tm9kZSA9 IHJlc3VsdC5pbm5lck5vZGUoKTsKICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlOwpAQCAtMTA4OSw4 ICsxMDk2LDcgQEAgc3RhdGljIGlubGluZSBJbnRQb2ludCBjb21wdXRlRWRnZUNlbnRlcgogCiBQ YXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdlOjpleHBhbmRlZFJhbmdlRnJvbUhhbmRsZShSYW5nZSog Y3VycmVudFJhbmdlLCBTZWxlY3Rpb25IYW5kbGVQb3NpdGlvbiBoYW5kbGVQb3NpdGlvbikKIHsK LSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHVzZSBib3VuZGluZ1JlY3QoKSBpbnN0ZWFkIG9mIGJv dW5kaW5nQm94KCkgaW4gdGhpcyBmdW5jdGlvbiB3aGVuIDxyZGFyOi8vcHJvYmxlbS8xNjA2Mzcy Mz4gaXMgZml4ZWQuCi0gICAgSW50UmVjdCBjdXJyZW50Qm94ID0gY3VycmVudFJhbmdlLT5ib3Vu ZGluZ0JveCgpOworICAgIEludFJlY3QgY3VycmVudEJveCA9IHNlbGVjdGlvbkJveEZvclJhbmdl KGN1cnJlbnRSYW5nZSk7CiAgICAgSW50UG9pbnQgZWRnZUNlbnRlciA9IGNvbXB1dGVFZGdlQ2Vu dGVyKGN1cnJlbnRCb3gsIGhhbmRsZVBvc2l0aW9uKTsKICAgICBzdGF0aWMgY29uc3QgZmxvYXQg bWF4RGlzdGFuY2UgPSAxMDAwOwogICAgIGNvbnN0IGZsb2F0IG11bHRpcGxlID0gcG93ZihtYXhE aXN0YW5jZSwgMS4wLyhtYXhIaXRUZXN0cyAtIDEpKTsKQEAgLTExMzcsNyArMTE0Myw3IEBAIFBh c3NSZWZQdHI8UmFuZ2U+IFdlYlBhZ2U6OmV4cGFuZGVkUmFuZ2UKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgbmV3UmFuZ2UgPSB1bmlvbkRPTVJhbmdlcyhjdXJyZW50UmFuZ2UsIHJhbmdlQXRQ b3NpdGlvbi5nZXQoKSk7CiAKLSAgICAgICAgSW50UmVjdCBjb3B5UmVjdCA9IG5ld1JhbmdlLT5i b3VuZGluZ0JveCgpOworICAgICAgICBJbnRSZWN0IGNvcHlSZWN0ID0gc2VsZWN0aW9uQm94Rm9y UmFuZ2UobmV3UmFuZ2UuZ2V0KCkpOwogCiAgICAgICAgIC8vIElzIGl0IGRpZmZlcmVudCBhbmQg YmlnZ2VyIHRoYW4gdGhlIGN1cnJlbnQ/CiAgICAgICAgIGJvb2wgaXNCZXR0ZXJDaG9pY2UgPSAh KHJlY3RzRXNzZW50aWFsbHlUaGVTYW1lKGNvcHlSZWN0LCBjdXJyZW50Qm94LCAuMDUpKTsKQEAg LTExODcsOCArMTE5Myw3IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IFdlYlBhZ2U6OmNvbnRyYWN0ZWRS YW4KICAgICAvLyBzZWUgaWYgd2UgY2FuIGJyZWFrIHRoYXQgZG93biB0byBhIGJhc2UgYW5kIGV4 dGVudC4gU2hyaW5raW5nIGJhc2UgYW5kIGV4dGVudCBpcyBjb21wYXJhdGl2ZWx5IHN0cmFpZ2h0 Zm9yd2FyZC4KICAgICAvLyBTaHJpbmtpbmcgZG93biB0byBhbm90aGVyIGVsZW1lbnQgaXMgdW5s aWtlbHkgdG8gbW92ZSBqdXN0IG9uZSBlZGdlLCBidXQgd2UgY2FuIHRyeSB0aGF0IGFzIGEgZmFs bGJhY2suCiAKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHVzZSBib3VuZGluZ1JlY3QoKSBpbnN0 ZWFkIG9mIGJvdW5kaW5nQm94KCkgaW4gdGhpcyBmdW5jdGlvbiB3aGVuIDxyZGFyOi8vcHJvYmxl bS8xNjA2MzcyMz4gaXMgZml4ZWQuCi0gICAgSW50UmVjdCBjdXJyZW50Qm94ID0gY3VycmVudFJh bmdlLT5ib3VuZGluZ0JveCgpOworICAgIEludFJlY3QgY3VycmVudEJveCA9IHNlbGVjdGlvbkJv eEZvclJhbmdlKGN1cnJlbnRSYW5nZSk7CiAgICAgSW50UG9pbnQgZWRnZUNlbnRlciA9IGNvbXB1 dGVFZGdlQ2VudGVyKGN1cnJlbnRCb3gsIGhhbmRsZVBvc2l0aW9uKTsKICAgICBmbGFncyA9IElz QmxvY2tTZWxlY3Rpb247CiAKQEAgLTEyNTYsNyArMTI2MSw3IEBAIFBhc3NSZWZQdHI8UmFuZ2U+ IFdlYlBhZ2U6OmNvbnRyYWN0ZWRSYW4KICAgICAgICAgZWxzZQogICAgICAgICAgICAgbmV3UmFu Z2UgPSBSYW5nZTo6Y3JlYXRlKG5ld1JhbmdlLT5zdGFydENvbnRhaW5lcigpLT5kb2N1bWVudCgp LCBjdXJyZW50UmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSwgbmV3UmFuZ2UtPnN0YXJ0UG9zaXRpb24o KSk7CiAKLSAgICAgICAgSW50UmVjdCBjb3B5UmVjdCA9IG5ld1JhbmdlLT5ib3VuZGluZ0JveCgp OworICAgICAgICBJbnRSZWN0IGNvcHlSZWN0ID0gc2VsZWN0aW9uQm94Rm9yUmFuZ2UobmV3UmFu Z2UuZ2V0KCkpOwogICAgICAgICBpZiAoY29weVJlY3QuaXNFbXB0eSgpKSB7CiAgICAgICAgICAg ICBiZXN0UmFuZ2UgPSByYW5nZUZvckJsb2NrQXRQb2ludCh0ZXN0UG9pbnQpOwogICAgICAgICAg ICAgYnJlYWs7CkBAIC0xMzIxLDEwICsxMzI2LDkgQEAgdm9pZCBXZWJQYWdlOjpjb21wdXRlRXhw YW5kQW5kU2hyaW5rVGhyZQogICAgIFNlbGVjdGlvbkZsYWdzIGZsYWdzOwogICAgIFJlZlB0cjxS YW5nZT4gY29udHJhY3RlZFJhbmdlID0gY29udHJhY3RlZFJhbmdlRnJvbUhhbmRsZShjdXJyZW50 UmFuZ2UuZ2V0KCksIGhhbmRsZVBvc2l0aW9uLCBmbGFncyk7CiAKLSAgICAvLyBGSVhNRTogV2Ug c2hvdWxkIHVzZSBib3VuZGluZ1JlY3QoKSBpbnN0ZWFkIG9mIGJvdW5kaW5nQm94KCkgaW4gdGhp cyBmdW5jdGlvbiB3aGVuIDxyZGFyOi8vcHJvYmxlbS8xNjA2MzcyMz4gaXMgZml4ZWQuCi0gICAg SW50UmVjdCBjdXJyZW50Qm91bmRzID0gY3VycmVudFJhbmdlLT5ib3VuZGluZ0JveCgpOwotICAg IEludFJlY3QgZXhwYW5kZWRCb3VuZHMgPSBleHBhbmRlZFJhbmdlLT5ib3VuZGluZ0JveCgpOwot ICAgIEludFJlY3QgY29udHJhY3RlZEJvdW5kcyA9IGNvbnRyYWN0ZWRSYW5nZS0+Ym91bmRpbmdC b3goKTsKKyAgICBJbnRSZWN0IGN1cnJlbnRCb3VuZHMgPSBzZWxlY3Rpb25Cb3hGb3JSYW5nZShj dXJyZW50UmFuZ2UuZ2V0KCkpOworICAgIEludFJlY3QgZXhwYW5kZWRCb3VuZHMgPSBzZWxlY3Rp b25Cb3hGb3JSYW5nZShleHBhbmRlZFJhbmdlLmdldCgpKTsKKyAgICBJbnRSZWN0IGNvbnRyYWN0 ZWRCb3VuZHMgPSBzZWxlY3Rpb25Cb3hGb3JSYW5nZShjb250cmFjdGVkUmFuZ2UuZ2V0KCkpOwog CiAgICAgZmxvYXQgY3VycmVudDsKICAgICBmbG9hdCBleHBhbmRlZDsKQEAgLTEzOTYsMTAgKzE0 MDAsNyBAQCBQYXNzUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBXZWJQYWdlOjpjaGFuCiB7CiAgICAg RnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJh bWUoKTsKICAgICBSZWZQdHI8UmFuZ2U+IGN1cnJlbnRSYW5nZSA9IG1fY3VycmVudEJsb2NrU2Vs ZWN0aW9uID8gbV9jdXJyZW50QmxvY2tTZWxlY3Rpb24uZ2V0KCkgOiBmcmFtZS5zZWxlY3Rpb24o KS5zZWxlY3Rpb24oKS50b05vcm1hbGl6ZWRSYW5nZSgpOwotICAgIC8vIEZJWE1FOiBXZSBzaG91 bGQgdXNlIGJvdW5kaW5nUmVjdCgpIGluc3RlYWQgb2YgYm91bmRpbmdCb3goKSBpbiB0aGlzIGZ1 bmN0aW9uIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzE2MDYzNzIzPiBpcyBmaXhlZC4KLSAgICBJbnRS ZWN0IGN1cnJlbnRSZWN0ID0gY3VycmVudFJhbmdlLT5ib3VuZGluZ0JveCgpOwotCi0gICAgUmVm UHRyPFJhbmdlPiBuZXdSYW5nZSA9IHNob3VsZEV4cGFuZChoYW5kbGVQb3NpdGlvbiwgY3VycmVu dFJlY3QsIHBvaW50KSA/IGV4cGFuZGVkUmFuZ2VGcm9tSGFuZGxlKGN1cnJlbnRSYW5nZS5nZXQo KSwgaGFuZGxlUG9zaXRpb24pIDogY29udHJhY3RlZFJhbmdlRnJvbUhhbmRsZShjdXJyZW50UmFu Z2UuZ2V0KCksIGhhbmRsZVBvc2l0aW9uLCBmbGFncyk7CisgICAgUmVmUHRyPFJhbmdlPiBuZXdS YW5nZSA9IHNob3VsZEV4cGFuZChoYW5kbGVQb3NpdGlvbiwgc2VsZWN0aW9uQm94Rm9yUmFuZ2Uo Y3VycmVudFJhbmdlLmdldCgpKSwgcG9pbnQpID8gZXhwYW5kZWRSYW5nZUZyb21IYW5kbGUoY3Vy cmVudFJhbmdlLmdldCgpLCBoYW5kbGVQb3NpdGlvbikgOiBjb250cmFjdGVkUmFuZ2VGcm9tSGFu ZGxlKGN1cnJlbnRSYW5nZS5nZXQoKSwgaGFuZGxlUG9zaXRpb24sIGZsYWdzKTsKIAogICAgIGlm IChuZXdSYW5nZSkgewogICAgICAgICBtX2N1cnJlbnRCbG9ja1NlbGVjdGlvbiA9IG5ld1Jhbmdl Owo=