202498 2019-10-02 15:43:31 -0700 [iOS] When hit testing for a context menu interaction, do not consider whether the element is contenteditable 2019-10-02 21:54:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=202499 InRadar P2 Normal --- 1 aestes aestes bdakin commit-queue dino thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1576226 0 aestes 2019-10-02 15:43:31 -0700 [iOS] When hit testing for a context menu interaction, do not consider whether the element is contenteditable 1576232 1 380068 aestes 2019-10-02 16:06:49 -0700 Created attachment 380068 Patch 1576233 2 380068 thorton 2019-10-02 16:15:27 -0700 Comment on attachment 380068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380068&action=review > Source/WebCore/page/ios/FrameIOS.mm:271 > +#if !USE(UIKIT_EDITING) Wut 1576234 3 aestes 2019-10-02 16:18:34 -0700 (In reply to Tim Horton from comment #2) > Comment on attachment 380068 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=380068&action=review > > > Source/WebCore/page/ios/FrameIOS.mm:271 > > +#if !USE(UIKIT_EDITING) > > Wut #if PLATFORM(IOS_FAMILY) #define USE_UIKIT_EDITING 1 ... Yeah, surely we don't need this USE() anymore. 1576283 4 aestes 2019-10-02 21:11:14 -0700 rdar://problem/54723131 1576284 5 webkit-bug-importer 2019-10-02 21:11:27 -0700 <rdar://problem/55935155> 1576285 6 webkit-bug-importer 2019-10-02 21:11:28 -0700 <rdar://problem/55935157> 1576290 7 380068 commit-queue 2019-10-02 21:54:00 -0700 Comment on attachment 380068 Patch Clearing flags on attachment: 380068 Committed r250642: <https://trac.webkit.org/changeset/250642> 1576291 8 commit-queue 2019-10-02 21:54:02 -0700 All reviewed patches have been landed. Closing bug. 380068 2019-10-02 16:06:49 -0700 2019-10-02 21:54:00 -0700 Patch bug-202498-20191002160649.patch text/plain 13048 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUzZjgwNjk4NjUyOGI5 NGQ3MTBlMTZmOTA0ZjVmNTYxYzJjODAxMi4uYzliZjE5YTFmODNlYWE1MGE2MDMzNzU4YjcyNDM3 OWExZWU0MzU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE5LTEwLTAyICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXaGVuIGhpdCB0ZXN0 aW5nIGZvciBhIGNvbnRleHQgbWVudSBpbnRlcmFjdGlvbiwgZG8gbm90IGNvbnNpZGVyIHdoZXRo ZXIgdGhlIGVsZW1lbnQgaXMgY29udGVudGVkaXRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI0OTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzU0NzIzMTMxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdoZW4gdGhlIHVzZXIgc2VsZWN0cyBhIGNvbnRleHQgbWVudSBhY3Rpb24sIFdlYktpdCBw ZXJmb3JtcyBhIGhpdCB0ZXN0IGluIG9yZGVyIHRvIGZpbmQgdGhlCisgICAgICAgIGFjdGVkLW9u IGVsZW1lbnQgb24gdGhlIHBhZ2UuIFRoaXMgaXMgc2VwYXJhdGUgZnJvbSB0aGUgaGl0IHRlc3Qg cGVyZm9ybWVkIHRvIGdlbmVyYXRlIHRoZQorICAgICAgICBjb250ZXh0IG1lbnUncyB0YXJnZXRl ZCBwcmV2aWV3LiBTaW5jZSBhbiBhcmJpdHJhcnkgYW1vdW50IG9mIHRpbWUgY2FuIGVsYXBzZSBi ZXR3ZWVuCisgICAgICAgIHByZXZpZXcgZ2VuZXJhdGlvbiBhbmQgYWN0aW9uIHNlbGVjdGlvbiwg dGhpcyBzZWNvbmQgaGl0LXRlc3RzIG1pZ2h0IHJldHVybiBhIGRpZmZlcmVudAorICAgICAgICBl bGVtZW50LgorCisgICAgICAgIE9uZSBjYXNlIHdoZXJlIHdlIGtub3cgYSBkaWZmZXJlbnQgZWxl bWVudCBjYW4gYmUgcmV0dXJuZWQgaXMgaW4gYXBwcyB0aGF0IGR5bmFtaWNhbGx5CisgICAgICAg IGVuYWJsZSBhbmQgZGlzYWJsZSBlZGl0aW5nLiBJZiBlZGl0aW5nIGlzIGRpc2FibGVkIHdoZW4g dGhlIGZpcnN0IGhpdCB0ZXN0IG9jY3VycyBidXQgaXMKKyAgICAgICAgZW5hYmxlZCB3aGVuIHRo ZSBzZWNvbmQgb25lIG9jY3VycywgZGlmZmVyZW50IGVsZW1lbnRzIHdpbGwgYmUgcmV0dXJuZWQg ZHVlIHRvCisgICAgICAgIEZyYW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbiBw cmVmZXJyaW5nIHRvIHJldHVybiB0aGUgcm9vdCBlZGl0YWJsZSBlbGVtZW50IHdoZW4KKyAgICAg ICAgdGhlIGFwcHJveGltYXRlIG5vZGUgaXMgY29udGVudGVkaXRhYmxlLgorCisgICAgICAgIFdo aWxlIHRoZSBhcHByb3ByaWF0ZSBsb25nLXRlcm0gZml4IGlzIHRvIG9ubHkgaGl0LXRlc3Qgb25j ZSBhbmQgdXNlIHRoYXQgZWxlbWVudCBmb3IgYm90aAorICAgICAgICBwcmV2aWV3IGdlbmVyYXRp b24gYW5kIGFjdGlvbiBzZWxlY3Rpb24sIHRoaXMgcGF0Y2ggaW1wbGVtZW50cyBhIHNob3J0LXRl cm0gZml4IHRvIGFkZHJlc3MKKyAgICAgICAgdGhlIHNwZWNpZmljIHByb2JsZW0gaW4gcmRhcjov L3Byb2JsZW0vNTQ3MjMxMzEgYnkgZGlzYWJsaW5nIHRoZSBjb250ZW50ZWRpdGFibGUgYmVoYXZp b3IKKyAgICAgICAgZGVzY3JpYmVkIGFib3ZlIGZvciBjb250ZXh0IG1lbnUgaW50ZXJhY3Rpb24g aGl0IHRlc3RpbmcuCisKKyAgICAgICAgVGhlIGxvbmctdGVybSBmaXggaXMgdHJhY2tlZCBieSA8 aHR0cHM6Ly93ZWJraXQub3JnL2IvMjAyNDk5Pi4KKworICAgICAgICAqIHBhZ2UvRnJhbWUuaDoK KyAgICAgICAgKiBwYWdlL2lvcy9GcmFtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l OjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZTo6YXBwcm94aW1hdGVOb2RlQXRWaWV3cG9ydExvY2F0aW9uTGVnYWN5KToKKyAgICAgICAg KFdlYkNvcmU6OmFuY2VzdG9yUmVzcG9uZGluZ1RvQ2xpY2tFdmVudHNOb2RlUXVhbGlmaWVyKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpub2RlUmVzcG9uZGluZ1RvQ2xpY2tFdmVudHMpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWU6Om5vZGVSZXNwb25kaW5nVG9Eb3VibGVDbGlja0V2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpub2RlUmVzcG9uZGluZ1RvSW50ZXJhY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6Om5vZGVSZXNwb25kaW5nVG9TY3JvbGxXaGVlbEV2 ZW50cyk6CisKIDIwMTktMTAtMDIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFtDU1MgU2hhZG93IFBhcnRzXSBCYXNpYyA6OnBhcnQoKSBwc2V1ZG8gZWxlbWVu dCBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgzMDRkZTBmMDUyZGE0MTlmOTAyZmU2YzBkNmEwNTM1ZDMw MTQ4ZjAuLmVjMGZlYjAyMTgzZTk5OWJkMDYwZjA0OTUxOTczMzM1OWEwYTYxYTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMTAtMDIgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUu Y29tPgorCisgICAgICAgIFtpT1NdIFdoZW4gaGl0IHRlc3RpbmcgZm9yIGEgY29udGV4dCBtZW51 IGludGVyYWN0aW9uLCBkbyBub3QgY29uc2lkZXIgd2hldGhlciB0aGUgZWxlbWVudCBpcyBjb250 ZW50ZWRpdGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMjQ5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTQ3MjMxMzE+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnN0YXJ0SW50 ZXJhY3Rpb25XaXRoRWxlbWVudEF0UG9zaXRpb24pOiBDaGFuZ2VkIHRvIGNhbGwKKyAgICAgICAg V2ViQ29yZTo6RnJhbWU6Om5vZGVSZXNwb25kaW5nVG9JbnRlcmFjdGlvbi4KKwogMjAxOS0xMC0w MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IENNYWtlLWJ1aWx0IFdlYktpdC5mcmFtZXdvcmsgc2hvdWxkIGxhdW5jaCBYUEMgc2VydmljZXMg c3VjY2Vzc2Z1bGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmggYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmgKaW5kZXggM2UwMWQzYTdkNzJhNWQxNmE3MzIwNzI4 YmE2MTc1YjI2NmQyOGIwOC4uOWFhMWM2NjI5OGUyODhlMWU0MWMwMjc5ODFlY2JhN2JkMTE0Nzg1 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWUuaApAQCAtMjIxLDYgKzIyMSw3IEBAIHB1YmxpYzoKICAgICBXRUJD T1JFX0VYUE9SVCBOb2RlKiBkZWVwZXN0Tm9kZUF0TG9jYXRpb24oY29uc3QgRmxvYXRQb2ludCYg dmlld3BvcnRMb2NhdGlvbik7CiAgICAgV0VCQ09SRV9FWFBPUlQgTm9kZSogbm9kZVJlc3BvbmRp bmdUb0NsaWNrRXZlbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpb24sIEZsb2F0 UG9pbnQmIGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbiwgU2VjdXJpdHlPcmlnaW4qID0gbnVsbHB0 cik7CiAgICAgV0VCQ09SRV9FWFBPUlQgTm9kZSogbm9kZVJlc3BvbmRpbmdUb0RvdWJsZUNsaWNr RXZlbnQoY29uc3QgRmxvYXRQb2ludCYgdmlld3BvcnRMb2NhdGlvbiwgRmxvYXRQb2ludCYgYWRq dXN0ZWRWaWV3cG9ydExvY2F0aW9uKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBOb2RlKiBub2RlUmVz cG9uZGluZ1RvSW50ZXJhY3Rpb24oY29uc3QgRmxvYXRQb2ludCYgdmlld3BvcnRMb2NhdGlvbiwg RmxvYXRQb2ludCYgYWRqdXN0ZWRWaWV3cG9ydExvY2F0aW9uKTsKICAgICBXRUJDT1JFX0VYUE9S VCBOb2RlKiBub2RlUmVzcG9uZGluZ1RvU2Nyb2xsV2hlZWxFdmVudHMoY29uc3QgRmxvYXRQb2lu dCYgdmlld3BvcnRMb2NhdGlvbik7CiAgICAgV0VCQ09SRV9FWFBPUlQgTm9kZSogYXBwcm94aW1h dGVOb2RlQXRWaWV3cG9ydExvY2F0aW9uTGVnYWN5KGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0 TG9jYXRpb24sIEZsb2F0UG9pbnQmIGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbik7CiAKQEAgLTMz Myw3ICszMzQsMTAgQEAgcHJpdmF0ZToKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHZv aWQgYmV0dGVyQXBwcm94aW1hdGVOb2RlKGNvbnN0IEludFBvaW50JiB0ZXN0UG9pbnQsIGNvbnN0 IE5vZGVRdWFsaWZpZXImLCBOb2RlKiYgYmVzdCwgTm9kZSogZmFpbGVkTm9kZSwgSW50UG9pbnQm IGJlc3RQb2ludCwgSW50UmVjdCYgYmVzdFJlY3QsIGNvbnN0IEludFJlY3QmIHRlc3RSZWN0KTsK ICAgICBib29sIGhpdFRlc3RSZXN1bHRBdFZpZXdwb3J0TG9jYXRpb24oY29uc3QgRmxvYXRQb2lu dCYgdmlld3BvcnRMb2NhdGlvbiwgSGl0VGVzdFJlc3VsdCYsIEludFBvaW50JiBjZW50ZXIpOwot ICAgIE5vZGUqIHF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvY2F0aW9uKGNvbnN0IEZsb2F0UG9p bnQmIHZpZXdwb3J0TG9jYXRpb24sIEZsb2F0UG9pbnQmIGFkanVzdGVkVmlld3BvcnRMb2NhdGlv biwgY29uc3QgTm9kZVF1YWxpZmllciYsIGJvb2wgc2hvdWxkQXBwcm94aW1hdGUpOworICAgIAor ICAgIGVudW0gY2xhc3MgU2hvdWxkQXBwcm94aW1hdGUgOiBib29sIHsgTm8sIFllcyB9OworICAg IGVudW0gY2xhc3MgU2hvdWxkRmluZFJvb3RFZGl0YWJsZUVsZW1lbnQgOiBib29sIHsgTm8sIFll cyB9OworICAgIE5vZGUqIHF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvY2F0aW9uKGNvbnN0IEZs b2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpb24sIEZsb2F0UG9pbnQmIGFkanVzdGVkVmlld3BvcnRM b2NhdGlvbiwgY29uc3QgTm9kZVF1YWxpZmllciYsIFNob3VsZEFwcHJveGltYXRlLCBTaG91bGRG aW5kUm9vdEVkaXRhYmxlRWxlbWVudCA9IFNob3VsZEZpbmRSb290RWRpdGFibGVFbGVtZW50OjpZ ZXMpOwogCiAgICAgdm9pZCBzZXRUaW1lcnNQYXVzZWRJbnRlcm5hbChib29sKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQppbmRleCA0NjAxOGQ4ZmFhZTc1MTQxMWExYzgxZDRmMTFl YWE0YjRjZmUwY2U1Li41YmYyYjZjZTA4ZDQ4NzdjZmRmNjc5ZTU4YWRkYjMzYTZkNjlkNGJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQpAQCAtMjY2LDggKzI2NiwxMiBAQCBib29s IEZyYW1lOjpoaXRUZXN0UmVzdWx0QXRWaWV3cG9ydExvY2F0aW9uKGNvbnN0IEZsb2F0UG9pbnQm IHZpZXdwb3J0TG9jYXRpb24sCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLU5vZGUqIEZyYW1lOjpx dWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbihjb25zdCBGbG9hdFBvaW50JiB2aWV3cG9y dExvY2F0aW9uLCBGbG9hdFBvaW50JiBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24sIGNvbnN0IE5v ZGVRdWFsaWZpZXImIG5vZGVRdWFsaWZpZXJGdW5jdGlvbiwgYm9vbCBzaG91bGRBcHByb3hpbWF0 ZSkKK05vZGUqIEZyYW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbihjb25zdCBG bG9hdFBvaW50JiB2aWV3cG9ydExvY2F0aW9uLCBGbG9hdFBvaW50JiBhZGp1c3RlZFZpZXdwb3J0 TG9jYXRpb24sIGNvbnN0IE5vZGVRdWFsaWZpZXImIG5vZGVRdWFsaWZpZXJGdW5jdGlvbiwgU2hv dWxkQXBwcm94aW1hdGUgc2hvdWxkQXBwcm94aW1hdGUsIFNob3VsZEZpbmRSb290RWRpdGFibGVF bGVtZW50IHNob3VsZEZpbmRSb290RWRpdGFibGVFbGVtZW50KQogeworI2lmICFVU0UoVUlLSVRf RURJVElORykKKyAgICBVTlVTRURfUEFSQU0oc2hvdWxkRmluZFJvb3RFZGl0YWJsZUVsZW1lbnQp OworI2VuZGlmCisKICAgICBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24gPSB2aWV3cG9ydExvY2F0 aW9uOwogCiAgICAgSW50UG9pbnQgdGVzdENlbnRlcjsKQEAgLTI4MiwxMiArMjg2LDEyIEBAIE5v ZGUqIEZyYW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbihjb25zdCBGbG9hdFBv aW50JiB2aWV3cG9ydExvY2F0aW9uCiAgICAgTm9kZSogYXBwcm94aW1hdGVOb2RlID0gbm9kZVF1 YWxpZmllckZ1bmN0aW9uKGNhbmRpZGF0ZUluZm8sIDAsIDApOwogCiAjaWYgVVNFKFVJS0lUX0VE SVRJTkcpCi0gICAgaWYgKGFwcHJveGltYXRlTm9kZSAmJiBhcHByb3hpbWF0ZU5vZGUtPmlzQ29u dGVudEVkaXRhYmxlKCkpIHsKKyAgICBpZiAoc2hvdWxkRmluZFJvb3RFZGl0YWJsZUVsZW1lbnQg PT0gU2hvdWxkRmluZFJvb3RFZGl0YWJsZUVsZW1lbnQ6OlllcyAmJiBhcHByb3hpbWF0ZU5vZGUg JiYgYXBwcm94aW1hdGVOb2RlLT5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7CiAgICAgICAgIC8vIElm IHdlIGFyZSBpbiBlZGl0YWJsZSBjb250ZW50LCB3ZSBsb29rIGZvciB0aGUgcm9vdCBlZGl0YWJs ZSBlbGVtZW50LgogICAgICAgICBhcHByb3hpbWF0ZU5vZGUgPSBhcHByb3hpbWF0ZU5vZGUtPnJv b3RFZGl0YWJsZUVsZW1lbnQoKTsKICAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIGZvY3VzYWJsZSBu b2RlLCB0aGVyZSBpcyBubyBuZWVkIHRvIGFwcHJveGltYXRlLgogICAgICAgICBpZiAoYXBwcm94 aW1hdGVOb2RlKQotICAgICAgICAgICAgc2hvdWxkQXBwcm94aW1hdGUgPSBmYWxzZTsKKyAgICAg ICAgICAgIHNob3VsZEFwcHJveGltYXRlID0gU2hvdWxkQXBwcm94aW1hdGU6Ok5vOwogICAgIH0K ICNlbmRpZgogCkBAIC0yOTgsNyArMzAyLDcgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2Rl QXRWaWV3cG9ydExvY2F0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpb24KICAg ICBzdGF0aWMgY29uc3QgZmxvYXQgdW5zY2FsZWRTZWFyY2hSYWRpdXMgPSAxNTsKICAgICBpbnQg c2VhcmNoUmFkaXVzID0gc3RhdGljX2Nhc3Q8aW50Pih1bnNjYWxlZFNlYXJjaFJhZGl1cyAqIHBw aUZhY3RvciAvIHNjYWxlKTsKIAotICAgIGlmIChhcHByb3hpbWF0ZU5vZGUgJiYgc2hvdWxkQXBw cm94aW1hdGUpIHsKKyAgICBpZiAoYXBwcm94aW1hdGVOb2RlICYmIHNob3VsZEFwcHJveGltYXRl ID09IFNob3VsZEFwcHJveGltYXRlOjpZZXMpIHsKICAgICAgICAgY29uc3QgZmxvYXQgdGVzdE9m ZnNldHNbXSA9IHsKICAgICAgICAgICAgIC0uM2YsIC0uM2YsCiAgICAgICAgICAgICAtLjZmLCAt LjZmLApAQCAtMzE5LDcgKzMyMyw3IEBAIE5vZGUqIEZyYW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmll d3BvcnRMb2NhdGlvbihjb25zdCBGbG9hdFBvaW50JiB2aWV3cG9ydExvY2F0aW9uCiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICB9IGVsc2UgaWYg KCFhcHByb3hpbWF0ZU5vZGUgJiYgc2hvdWxkQXBwcm94aW1hdGUpIHsKKyAgICB9IGVsc2UgaWYg KCFhcHByb3hpbWF0ZU5vZGUgJiYgc2hvdWxkQXBwcm94aW1hdGUgPT0gU2hvdWxkQXBwcm94aW1h dGU6OlllcykgewogICAgICAgICAvLyBHcmFiIHRoZSBjbG9zZXN0IHBhcmVudCBlbGVtZW50IG9m IG91ciBmYWlsZWQgY2FuZGlkYXRlIG5vZGUuCiAgICAgICAgIE5vZGUqIGNhbmRpZGF0ZSA9IGNh bmRpZGF0ZUluZm8uaW5uZXJOb2RlKCk7CiAgICAgICAgIE5vZGUqIGZhaWxlZE5vZGUgPSBjYW5k aWRhdGU7CkBAIC0zNjcsNyArMzcxLDcgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2RlQXRW aWV3cG9ydExvY2F0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpb24KICAgICAg ICAgSW50UG9pbnQgcCA9IG1fdmlldy0+Y29udGVudHNUb1dpbmRvdyhiZXN0UG9pbnQpOwogICAg ICAgICBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24gPSBwOwogI2lmIFVTRShVSUtJVF9FRElUSU5H KQotICAgICAgICBpZiAoYXBwcm94aW1hdGVOb2RlLT5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7Cisg ICAgICAgIGlmIChzaG91bGRGaW5kUm9vdEVkaXRhYmxlRWxlbWVudCA9PSBTaG91bGRGaW5kUm9v dEVkaXRhYmxlRWxlbWVudDo6WWVzICYmIGFwcHJveGltYXRlTm9kZS0+aXNDb250ZW50RWRpdGFi bGUoKSkgewogICAgICAgICAgICAgLy8gV2hlbiBpbiBlZGl0YWJsZSBjb250ZW50LCBsb29rIGZv ciB0aGUgcm9vdCBlZGl0YWJsZSBub2RlIGFnYWluLAogICAgICAgICAgICAgLy8gc2luY2UgdGhp cyBjb3VsZCBiZSB0aGUgbm9kZSBmb3VuZCB3aXRoIHRoZSBhcHByb3hpbWF0aW9uLgogICAgICAg ICAgICAgYXBwcm94aW1hdGVOb2RlID0gYXBwcm94aW1hdGVOb2RlLT5yb290RWRpdGFibGVFbGVt ZW50KCk7CkBAIC00NDgsMTIgKzQ1MiwxMiBAQCBOb2RlKiBGcmFtZTo6YXBwcm94aW1hdGVOb2Rl QXRWaWV3cG9ydExvY2F0aW9uTGVnYWN5KGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TAogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9OwogCi0gICAgcmV0dXJuIHF1YWxpZnlpbmdOb2Rl QXRWaWV3cG9ydExvY2F0aW9uKHZpZXdwb3J0TG9jYXRpb24sIGFkanVzdGVkVmlld3BvcnRMb2Nh dGlvbiwgV1RGTW92ZShhbmNlc3RvclJlc3BvbmRpbmdUb0NsaWNrRXZlbnRzKSwgdHJ1ZSk7Cisg ICAgcmV0dXJuIHF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvY2F0aW9uKHZpZXdwb3J0TG9jYXRp b24sIGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbiwgV1RGTW92ZShhbmNlc3RvclJlc3BvbmRpbmdU b0NsaWNrRXZlbnRzKSwgU2hvdWxkQXBwcm94aW1hdGU6Olllcyk7CiB9CiAKLU5vZGUqIEZyYW1l Ojpub2RlUmVzcG9uZGluZ1RvQ2xpY2tFdmVudHMoY29uc3QgRmxvYXRQb2ludCYgdmlld3BvcnRM b2NhdGlvbiwgRmxvYXRQb2ludCYgYWRqdXN0ZWRWaWV3cG9ydExvY2F0aW9uLCBTZWN1cml0eU9y aWdpbiogc2VjdXJpdHlPcmlnaW4pCitzdGF0aWMgaW5saW5lIE5vZGVRdWFsaWZpZXIgYW5jZXN0 b3JSZXNwb25kaW5nVG9DbGlja0V2ZW50c05vZGVRdWFsaWZpZXIoU2VjdXJpdHlPcmlnaW4qIHNl Y3VyaXR5T3JpZ2luID0gbnVsbHB0cikKIHsKLSAgICBhdXRvJiYgYW5jZXN0b3JSZXNwb25kaW5n VG9DbGlja0V2ZW50cyA9IFtzZWN1cml0eU9yaWdpbl0oY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0 VGVzdFJlc3VsdCwgTm9kZSogdGVybWluYXRpb25Ob2RlLCBJbnRSZWN0KiBub2RlQm91bmRzKSAt PiBOb2RlKiB7CisgICAgcmV0dXJuIFtzZWN1cml0eU9yaWdpbl0oY29uc3QgSGl0VGVzdFJlc3Vs dCYgaGl0VGVzdFJlc3VsdCwgTm9kZSogdGVybWluYXRpb25Ob2RlLCBJbnRSZWN0KiBub2RlQm91 bmRzKSAtPiBOb2RlKiB7CiAgICAgICAgIGlmIChub2RlQm91bmRzKQogICAgICAgICAgICAgKm5v ZGVCb3VuZHMgPSBJbnRSZWN0KCk7CiAKQEAgLTQ3OCw4ICs0ODIsMTEgQEAgTm9kZSogRnJhbWU6 Om5vZGVSZXNwb25kaW5nVG9DbGlja0V2ZW50cyhjb25zdCBGbG9hdFBvaW50JiB2aWV3cG9ydExv Y2F0aW9uLCBGbG8KIAogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9OworfQogCi0gICAg cmV0dXJuIHF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvY2F0aW9uKHZpZXdwb3J0TG9jYXRpb24s IGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbiwgV1RGTW92ZShhbmNlc3RvclJlc3BvbmRpbmdUb0Ns aWNrRXZlbnRzKSwgdHJ1ZSk7CitOb2RlKiBGcmFtZTo6bm9kZVJlc3BvbmRpbmdUb0NsaWNrRXZl bnRzKGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpb24sIEZsb2F0UG9pbnQmIGFkanVz dGVkVmlld3BvcnRMb2NhdGlvbiwgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQorewor ICAgIHJldHVybiBxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbih2aWV3cG9ydExvY2F0 aW9uLCBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24sIGFuY2VzdG9yUmVzcG9uZGluZ1RvQ2xpY2tF dmVudHNOb2RlUXVhbGlmaWVyKHNlY3VyaXR5T3JpZ2luKSwgU2hvdWxkQXBwcm94aW1hdGU6Olll cyk7CiB9CiAKIE5vZGUqIEZyYW1lOjpub2RlUmVzcG9uZGluZ1RvRG91YmxlQ2xpY2tFdmVudChj b25zdCBGbG9hdFBvaW50JiB2aWV3cG9ydExvY2F0aW9uLCBGbG9hdFBvaW50JiBhZGp1c3RlZFZp ZXdwb3J0TG9jYXRpb24pCkBAIC01MDYsNyArNTEzLDEyIEBAIE5vZGUqIEZyYW1lOjpub2RlUmVz cG9uZGluZ1RvRG91YmxlQ2xpY2tFdmVudChjb25zdCBGbG9hdFBvaW50JiB2aWV3cG9ydExvY2F0 aW9uCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH07CiAKLSAgICByZXR1cm4gcXVhbGlm eWluZ05vZGVBdFZpZXdwb3J0TG9jYXRpb24odmlld3BvcnRMb2NhdGlvbiwgYWRqdXN0ZWRWaWV3 cG9ydExvY2F0aW9uLCBXVEZNb3ZlKGFuY2VzdG9yUmVzcG9uZGluZ1RvRG91YmxlQ2xpY2tFdmVu dCksIHRydWUpOworICAgIHJldHVybiBxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbih2 aWV3cG9ydExvY2F0aW9uLCBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24sIFdURk1vdmUoYW5jZXN0 b3JSZXNwb25kaW5nVG9Eb3VibGVDbGlja0V2ZW50KSwgU2hvdWxkQXBwcm94aW1hdGU6Olllcyk7 Cit9CisKK05vZGUqIEZyYW1lOjpub2RlUmVzcG9uZGluZ1RvSW50ZXJhY3Rpb24oY29uc3QgRmxv YXRQb2ludCYgdmlld3BvcnRMb2NhdGlvbiwgRmxvYXRQb2ludCYgYWRqdXN0ZWRWaWV3cG9ydExv Y2F0aW9uKQoreworICAgIHJldHVybiBxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbih2 aWV3cG9ydExvY2F0aW9uLCBhZGp1c3RlZFZpZXdwb3J0TG9jYXRpb24sIGFuY2VzdG9yUmVzcG9u ZGluZ1RvQ2xpY2tFdmVudHNOb2RlUXVhbGlmaWVyKCksIFNob3VsZEFwcHJveGltYXRlOjpZZXMs IFNob3VsZEZpbmRSb290RWRpdGFibGVFbGVtZW50OjpObyk7CiB9CiAKIE5vZGUqIEZyYW1lOjpu b2RlUmVzcG9uZGluZ1RvU2Nyb2xsV2hlZWxFdmVudHMoY29uc3QgRmxvYXRQb2ludCYgdmlld3Bv cnRMb2NhdGlvbikKQEAgLTUzOSw3ICs1NTEsNyBAQCBOb2RlKiBGcmFtZTo6bm9kZVJlc3BvbmRp bmdUb1Njcm9sbFdoZWVsRXZlbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHZpZXdwb3J0TG9jYXRpbwog ICAgIH07CiAKICAgICBGbG9hdFBvaW50IGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbjsKLSAgICBy ZXR1cm4gcXVhbGlmeWluZ05vZGVBdFZpZXdwb3J0TG9jYXRpb24odmlld3BvcnRMb2NhdGlvbiwg YWRqdXN0ZWRWaWV3cG9ydExvY2F0aW9uLCBXVEZNb3ZlKGFuY2VzdG9yUmVzcG9uZGluZ1RvU2Ny b2xsV2hlZWxFdmVudHMpLCBmYWxzZSk7CisgICAgcmV0dXJuIHF1YWxpZnlpbmdOb2RlQXRWaWV3 cG9ydExvY2F0aW9uKHZpZXdwb3J0TG9jYXRpb24sIGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbiwg V1RGTW92ZShhbmNlc3RvclJlc3BvbmRpbmdUb1Njcm9sbFdoZWVsRXZlbnRzKSwgU2hvdWxkQXBw cm94aW1hdGU6Ok5vKTsKIH0KIAogaW50IEZyYW1lOjpwcmVmZXJyZWRIZWlnaHQoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQppbmRleCA3MDg5MDc3NTczY2ZiMTBmYzljZjY1NzQ0OTkxZmMxODdiODk0YmE5Li5jN2IzNDlj OWZkOWY4Y2MzZjhiYzZlMGZlNzkxMjE0YTcxYzYxMmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjgxMyw4ICsyODEz LDE0IEBAIHZvaWQgV2ViUGFnZTo6cmVxdWVzdFBvc2l0aW9uSW5mb3JtYXRpb24oY29uc3QgSW50 ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmIHJlCiAKIHZvaWQgV2ViUGFnZTo6c3RhcnRJbnRl cmFjdGlvbldpdGhFbGVtZW50QXRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9p bnQpCiB7CisgICAgLy8gRklYTUU6IFdlJ3ZlIGFscmVhZHkgcGVyZm9ybWVkIGEgaGl0IHRlc3Qg d2hlbiB0aGUgbG9uZy1wcmVzcyBnZXN0dXJlIHdhcyByZWNvZ25pemVkIGFuZCB3ZQorICAgIC8v IHVzZWQgdGhhdCByZXN1bHQgdG8gZ2VuZXJhdGUgdGhlIHRhcmdldGVkIHByZXZpZXcsIGJ1dCBu b3cgd2UgYXJlIGhpdCB0ZXN0aW5nIGFnYWluIGluIG9yZGVyCisgICAgLy8gdG8gcGVyZm9ybSB0 aGUgc2VsZWN0ZWQgYWN0aW9uLiBTaW5jZSBhbiBhcmJpdHJhcnkgYW1vdW50IG9mIHRpbWUgY2Fu IGVsYXBzZSBiZXR3ZWVuCisgICAgLy8gZ2VuZXJhdGluZyB0aGUgdGFyZ2V0ZWQgcHJldmlldyBh bmQgdGhlIHVzZXIgc2VsZWN0aW5nIGFuIGFjdGlvbiwgaXQncyBwb3NzaWJsZSB0aGF0IHRoaXMK KyAgICAvLyBzZWNvbmQgaGl0IHRlc3Qgd2lsbCBmaW5kIGEgZGlmZmVyZW50IGVsZW1lbnQgdGhh biB0aGUgZmlyc3Qgb25lLCBsZWFkaW5nIHRvIGJ1Z3MgbGlrZQorICAgIC8vIDxyZGFyOi8vcHJv YmxlbS81NDcyMzEzMT4uIFdlIHNob3VsZCByZS11c2UgdGhlIHJlc3VsdHMgb2YgdGhlIGZpcnN0 IGhpdCB0ZXN0IGluc3RlYWQuCiAgICAgRmxvYXRQb2ludCBhZGp1c3RlZFBvaW50OwotICAgIG1f aW50ZXJhY3Rpb25Ob2RlID0gbV9wYWdlLT5tYWluRnJhbWUoKS5ub2RlUmVzcG9uZGluZ1RvQ2xp Y2tFdmVudHMocG9pbnQsIGFkanVzdGVkUG9pbnQpOworICAgIG1faW50ZXJhY3Rpb25Ob2RlID0g bV9wYWdlLT5tYWluRnJhbWUoKS5ub2RlUmVzcG9uZGluZ1RvSW50ZXJhY3Rpb24ocG9pbnQsIGFk anVzdGVkUG9pbnQpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnN0b3BJbnRlcmFjdGlvbigpCg==