174307 2017-07-09 23:47:01 -0700 [WK2] Action sheets for links fail to present in WebKit2 PDF view 2017-07-10 09:32:51 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin commit-queue thorton oldest_to_newest 1326940 0 wenson_hsieh 2017-07-09 23:47:01 -0700 <rdar://problem/31412128> 1326941 1 314964 wenson_hsieh 2017-07-09 23:54:57 -0700 Created attachment 314964 Patch 1326942 2 314964 thorton 2017-07-09 23:57:54 -0700 Comment on attachment 314964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314964&action=review > Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:374 > + if (![_interactionSheet presentSheet:computePresentationStyleForView(_view.getAutoreleased(), _positionInformation.value(), _elementInfo.get())]) Drop the needless “compute” prefix and I’m sold :) 1326943 3 314964 wenson_hsieh 2017-07-10 00:00:15 -0700 Comment on attachment 314964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314964&action=review Thanks! >> Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:374 >> + if (![_interactionSheet presentSheet:computePresentationStyleForView(_view.getAutoreleased(), _positionInformation.value(), _elementInfo.get())]) > > Drop the needless “compute” prefix and I’m sold :) 👍 1326945 4 314966 wenson_hsieh 2017-07-10 00:26:13 -0700 Created attachment 314966 Patch for landing 1326957 5 314966 commit-queue 2017-07-10 03:04:56 -0700 Comment on attachment 314966 Patch for landing Clearing flags on attachment: 314966 Committed r219287: <http://trac.webkit.org/changeset/219287> 314964 2017-07-09 23:54:57 -0700 2017-07-09 23:57:54 -0700 Patch bug-174307-20170709235456.patch text/plain 5174 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGY0ZjY5ZDlkYjJlNGJj ZjljZDk1YzViMWVjZjllMzU3ODYxMGEyZi4uMGRjOGNjN2YzNGM3ZjUwMzZjNjBkZTA5ZDY2MWJh NWYzYTUxOWI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA3LTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFjdGlv biBzaGVldHMgZm9yIGxpbmtzIGZhaWwgdG8gcHJlc2VudCBpbiBXZWJLaXQyIFBERiB2aWV3Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQzMDcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMxNDEyMTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgcHJlc2VudGluZyBhbiBhY3Rpb24g c2hlZXQgZm9yIGEgbGluayBhbHdheXMgdXNlcyB0aGUgV0tBY3Rpb25TaGVldFByZXNlbnRBdENs b3Nlc3RJbmRpY2F0b3JSZWN0CisgICAgICAgIGNvZGVwYXRoLCB3aGljaCByZXF1aXJlcyB0ZXh0 IGluZGljYXRvciBkYXRhIGZvciB0aGUgbGluay4gSG93ZXZlciwgd2hlbiBzaG93aW5nIGFuIGFj dGlvbiBzaGVldCBmb3IgYSBsaW5rIHZpYQorICAgICAgICBXS1BERlZpZXcsIGEgdGV4dCBpbmRp Y2F0b3IgZm9yIHRoZSBsaW5rIGlzIG5vdCBpbmNsdWRlZCwgc28gdGhlIHBvcG92ZXIgcmVjdCBl bmRzIHVwIGJlaW5nIGFuIGVtcHR5IHJlY3QgYXQgdGhlCisgICAgICAgIG9yaWdpbiwgd2hpY2gg Y2F1c2VzIHVzIHRvIGJhaWwgZnJvbSBwcmVzZW50aW5nIHRoZSBwb3BvdmVyLgorCisgICAgICAg IFRvIGFkZHJlc3MgdGhpcywgd2UgdHdlYWsgb3VyIGhldXJpc3RpYyBmb3IgZGV0ZXJtaW5pbmcg d2hpY2ggYWN0aW9uIHNoZWV0IHByZXNlbnRhdGlvbiBzdHlsZSB0byB1c2UsIHNvIHRoYXQgd2UK KyAgICAgICAgb25seSB1c2UgdGhlIGNsb3Nlc3QgaW5kaWNhdG9yIHJlY3QgZm9yIGEgbGluayBp ZiB0aGUgdGV4dCBpbmRpY2F0b3IgZGF0YSBpcyBhbHNvIHByZXNlbnQgKG90aGVyd2lzZSwgd2Ug ZmFsbAorICAgICAgICBiYWNrIHRvIHVzaW5nIHRoZSBlbGVtZW50IHJlY3QpLiBBbGwgb3RoZXIg YmVoYXZpb3IgaXMgdGhlIHNhbWUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQubW06CisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgc2hv d0ltYWdlU2hlZXRdKToKKyAgICAgICAgKGNvbXB1dGVQcmVzZW50YXRpb25TdHlsZUZvclZpZXcp OgorCisgICAgICAgIFJlZmFjdG9yIF9zaG91bGRQcmVzZW50QXRUb3VjaExvY2F0aW9uRm9yRWxl bWVudFJlY3QgaW50byBjb21wdXRlUHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3LCBhIHN0YXRpYyBm dW5jdGlvbgorICAgICAgICB0aGF0IHJldHVybnMgYSBXS0FjdGlvblNoZWV0UHJlc2VudGF0aW9u U3R5bGUuCisKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93TGlua1NoZWV0 XSk6CisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgX3Nob3VsZFByZXNlbnRBdFRv dWNoTG9jYXRpb25Gb3JFbGVtZW50UmVjdDpdKTogRGVsZXRlZC4KKwogMjAxNy0wNy0wNiAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCBmaXggdGhlIGludGVybmFsIGlPUyAxMSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IGZjYmRhZTY3 MTRlMTk0ODZlNmY1ZDU4MGFlY2M4ZGYyZGM4N2I5NTcuLjZkZGE1NzYxNTk3NTFhYzlmZmMwM2Uy NWFkMjJkY2I2OTU5MGM5ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KQEAgLTM3MSw3ICszNzEsNyBAQCAtICh2 b2lkKXNob3dJbWFnZVNoZWV0CiAKICAgICAgICAgX2VsZW1lbnRJbmZvID0gV1RGTW92ZShlbGVt ZW50SW5mbyk7CiAKLSAgICAgICAgaWYgKCFbX2ludGVyYWN0aW9uU2hlZXQgcHJlc2VudFNoZWV0 OltzZWxmIF9zaG91bGRQcmVzZW50QXRUb3VjaExvY2F0aW9uRm9yRWxlbWVudFJlY3Q6ZWxlbWVu dEJvdW5kc10gPyBXS0FjdGlvblNoZWV0UHJlc2VudEF0VG91Y2hMb2NhdGlvbiA6IFdLQWN0aW9u U2hlZXRQcmVzZW50QXRFbGVtZW50UmVjdF0pCisgICAgICAgIGlmICghW19pbnRlcmFjdGlvblNo ZWV0IHByZXNlbnRTaGVldDpjb21wdXRlUHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3KF92aWV3Lmdl dEF1dG9yZWxlYXNlZCgpLCBfcG9zaXRpb25JbmZvcm1hdGlvbi52YWx1ZSgpLCBfZWxlbWVudElu Zm8uZ2V0KCkpXSkKICAgICAgICAgICAgIFtzZWxmIGNsZWFudXBTaGVldF07CiAgICAgfTsKIApA QCAtMzkzLDEwICszOTMsOSBAQCAtICh2b2lkKXNob3dJbWFnZVNoZWV0CiAgICAgc2hvd0ltYWdl U2hlZXRXaXRoQWx0ZXJuYXRlVVJMQmxvY2sobmlsLCBuaWwpOwogfQogCi0tIChCT09MKV9zaG91 bGRQcmVzZW50QXRUb3VjaExvY2F0aW9uRm9yRWxlbWVudFJlY3Q6KENHUmVjdCllbGVtZW50UmVj dAorc3RhdGljIFdLQWN0aW9uU2hlZXRQcmVzZW50YXRpb25TdHlsZSBjb21wdXRlUHJlc2VudGF0 aW9uU3R5bGVGb3JWaWV3KFVJVmlldyAqdmlldywgY29uc3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24mIHBvc2l0aW9uSW5mbywgX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKmVsZW1l bnRJbmZvKQogewotICAgIFVJVmlldyAqdmlldyA9IF92aWV3LmdldEF1dG9yZWxlYXNlZCgpOwot ICAgIGF1dG8gYXBwYXJlbnRFbGVtZW50UmVjdCA9IFt2aWV3IGNvbnZlcnRSZWN0OmVsZW1lbnRS ZWN0IHRvVmlldzp2aWV3LndpbmRvd107CisgICAgYXV0byBhcHBhcmVudEVsZW1lbnRSZWN0ID0g W3ZpZXcgY29udmVydFJlY3Q6cG9zaXRpb25JbmZvLmJvdW5kcyB0b1ZpZXc6dmlldy53aW5kb3dd OwogICAgIGF1dG8gd2luZG93UmVjdCA9IHZpZXcud2luZG93LmJvdW5kczsKICAgICBhcHBhcmVu dEVsZW1lbnRSZWN0ID0gQ0dSZWN0SW50ZXJzZWN0aW9uKGFwcGFyZW50RWxlbWVudFJlY3QsIHdp bmRvd1JlY3QpOwogCkBAIC00MDgsNyArNDA3LDEzIEBAIC0gKEJPT0wpX3Nob3VsZFByZXNlbnRB dFRvdWNoTG9jYXRpb25Gb3JFbGVtZW50UmVjdDooQ0dSZWN0KWVsZW1lbnRSZWN0CiAgICAgLy8g SWYgYXQgbGVhc3QgdGhpcyBtdWNoIG9mIHRoZSB3aW5kb3cgaXMgYXZhaWxhYmxlIGZvciB0aGUg cG9wb3ZlciB0byBkcmF3IGluLCB0aGVuIHRhcmdldCB0aGUgZWxlbWVudCByZWN0IHdoZW4gcHJl c2VudGluZyB0aGUgYWN0aW9uIG1lbnUgcG9wb3Zlci4KICAgICAvLyBPdGhlcndpc2UsIHRoZXJl IGlzIG5vdCBlbm91Z2ggc3BhY2UgdG8gcG9zaXRpb24gdGhlIHBvcG92ZXIgYXJvdW5kIHRoZSBl bGVtZW50LCBzbyByZXZlcnQgdG8gdXNpbmcgdGhlIHRvdWNoIGxvY2F0aW9uIGluc3RlYWQuCiAg ICAgc3RhdGljIGNvbnN0IENHRmxvYXQgbWluaW11bUF2YWlsYWJsZVdpZHRoT3JIZWlnaHRSYXRp byA9IDAuNDsKLSAgICByZXR1cm4gc3RkOjptYXgobGVmdEluc2V0LCByaWdodEluc2V0KSA8PSBt aW5pbXVtQXZhaWxhYmxlV2lkdGhPckhlaWdodFJhdGlvICogQ0dSZWN0R2V0V2lkdGgod2luZG93 UmVjdCkgJiYgc3RkOjptYXgodG9wSW5zZXQsIGJvdHRvbUluc2V0KSA8PSBtaW5pbXVtQXZhaWxh YmxlV2lkdGhPckhlaWdodFJhdGlvICogQ0dSZWN0R2V0SGVpZ2h0KHdpbmRvd1JlY3QpOworICAg IGlmIChzdGQ6Om1heChsZWZ0SW5zZXQsIHJpZ2h0SW5zZXQpIDw9IG1pbmltdW1BdmFpbGFibGVX aWR0aE9ySGVpZ2h0UmF0aW8gKiBDR1JlY3RHZXRXaWR0aCh3aW5kb3dSZWN0KSAmJiBzdGQ6Om1h eCh0b3BJbnNldCwgYm90dG9tSW5zZXQpIDw9IG1pbmltdW1BdmFpbGFibGVXaWR0aE9ySGVpZ2h0 UmF0aW8gKiBDR1JlY3RHZXRIZWlnaHQod2luZG93UmVjdCkpCisgICAgICAgIHJldHVybiBXS0Fj dGlvblNoZWV0UHJlc2VudEF0VG91Y2hMb2NhdGlvbjsKKworICAgIGlmIChlbGVtZW50SW5mby50 eXBlID09IF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlTGluayAmJiBwb3NpdGlvbkluZm8ubGlua0lu ZGljYXRvci50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzLnNpemUoKSkKKyAgICAg ICAgcmV0dXJuIFdLQWN0aW9uU2hlZXRQcmVzZW50QXRDbG9zZXN0SW5kaWNhdG9yUmVjdDsKKwor ICAgIHJldHVybiBXS0FjdGlvblNoZWV0UHJlc2VudEF0RWxlbWVudFJlY3Q7CiB9CiAKIC0gKHZv aWQpX2FwcGVuZE9wZW5BY3Rpb25zRm9yVVJMOihOU1VSTCAqKXVybCBhY3Rpb25zOihOU011dGFi bGVBcnJheSAqKWRlZmF1bHRBY3Rpb25zIGVsZW1lbnRJbmZvOihfV0tBY3RpdmF0ZWRFbGVtZW50 SW5mbyAqKWVsZW1lbnRJbmZvCkBAIC01MzAsNyArNTM1LDcgQEAgLSAodm9pZClzaG93TGlua1No ZWV0CiAKICAgICBfZWxlbWVudEluZm8gPSBXVEZNb3ZlKGVsZW1lbnRJbmZvKTsKIAotICAgIGlm ICghW19pbnRlcmFjdGlvblNoZWV0IHByZXNlbnRTaGVldDpbc2VsZiBfc2hvdWxkUHJlc2VudEF0 VG91Y2hMb2NhdGlvbkZvckVsZW1lbnRSZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLT5ib3VuZHNd ID8gV0tBY3Rpb25TaGVldFByZXNlbnRBdFRvdWNoTG9jYXRpb24gOiBXS0FjdGlvblNoZWV0UHJl c2VudEF0Q2xvc2VzdEluZGljYXRvclJlY3RdKQorICAgIGlmICghW19pbnRlcmFjdGlvblNoZWV0 IHByZXNlbnRTaGVldDpjb21wdXRlUHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3KF92aWV3LmdldEF1 dG9yZWxlYXNlZCgpLCBfcG9zaXRpb25JbmZvcm1hdGlvbi52YWx1ZSgpLCBfZWxlbWVudEluZm8u Z2V0KCkpXSkKICAgICAgICAgW3NlbGYgY2xlYW51cFNoZWV0XTsKIH0KIAo= 314966 2017-07-10 00:26:13 -0700 2017-07-10 03:04:56 -0700 Patch for landing bug-174307-20170710002613.patch text/plain 5135 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGY0ZjY5ZDlkYjJlNGJj ZjljZDk1YzViMWVjZjllMzU3ODYxMGEyZi4uN2UxOGYxYzQ4NDc0MjJhYTYzZGZjZjkyNjJjZjkx OTEwYTBhZDFiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA3LTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFjdGlv biBzaGVldHMgZm9yIGxpbmtzIGZhaWwgdG8gcHJlc2VudCBpbiBXZWJLaXQyIFBERiB2aWV3Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQzMDcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMxNDEyMTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRp bSBIb3J0b24uCisKKyAgICAgICAgQ3VycmVudGx5LCBwcmVzZW50aW5nIGFuIGFjdGlvbiBzaGVl dCBmb3IgYSBsaW5rIGFsd2F5cyB1c2VzIHRoZSBXS0FjdGlvblNoZWV0UHJlc2VudEF0Q2xvc2Vz dEluZGljYXRvclJlY3QKKyAgICAgICAgY29kZXBhdGgsIHdoaWNoIHJlcXVpcmVzIHRleHQgaW5k aWNhdG9yIGRhdGEgZm9yIHRoZSBsaW5rLiBIb3dldmVyLCB3aGVuIHNob3dpbmcgYW4gYWN0aW9u IHNoZWV0IGZvciBhIGxpbmsgdmlhCisgICAgICAgIFdLUERGVmlldywgYSB0ZXh0IGluZGljYXRv ciBmb3IgdGhlIGxpbmsgaXMgbm90IGluY2x1ZGVkLCBzbyB0aGUgcG9wb3ZlciByZWN0IGVuZHMg dXAgYmVpbmcgYW4gZW1wdHkgcmVjdCBhdCB0aGUKKyAgICAgICAgb3JpZ2luLCB3aGljaCBjYXVz ZXMgdXMgdG8gYmFpbCBmcm9tIHByZXNlbnRpbmcgdGhlIHBvcG92ZXIuCisKKyAgICAgICAgVG8g YWRkcmVzcyB0aGlzLCB3ZSB0d2VhayBvdXIgaGV1cmlzdGljIGZvciBkZXRlcm1pbmluZyB3aGlj aCBhY3Rpb24gc2hlZXQgcHJlc2VudGF0aW9uIHN0eWxlIHRvIHVzZSwgc28gdGhhdCB3ZQorICAg ICAgICBvbmx5IHVzZSB0aGUgY2xvc2VzdCBpbmRpY2F0b3IgcmVjdCBmb3IgYSBsaW5rIGlmIHRo ZSB0ZXh0IGluZGljYXRvciBkYXRhIGlzIGFsc28gcHJlc2VudCAob3RoZXJ3aXNlLCB3ZSBmYWxs CisgICAgICAgIGJhY2sgdG8gdXNpbmcgdGhlIGVsZW1lbnQgcmVjdCkuIEFsbCBvdGhlciBiZWhh dmlvciBpcyB0aGUgc2FtZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVl dEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93SW1h Z2VTaGVldF0pOgorICAgICAgICAocHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3KToKKworICAgICAg ICBSZWZhY3RvciBfc2hvdWxkUHJlc2VudEF0VG91Y2hMb2NhdGlvbkZvckVsZW1lbnRSZWN0IGlu dG8gcHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3LCBhIHN0YXRpYyBmdW5jdGlvbiB0aGF0CisgICAg ICAgIHJldHVybnMgYSBXS0FjdGlvblNoZWV0UHJlc2VudGF0aW9uU3R5bGUuCisKKyAgICAgICAg KC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93TGlua1NoZWV0XSk6CisgICAgICAgICgtW1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQgX3Nob3VsZFByZXNlbnRBdFRvdWNoTG9jYXRpb25Gb3JFbGVt ZW50UmVjdDpdKTogRGVsZXRlZC4KKwogMjAxNy0wNy0wNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggdGhlIGludGVybmFs IGlPUyAxMSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IGZjYmRhZTY3MTRlMTk0ODZlNmY1ZDU4MGFl Y2M4ZGYyZGM4N2I5NTcuLmMzNDg2MWM4NmI4ZjYzMzE5OWRjODMwZGNkYWI4MDNkMWIxMTcyZTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFz c2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQubW0KQEAgLTM3MSw3ICszNzEsNyBAQCAtICh2b2lkKXNob3dJbWFnZVNoZWV0 CiAKICAgICAgICAgX2VsZW1lbnRJbmZvID0gV1RGTW92ZShlbGVtZW50SW5mbyk7CiAKLSAgICAg ICAgaWYgKCFbX2ludGVyYWN0aW9uU2hlZXQgcHJlc2VudFNoZWV0OltzZWxmIF9zaG91bGRQcmVz ZW50QXRUb3VjaExvY2F0aW9uRm9yRWxlbWVudFJlY3Q6ZWxlbWVudEJvdW5kc10gPyBXS0FjdGlv blNoZWV0UHJlc2VudEF0VG91Y2hMb2NhdGlvbiA6IFdLQWN0aW9uU2hlZXRQcmVzZW50QXRFbGVt ZW50UmVjdF0pCisgICAgICAgIGlmICghW19pbnRlcmFjdGlvblNoZWV0IHByZXNlbnRTaGVldDpw cmVzZW50YXRpb25TdHlsZUZvclZpZXcoX3ZpZXcuZ2V0QXV0b3JlbGVhc2VkKCksIF9wb3NpdGlv bkluZm9ybWF0aW9uLnZhbHVlKCksIF9lbGVtZW50SW5mby5nZXQoKSldKQogICAgICAgICAgICAg W3NlbGYgY2xlYW51cFNoZWV0XTsKICAgICB9OwogCkBAIC0zOTMsMTAgKzM5Myw5IEBAIC0gKHZv aWQpc2hvd0ltYWdlU2hlZXQKICAgICBzaG93SW1hZ2VTaGVldFdpdGhBbHRlcm5hdGVVUkxCbG9j ayhuaWwsIG5pbCk7CiB9CiAKLS0gKEJPT0wpX3Nob3VsZFByZXNlbnRBdFRvdWNoTG9jYXRpb25G b3JFbGVtZW50UmVjdDooQ0dSZWN0KWVsZW1lbnRSZWN0CitzdGF0aWMgV0tBY3Rpb25TaGVldFBy ZXNlbnRhdGlvblN0eWxlIHByZXNlbnRhdGlvblN0eWxlRm9yVmlldyhVSVZpZXcgKnZpZXcsIGNv bnN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJiBwb3NpdGlvbkluZm8sIF9XS0Fj dGl2YXRlZEVsZW1lbnRJbmZvICplbGVtZW50SW5mbykKIHsKLSAgICBVSVZpZXcgKnZpZXcgPSBf dmlldy5nZXRBdXRvcmVsZWFzZWQoKTsKLSAgICBhdXRvIGFwcGFyZW50RWxlbWVudFJlY3QgPSBb dmlldyBjb252ZXJ0UmVjdDplbGVtZW50UmVjdCB0b1ZpZXc6dmlldy53aW5kb3ddOworICAgIGF1 dG8gYXBwYXJlbnRFbGVtZW50UmVjdCA9IFt2aWV3IGNvbnZlcnRSZWN0OnBvc2l0aW9uSW5mby5i b3VuZHMgdG9WaWV3OnZpZXcud2luZG93XTsKICAgICBhdXRvIHdpbmRvd1JlY3QgPSB2aWV3Lndp bmRvdy5ib3VuZHM7CiAgICAgYXBwYXJlbnRFbGVtZW50UmVjdCA9IENHUmVjdEludGVyc2VjdGlv bihhcHBhcmVudEVsZW1lbnRSZWN0LCB3aW5kb3dSZWN0KTsKIApAQCAtNDA4LDcgKzQwNywxMyBA QCAtIChCT09MKV9zaG91bGRQcmVzZW50QXRUb3VjaExvY2F0aW9uRm9yRWxlbWVudFJlY3Q6KENH UmVjdCllbGVtZW50UmVjdAogICAgIC8vIElmIGF0IGxlYXN0IHRoaXMgbXVjaCBvZiB0aGUgd2lu ZG93IGlzIGF2YWlsYWJsZSBmb3IgdGhlIHBvcG92ZXIgdG8gZHJhdyBpbiwgdGhlbiB0YXJnZXQg dGhlIGVsZW1lbnQgcmVjdCB3aGVuIHByZXNlbnRpbmcgdGhlIGFjdGlvbiBtZW51IHBvcG92ZXIu CiAgICAgLy8gT3RoZXJ3aXNlLCB0aGVyZSBpcyBub3QgZW5vdWdoIHNwYWNlIHRvIHBvc2l0aW9u IHRoZSBwb3BvdmVyIGFyb3VuZCB0aGUgZWxlbWVudCwgc28gcmV2ZXJ0IHRvIHVzaW5nIHRoZSB0 b3VjaCBsb2NhdGlvbiBpbnN0ZWFkLgogICAgIHN0YXRpYyBjb25zdCBDR0Zsb2F0IG1pbmltdW1B dmFpbGFibGVXaWR0aE9ySGVpZ2h0UmF0aW8gPSAwLjQ7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGxl ZnRJbnNldCwgcmlnaHRJbnNldCkgPD0gbWluaW11bUF2YWlsYWJsZVdpZHRoT3JIZWlnaHRSYXRp byAqIENHUmVjdEdldFdpZHRoKHdpbmRvd1JlY3QpICYmIHN0ZDo6bWF4KHRvcEluc2V0LCBib3R0 b21JbnNldCkgPD0gbWluaW11bUF2YWlsYWJsZVdpZHRoT3JIZWlnaHRSYXRpbyAqIENHUmVjdEdl dEhlaWdodCh3aW5kb3dSZWN0KTsKKyAgICBpZiAoc3RkOjptYXgobGVmdEluc2V0LCByaWdodElu c2V0KSA8PSBtaW5pbXVtQXZhaWxhYmxlV2lkdGhPckhlaWdodFJhdGlvICogQ0dSZWN0R2V0V2lk dGgod2luZG93UmVjdCkgJiYgc3RkOjptYXgodG9wSW5zZXQsIGJvdHRvbUluc2V0KSA8PSBtaW5p bXVtQXZhaWxhYmxlV2lkdGhPckhlaWdodFJhdGlvICogQ0dSZWN0R2V0SGVpZ2h0KHdpbmRvd1Jl Y3QpKQorICAgICAgICByZXR1cm4gV0tBY3Rpb25TaGVldFByZXNlbnRBdFRvdWNoTG9jYXRpb247 CisKKyAgICBpZiAoZWxlbWVudEluZm8udHlwZSA9PSBfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUxp bmsgJiYgcG9zaXRpb25JbmZvLmxpbmtJbmRpY2F0b3IudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RD b29yZGluYXRlcy5zaXplKCkpCisgICAgICAgIHJldHVybiBXS0FjdGlvblNoZWV0UHJlc2VudEF0 Q2xvc2VzdEluZGljYXRvclJlY3Q7CisKKyAgICByZXR1cm4gV0tBY3Rpb25TaGVldFByZXNlbnRB dEVsZW1lbnRSZWN0OwogfQogCiAtICh2b2lkKV9hcHBlbmRPcGVuQWN0aW9uc0ZvclVSTDooTlNV UkwgKil1cmwgYWN0aW9uczooTlNNdXRhYmxlQXJyYXkgKilkZWZhdWx0QWN0aW9ucyBlbGVtZW50 SW5mbzooX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50SW5mbwpAQCAtNTMwLDcgKzUz NSw3IEBAIC0gKHZvaWQpc2hvd0xpbmtTaGVldAogCiAgICAgX2VsZW1lbnRJbmZvID0gV1RGTW92 ZShlbGVtZW50SW5mbyk7CiAKLSAgICBpZiAoIVtfaW50ZXJhY3Rpb25TaGVldCBwcmVzZW50U2hl ZXQ6W3NlbGYgX3Nob3VsZFByZXNlbnRBdFRvdWNoTG9jYXRpb25Gb3JFbGVtZW50UmVjdDpfcG9z aXRpb25JbmZvcm1hdGlvbi0+Ym91bmRzXSA/IFdLQWN0aW9uU2hlZXRQcmVzZW50QXRUb3VjaExv Y2F0aW9uIDogV0tBY3Rpb25TaGVldFByZXNlbnRBdENsb3Nlc3RJbmRpY2F0b3JSZWN0XSkKKyAg ICBpZiAoIVtfaW50ZXJhY3Rpb25TaGVldCBwcmVzZW50U2hlZXQ6cHJlc2VudGF0aW9uU3R5bGVG b3JWaWV3KF92aWV3LmdldEF1dG9yZWxlYXNlZCgpLCBfcG9zaXRpb25JbmZvcm1hdGlvbi52YWx1 ZSgpLCBfZWxlbWVudEluZm8uZ2V0KCkpXSkKICAgICAgICAgW3NlbGYgY2xlYW51cFNoZWV0XTsK IH0KIAo=