199038 2019-06-19 16:02:41 -0700 [iOS] Fall back to taking a UIView snapshohot for UITargetedPreviews if InteractionInformationAtPosition does not have an image 2019-06-19 17:50:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen commit-queue dino graouts thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1546263 0 aestes 2019-06-19 16:02:41 -0700 [iOS] Fall back to taking a UIView snapshohot for UITargetedPreviews if InteractionInformationAtPosition does not have an image 1546264 1 aestes 2019-06-19 16:03:23 -0700 rdar://problem/50555810 1546267 2 372498 aestes 2019-06-19 16:10:19 -0700 Created attachment 372498 Patch 1546269 3 372498 thorton 2019-06-19 16:15:24 -0700 Comment on attachment 372498 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372498&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7873 > + return adoptNS([[UITargetedPreview alloc] initWithView:snapshotView parameters:parameters.get() target:target.get()]).autorelease(); autoreleasing into a retainptr —— but why? 1546286 4 372500 aestes 2019-06-19 16:49:36 -0700 Created attachment 372500 Patch 1546329 5 372500 commit-queue 2019-06-19 17:50:36 -0700 Comment on attachment 372500 Patch Clearing flags on attachment: 372500 Committed r246622: <https://trac.webkit.org/changeset/246622> 1546330 6 commit-queue 2019-06-19 17:50:37 -0700 All reviewed patches have been landed. Closing bug. 372498 2019-06-19 16:10:19 -0700 2019-06-19 16:49:35 -0700 Patch bug-199038-20190619161018.patch text/plain 8396 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU2NGQ4OTk2OGRmODM5NDNj NWYwM2EyYmVmMmZhODdjNjgxNGViNWEuLjI4M2VjMmRmYjJjMDc1OWYzYWY4ZDZiODhjY2ZjZjFi N2I4NWM2MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDYtMTkgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEZhbGwgYmFjayB0byB0YWtp bmcgYSBVSVZpZXcgc25hcHNob2hvdCBmb3IgVUlUYXJnZXRlZFByZXZpZXdzIGlmIEludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIGRvZXMgbm90IGhhdmUgYW4gaW1hZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTAzOAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTA1NTU4MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW4gLWNvbnRleHRNZW51SW50ZXJhY3Rpb246cHJldmlld0Zvckhp Z2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlvbjogYW5kIGZyaWVuZCwgd2UKKyAgICAgICAg c2hvdWxkIGFsd2F5cyByZXR1cm4gYSBub24tbmlsIFVJVGFyZ2V0ZWRQcmV2aWV3LiBXaGVuIHdl IGRvIHJldHVybiBuaWwsIFVJS2l0IHVzZXMgdGhlIHdlYgorICAgICAgICB2aWV3IGl0c2VsZiBh cyB0aGUgc25hcHNob3QgdmlldywgY3JlYXRpbmcgYW4gdW5zaWdodGx5IGFuaW1hdGlvbi4KKwor ICAgICAgICBGb3IgY2FzZXMgd2hlcmUgd2UgZmFpbCB0byBjcmVhdGUgYSBVSVRhcmdldGVkUHJl dmlldyBmcm9tIHRoZSBpbmZvcm1hdGlvbiBpbgorICAgICAgICBJbnRlcmFjdGlvbkluZm9ybWF0 aW9uQXRQb3NpdGlvbiwgdGhpcyBwYXRjaCBmYWxscyBiYWNrIHRvIGNyZWF0aW5nIGEgVUlUYXJn ZXRlZFByZXZpZXcgd2l0aAorICAgICAgICBhIHNuYXBzaG90IHZpZXcgb2J0YWluZWQgZnJvbQor ICAgICAgICAtW1VJVmlldyByZXNpemFibGVTbmFwc2hvdFZpZXdGcm9tUmVjdDphZnRlclNjcmVl blVwZGF0ZXM6d2l0aENhcEluc2V0czpdLgorCisgICAgICAgIEFsc28gcmVuYW1lZCAtdGFyZ2V0 ZWRQcmV2aWV3IHRvIC1fZW5zdXJlVGFyZ2V0ZWRQcmV2aWV3IGFuZCBjYWNoZWQgdGhlIFVJVGFy Z2V0ZWRQcmV2aWV3CisgICAgICAgIGZvciByZXVzZSBpbiAtY29udGV4dE1lbnVJbnRlcmFjdGlv bjpwcmV2aWV3Rm9yRGlzbWlzc2luZ01lbnVXaXRoQ29uZmlndXJhdGlvbjouCisKKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoY3JlYXRl RmFsbGJhY2tUYXJnZXRlZFByZXZpZXcpOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbnN1 cmVUYXJnZXRlZFByZXZpZXddKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0TWVu dUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2 aWV3Rm9yRGlzbWlzc2luZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9uRGlkRW5kOl0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF90YXJnZXRlZFByZXZpZXddKTogUmVuYW1lZCB0byBfZW5zdXJlVGFyZ2V0 ZWRQcmV2aWV3LgorCiAyMDE5LTA2LTE5ICBBbGV4YW5kZXIgTWlraGF5bGVua28gIDxleGFsbTc2 NTlAZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtdIFBhZ2UgYmxpbmtzIGFmdGVyIG5hdmlnYXRp b24gc3dpcGUgaWYgaXQgdHJpZ2dlcmVkIFBTT04KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAzMGMwYWRiMjFh YjdjYjFkZDdkOTI4MjQ0ODEzZTYyYTMwOGM0M2Q1Li4yN2RhZGI4YTk4N2I4ZTllMDk2ZDc4YTUw OTNmYjI3ZjIzMTM5NWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC05NSw2ICs5NSw3IEBAIHN0cnVjdCBX ZWJBdXRvY29ycmVjdGlvbkNvbnRleHQ7CiBAY2xhc3MgX1VJSGlnaGxpZ2h0VmlldzsKIEBjbGFz cyBfVUlXZWJIaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplcjsKIEBjbGFzcyBVSUhv dmVyR2VzdHVyZVJlY29nbml6ZXI7CitAY2xhc3MgVUlUYXJnZXRlZFByZXZpZXc7CiBAY2xhc3Mg V2ViRXZlbnQ7CiBAY2xhc3MgV0tBY3Rpb25TaGVldEFzc2lzdGFudDsKIEBjbGFzcyBXS0NvbnRl eHRNZW51RWxlbWVudEluZm87CkBAIC0yNDksNiArMjUwLDcgQEAgc3RydWN0IFdLQXV0b0NvcnJl Y3Rpb25EYXRhIHsKICAgICBSZXRhaW5QdHI8VUlWaWV3Q29udHJvbGxlcj4gX2NvbnRleHRNZW51 TGVnYWN5UHJldmlld0NvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFVJTWVudT4gX2NvbnRleHRN ZW51TGVnYWN5TWVudTsKICAgICBCT09MIF9jb250ZXh0TWVudUhhc1JlcXVlc3RlZExlZ2FjeURh dGE7CisgICAgUmV0YWluUHRyPFVJVGFyZ2V0ZWRQcmV2aWV3PiBfY29udGV4dE1lbnVJbnRlcmFj dGlvblRhcmdldGVkUHJldmlldzsKICNlbHNlCiAgICAgUmV0YWluUHRyPFVJUHJldmlld0l0ZW1D b250cm9sbGVyPiBfcHJldmlld0l0ZW1Db250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpp bmRleCBjOGM0ZGM1YzQ2MDQ2NmI0MjdiM2FjYjkwOGM3YTRiYWQ5MWYxY2E0Li42MzEyMGU0ZDE0 YWExMzExNzg3NjBmOTQ1NmFmN2ZhYzVlMmE0OTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTc4NTks MzIgKzc4NTksNDggQEAgc3RhdGljIFJldGFpblB0cjxVSVRhcmdldGVkUHJldmlldz4gY3JlYXRl VGFyZ2V0ZWRQcmV2aWV3KFVJSW1hZ2UgKmltYWdlLCBVSVZpZXcKICAgICByZXR1cm4gYWRvcHRO UyhbW1VJVGFyZ2V0ZWRQcmV2aWV3IGFsbG9jXSBpbml0V2l0aFZpZXc6aW1hZ2VWaWV3LmdldCgp IHBhcmFtZXRlcnM6cGFyYW1ldGVycy5nZXQoKSB0YXJnZXQ6dGFyZ2V0LmdldCgpXSk7CiB9CiAK LS0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopX3RhcmdldGVkUHJldmlldworc3RhdGljIFJldGFpblB0 cjxVSVRhcmdldGVkUHJldmlldz4gY3JlYXRlRmFsbGJhY2tUYXJnZXRlZFByZXZpZXcoVUlWaWV3 ICpyb290VmlldywgVUlWaWV3ICpjb250YWluZXJWaWV3LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJl Y3QmIGZyYW1lSW5Sb290Vmlld0Nvb3JkaW5hdGVzKQogewotICAgIGlmIChfcG9zaXRpb25JbmZv cm1hdGlvbi5pc0xpbmsgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250 ZW50SW1hZ2UpIHsKLSAgICAgICAgW3NlbGYgX3N0YXJ0U3VwcHJlc3NpbmdTZWxlY3Rpb25Bc3Np c3RhbnRGb3JSZWFzb246V2ViS2l0OjpJbnRlcmFjdGlvbklzSGFwcGVuaW5nXTsKKyAgICBhdXRv IHBhcmFtZXRlcnMgPSBhZG9wdE5TKFtbVUlQcmV2aWV3UGFyYW1ldGVycyBhbGxvY10gaW5pdF0p OworICAgIFVJVmlldyAqc25hcHNob3RWaWV3ID0gW3Jvb3RWaWV3IHJlc2l6YWJsZVNuYXBzaG90 Vmlld0Zyb21SZWN0OmZyYW1lSW5Sb290Vmlld0Nvb3JkaW5hdGVzIGFmdGVyU2NyZWVuVXBkYXRl czpOTyB3aXRoQ2FwSW5zZXRzOlVJRWRnZUluc2V0c1plcm9dOwogCi0gICAgICAgIGF1dG8gaW5k aWNhdG9yID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvcjsKLSAgICAgICAgYXV0 byB0ZXh0SW5kaWNhdG9ySW1hZ2UgPSB1aUltYWdlRm9ySW1hZ2UoaW5kaWNhdG9yLmNvbnRlbnRJ bWFnZS5nZXQoKSk7CisgICAgQ0dSZWN0IGZyYW1lSW5Db250YWluZXJWaWV3Q29vcmRpbmF0ZXMg PSBbcm9vdFZpZXcgY29udmVydFJlY3Q6ZnJhbWVJblJvb3RWaWV3Q29vcmRpbmF0ZXMgdG9WaWV3 OmNvbnRhaW5lclZpZXddOworICAgIHNuYXBzaG90Vmlldy5mcmFtZSA9IGZyYW1lSW5Db250YWlu ZXJWaWV3Q29vcmRpbmF0ZXM7CiAKLSAgICAgICAgcmV0dXJuIGNyZWF0ZVRhcmdldGVkUHJldmll dyh0ZXh0SW5kaWNhdG9ySW1hZ2UuZ2V0KCksIHNlbGYsIHNlbGYudW5zY2FsZWRWaWV3LCBpbmRp Y2F0b3IudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29yZGluYXRlcywgaW5kaWNhdG9yLnRl eHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMsIFtVSUNvbG9yIGNvbG9yV2l0aENHQ29s b3I6Y2FjaGVkQ0dDb2xvcihpbmRpY2F0b3IuZXN0aW1hdGVkQmFja2dyb3VuZENvbG9yKV0pLmF1 dG9yZWxlYXNlKCk7Ci0gICAgfQorICAgIENHUG9pbnQgY2VudGVySW5Db250YWluZXJWaWV3Q29v cmRpbmF0ZXMgPSBDR1BvaW50TWFrZShDR1JlY3RHZXRNaWRYKGZyYW1lSW5Db250YWluZXJWaWV3 Q29vcmRpbmF0ZXMpLCBDR1JlY3RHZXRNaWRZKGZyYW1lSW5Db250YWluZXJWaWV3Q29vcmRpbmF0 ZXMpKTsKKyAgICBhdXRvIHRhcmdldCA9IGFkb3B0TlMoW1tVSVByZXZpZXdUYXJnZXQgYWxsb2Nd IGluaXRXaXRoQ29udGFpbmVyOmNvbnRhaW5lclZpZXcgY2VudGVyOmNlbnRlckluQ29udGFpbmVy Vmlld0Nvb3JkaW5hdGVzXSk7CiAKLSAgICBpZiAoKF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzQXR0 YWNobWVudCB8fCBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0ltYWdlKSAmJiBfcG9zaXRpb25JbmZv cm1hdGlvbi5pbWFnZSkgewotICAgICAgICBbc2VsZiBfc3RhcnRTdXBwcmVzc2luZ1NlbGVjdGlv bkFzc2lzdGFudEZvclJlYXNvbjpXZWJLaXQ6OkludGVyYWN0aW9uSXNIYXBwZW5pbmddOworICAg IHJldHVybiBhZG9wdE5TKFtbVUlUYXJnZXRlZFByZXZpZXcgYWxsb2NdIGluaXRXaXRoVmlldzpz bmFwc2hvdFZpZXcgcGFyYW1ldGVyczpwYXJhbWV0ZXJzLmdldCgpIHRhcmdldDp0YXJnZXQuZ2V0 KCldKS5hdXRvcmVsZWFzZSgpOworfQogCi0gICAgICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBj Z0ltYWdlID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UtPm1ha2VDR0ltYWdlQ29weSgpOwot ICAgICAgICBhdXRvIGltYWdlID0gYWRvcHROUyhbW1VJSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJ bWFnZTpjZ0ltYWdlLmdldCgpXSk7CistIChVSVRhcmdldGVkUHJldmlldyAqKV9lbnN1cmVUYXJn ZXRlZFByZXZpZXcKK3sKKyAgICBpZiAoX2NvbnRleHRNZW51SW50ZXJhY3Rpb25UYXJnZXRlZFBy ZXZpZXcpCisgICAgICAgIHJldHVybiBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJl dmlldy5nZXQoKTsKIAotICAgICAgICByZXR1cm4gY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3KGltYWdl LmdldCgpLCBzZWxmLCBzZWxmLnVuc2NhbGVkVmlldywgX3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91 bmRzLCB7IH0sIG5pbCkuYXV0b3JlbGVhc2UoKTsKKyAgICBSZXRhaW5QdHI8VUlUYXJnZXRlZFBy ZXZpZXc+IHRhcmdldGVkUHJldmlldzsKKworICAgIGlmIChfcG9zaXRpb25JbmZvcm1hdGlvbi5p c0xpbmsgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250ZW50SW1hZ2Up IHsKKyAgICAgICAgYXV0byBpbmRpY2F0b3IgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5k aWNhdG9yOworICAgICAgICBhdXRvIHRleHRJbmRpY2F0b3JJbWFnZSA9IHVpSW1hZ2VGb3JJbWFn ZShpbmRpY2F0b3IuY29udGVudEltYWdlLmdldCgpKTsKKyAgICAgICAgdGFyZ2V0ZWRQcmV2aWV3 ID0gY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3KHRleHRJbmRpY2F0b3JJbWFnZS5nZXQoKSwgc2VsZiwg c2VsZi51bnNjYWxlZFZpZXcsIGluZGljYXRvci50ZXh0Qm91bmRpbmdSZWN0SW5Sb290Vmlld0Nv b3JkaW5hdGVzLCBpbmRpY2F0b3IudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcywg W1VJQ29sb3IgY29sb3JXaXRoQ0dDb2xvcjpjYWNoZWRDR0NvbG9yKGluZGljYXRvci5lc3RpbWF0 ZWRCYWNrZ3JvdW5kQ29sb3IpXSk7CisgICAgfSBlbHNlIGlmICgoX3Bvc2l0aW9uSW5mb3JtYXRp b24uaXNBdHRhY2htZW50IHx8IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UpICYmIF9wb3Np dGlvbkluZm9ybWF0aW9uLmltYWdlKSB7CisgICAgICAgIGF1dG8gY2dJbWFnZSA9IF9wb3NpdGlv bkluZm9ybWF0aW9uLmltYWdlLT5tYWtlQ0dJbWFnZUNvcHkoKTsKKyAgICAgICAgYXV0byBpbWFn ZSA9IGFkb3B0TlMoW1tVSUltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQo KV0pOworICAgICAgICB0YXJnZXRlZFByZXZpZXcgPSBjcmVhdGVUYXJnZXRlZFByZXZpZXcoaW1h Z2UuZ2V0KCksIHNlbGYsIHNlbGYudW5zY2FsZWRWaWV3LCBfcG9zaXRpb25JbmZvcm1hdGlvbi5i b3VuZHMsIHsgfSwgbmlsKTsKICAgICB9CiAKLSAgICByZXR1cm4gbmlsOworICAgIGlmICghdGFy Z2V0ZWRQcmV2aWV3KQorICAgICAgICB0YXJnZXRlZFByZXZpZXcgPSBjcmVhdGVGYWxsYmFja1Rh cmdldGVkUHJldmlldyhzZWxmLCBzZWxmLnVuc2NhbGVkVmlldywgX3Bvc2l0aW9uSW5mb3JtYXRp b24uYm91bmRzKTsKKworICAgIF9jb250ZXh0TWVudUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3 ID0gV1RGTW92ZSh0YXJnZXRlZFByZXZpZXcpOworICAgIHJldHVybiBfY29udGV4dE1lbnVJbnRl cmFjdGlvblRhcmdldGVkUHJldmlldy5nZXQoKTsKIH0KIAogLSAoVUlUYXJnZXRlZFByZXZpZXcg Kiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRl cmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNv bnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KIHsKLSAgICByZXR1cm4gW3Nl bGYgX3RhcmdldGVkUHJldmlld107CisgICAgW3NlbGYgX3N0YXJ0U3VwcHJlc3NpbmdTZWxlY3Rp b25Bc3Npc3RhbnRGb3JSZWFzb246V2ViS2l0OjpJbnRlcmFjdGlvbklzSGFwcGVuaW5nXTsKKyAg ICByZXR1cm4gW3NlbGYgX2Vuc3VyZVRhcmdldGVkUHJldmlld107CiB9CiAKIC0gKHZvaWQpY29u dGV4dE1lbnVJbnRlcmFjdGlvbldpbGxQcmVzZW50OihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24g KilpbnRlcmFjdGlvbgpAQCAtNzkwNSw3ICs3OTIxLDcgQEAgLSAodm9pZCljb250ZXh0TWVudUlu dGVyYWN0aW9uV2lsbFByZXNlbnQ6KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0 aW8KIAogLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNv bnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9yRGlzbWlzc2luZ01l bnVXaXRoQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1 cmF0aW9uCiB7Ci0gICAgcmV0dXJuIFtzZWxmIF90YXJnZXRlZFByZXZpZXddOworICAgIHJldHVy biBbc2VsZiBfZW5zdXJlVGFyZ2V0ZWRQcmV2aWV3XTsKIH0KIAogLSAodm9pZCljb250ZXh0TWVu dUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxs Q29tbWl0V2l0aEFuaW1hdG9yOihpZDxVSUNvbnRleHRNZW51SW50ZXJhY3Rpb25Db21taXRBbmlt YXRpbmc+KWFuaW1hdG9yCkBAIC03OTg1LDYgKzgwMDEsNyBAQCAtICh2b2lkKWNvbnRleHRNZW51 SW50ZXJhY3Rpb25EaWRFbmQ6KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9u CiAgICAgX2NvbnRleHRNZW51TGVnYWN5TWVudSA9IG51bGxwdHI7CiAgICAgX2NvbnRleHRNZW51 SGFzUmVxdWVzdGVkTGVnYWN5RGF0YSA9IE5POwogICAgIF9jb250ZXh0TWVudUVsZW1lbnRJbmZv ID0gbnVsbHB0cjsKKyAgICBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldyA9 IG5pbDsKIH0KIAogQGVuZAo= 372500 2019-06-19 16:49:36 -0700 2019-06-19 17:50:36 -0700 Patch bug-199038-20190619164935.patch text/plain 8378 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU2NGQ4OTk2OGRmODM5NDNj NWYwM2EyYmVmMmZhODdjNjgxNGViNWEuLmIwMjZlZmI5MzE2ZjI0MjZjMGU4NDg0YzBiYTRmZjgx NmM5ZGQ1MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDYtMTkgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEZhbGwgYmFjayB0byB0YWtp bmcgYSBVSVZpZXcgc25hcHNob2hvdCBmb3IgVUlUYXJnZXRlZFByZXZpZXdzIGlmIEludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIGRvZXMgbm90IGhhdmUgYW4gaW1hZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTAzOAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTA1NTU4MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRv bi4KKworICAgICAgICBJbiAtY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3Rm9ySGlnaGxp Z2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOiBhbmQgZnJpZW5kLCB3ZQorICAgICAgICBzaG91 bGQgYWx3YXlzIHJldHVybiBhIG5vbi1uaWwgVUlUYXJnZXRlZFByZXZpZXcuIFdoZW4gd2UgZG8g cmV0dXJuIG5pbCwgVUlLaXQgdXNlcyB0aGUgd2ViCisgICAgICAgIHZpZXcgaXRzZWxmIGFzIHRo ZSBzbmFwc2hvdCB2aWV3LCBjcmVhdGluZyBhbiB1bnNpZ2h0bHkgYW5pbWF0aW9uLgorCisgICAg ICAgIEZvciBjYXNlcyB3aGVyZSB3ZSBmYWlsIHRvIGNyZWF0ZSBhIFVJVGFyZ2V0ZWRQcmV2aWV3 IGZyb20gdGhlIGluZm9ybWF0aW9uIGluCisgICAgICAgIEludGVyYWN0aW9uSW5mb3JtYXRpb25B dFBvc2l0aW9uLCB0aGlzIHBhdGNoIGZhbGxzIGJhY2sgdG8gY3JlYXRpbmcgYSBVSVRhcmdldGVk UHJldmlldyB3aXRoCisgICAgICAgIGEgc25hcHNob3QgdmlldyBvYnRhaW5lZCBmcm9tCisgICAg ICAgIC1bVUlWaWV3IHJlc2l6YWJsZVNuYXBzaG90Vmlld0Zyb21SZWN0OmFmdGVyU2NyZWVuVXBk YXRlczp3aXRoQ2FwSW5zZXRzOl0uCisKKyAgICAgICAgQWxzbyByZW5hbWVkIC10YXJnZXRlZFBy ZXZpZXcgdG8gLV9lbnN1cmVUYXJnZXRlZFByZXZpZXcgYW5kIGNhY2hlZCB0aGUgVUlUYXJnZXRl ZFByZXZpZXcKKyAgICAgICAgZm9yIHJldXNlIGluIC1jb250ZXh0TWVudUludGVyYWN0aW9uOnBy ZXZpZXdGb3JEaXNtaXNzaW5nTWVudVdpdGhDb25maWd1cmF0aW9uOi4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgIChjcmVhdGVGYWxs YmFja1RhcmdldGVkUHJldmlldyk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2Vuc3VyZVRh cmdldGVkUHJldmlld10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGNvbnRleHRNZW51SW50 ZXJhY3Rpb246cHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdG b3JEaXNtaXNzaW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGNvbnRleHRNZW51SW50ZXJhY3Rpb25EaWRFbmQ6XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgX3RhcmdldGVkUHJldmlld10pOiBSZW5hbWVkIHRvIF9lbnN1cmVUYXJnZXRlZFBy ZXZpZXcuCisKIDIwMTktMDYtMTkgIEFsZXhhbmRlciBNaWtoYXlsZW5rbyAgPGV4YWxtNzY1OUBn bWFpbC5jb20+CiAKICAgICAgICAgW0dUS10gUGFnZSBibGlua3MgYWZ0ZXIgbmF2aWdhdGlvbiBz d2lwZSBpZiBpdCB0cmlnZ2VyZWQgUFNPTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IDMwYzBhZGIyMWFiN2Ni MWRkN2Q5MjgyNDQ4MTNlNjJhMzA4YzQzZDUuLjI3ZGFkYjhhOTg3YjhlOWUwOTZkNzhhNTA5M2Zi MjdmMjMxMzk1ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTk1LDYgKzk1LDcgQEAgc3RydWN0IFdlYkF1 dG9jb3JyZWN0aW9uQ29udGV4dDsKIEBjbGFzcyBfVUlIaWdobGlnaHRWaWV3OwogQGNsYXNzIF9V SVdlYkhpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyOwogQGNsYXNzIFVJSG92ZXJH ZXN0dXJlUmVjb2duaXplcjsKK0BjbGFzcyBVSVRhcmdldGVkUHJldmlldzsKIEBjbGFzcyBXZWJF dmVudDsKIEBjbGFzcyBXS0FjdGlvblNoZWV0QXNzaXN0YW50OwogQGNsYXNzIFdLQ29udGV4dE1l bnVFbGVtZW50SW5mbzsKQEAgLTI0OSw2ICsyNTAsNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlv bkRhdGEgewogICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfY29udGV4dE1lbnVMZWdh Y3lQcmV2aWV3Q29udHJvbGxlcjsKICAgICBSZXRhaW5QdHI8VUlNZW51PiBfY29udGV4dE1lbnVM ZWdhY3lNZW51OwogICAgIEJPT0wgX2NvbnRleHRNZW51SGFzUmVxdWVzdGVkTGVnYWN5RGF0YTsK KyAgICBSZXRhaW5QdHI8VUlUYXJnZXRlZFByZXZpZXc+IF9jb250ZXh0TWVudUludGVyYWN0aW9u VGFyZ2V0ZWRQcmV2aWV3OwogI2Vsc2UKICAgICBSZXRhaW5QdHI8VUlQcmV2aWV3SXRlbUNvbnRy b2xsZXI+IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4 IGM4YzRkYzVjNDYwNDY2YjQyN2IzYWNiOTA4YzdhNGJhZDkxZjFjYTQuLjAzOTgyMDI2MTFiZjNh N2Q4ODcwZjk4YTQ3NzdlYmVlOGE3NjcxYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNzg1OSwzMiAr Nzg1OSw0OCBAQCBzdGF0aWMgUmV0YWluUHRyPFVJVGFyZ2V0ZWRQcmV2aWV3PiBjcmVhdGVUYXJn ZXRlZFByZXZpZXcoVUlJbWFnZSAqaW1hZ2UsIFVJVmlldwogICAgIHJldHVybiBhZG9wdE5TKFtb VUlUYXJnZXRlZFByZXZpZXcgYWxsb2NdIGluaXRXaXRoVmlldzppbWFnZVZpZXcuZ2V0KCkgcGFy YW1ldGVyczpwYXJhbWV0ZXJzLmdldCgpIHRhcmdldDp0YXJnZXQuZ2V0KCldKTsKIH0KIAotLSAo VUlUYXJnZXRlZFByZXZpZXcgKilfdGFyZ2V0ZWRQcmV2aWV3CitzdGF0aWMgUmV0YWluUHRyPFVJ VGFyZ2V0ZWRQcmV2aWV3PiBjcmVhdGVGYWxsYmFja1RhcmdldGVkUHJldmlldyhVSVZpZXcgKnJv b3RWaWV3LCBVSVZpZXcgKmNvbnRhaW5lclZpZXcsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYg ZnJhbWVJblJvb3RWaWV3Q29vcmRpbmF0ZXMpCiB7Ci0gICAgaWYgKF9wb3NpdGlvbkluZm9ybWF0 aW9uLmlzTGluayAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNhdG9yLmNvbnRlbnRJ bWFnZSkgewotICAgICAgICBbc2VsZiBfc3RhcnRTdXBwcmVzc2luZ1NlbGVjdGlvbkFzc2lzdGFu dEZvclJlYXNvbjpXZWJLaXQ6OkludGVyYWN0aW9uSXNIYXBwZW5pbmddOworICAgIGF1dG8gcGFy YW1ldGVycyA9IGFkb3B0TlMoW1tVSVByZXZpZXdQYXJhbWV0ZXJzIGFsbG9jXSBpbml0XSk7Cisg ICAgVUlWaWV3ICpzbmFwc2hvdFZpZXcgPSBbcm9vdFZpZXcgcmVzaXphYmxlU25hcHNob3RWaWV3 RnJvbVJlY3Q6ZnJhbWVJblJvb3RWaWV3Q29vcmRpbmF0ZXMgYWZ0ZXJTY3JlZW5VcGRhdGVzOk5P IHdpdGhDYXBJbnNldHM6VUlFZGdlSW5zZXRzWmVyb107CiAKLSAgICAgICAgYXV0byBpbmRpY2F0 b3IgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNhdG9yOwotICAgICAgICBhdXRvIHRl eHRJbmRpY2F0b3JJbWFnZSA9IHVpSW1hZ2VGb3JJbWFnZShpbmRpY2F0b3IuY29udGVudEltYWdl LmdldCgpKTsKKyAgICBDR1JlY3QgZnJhbWVJbkNvbnRhaW5lclZpZXdDb29yZGluYXRlcyA9IFty b290VmlldyBjb252ZXJ0UmVjdDpmcmFtZUluUm9vdFZpZXdDb29yZGluYXRlcyB0b1ZpZXc6Y29u dGFpbmVyVmlld107CisgICAgc25hcHNob3RWaWV3LmZyYW1lID0gZnJhbWVJbkNvbnRhaW5lclZp ZXdDb29yZGluYXRlczsKIAotICAgICAgICByZXR1cm4gY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3KHRl eHRJbmRpY2F0b3JJbWFnZS5nZXQoKSwgc2VsZiwgc2VsZi51bnNjYWxlZFZpZXcsIGluZGljYXRv ci50ZXh0Qm91bmRpbmdSZWN0SW5Sb290Vmlld0Nvb3JkaW5hdGVzLCBpbmRpY2F0b3IudGV4dFJl Y3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcywgW1VJQ29sb3IgY29sb3JXaXRoQ0dDb2xvcjpj YWNoZWRDR0NvbG9yKGluZGljYXRvci5lc3RpbWF0ZWRCYWNrZ3JvdW5kQ29sb3IpXSkuYXV0b3Jl bGVhc2UoKTsKLSAgICB9CisgICAgQ0dQb2ludCBjZW50ZXJJbkNvbnRhaW5lclZpZXdDb29yZGlu YXRlcyA9IENHUG9pbnRNYWtlKENHUmVjdEdldE1pZFgoZnJhbWVJbkNvbnRhaW5lclZpZXdDb29y ZGluYXRlcyksIENHUmVjdEdldE1pZFkoZnJhbWVJbkNvbnRhaW5lclZpZXdDb29yZGluYXRlcykp OworICAgIGF1dG8gdGFyZ2V0ID0gYWRvcHROUyhbW1VJUHJldmlld1RhcmdldCBhbGxvY10gaW5p dFdpdGhDb250YWluZXI6Y29udGFpbmVyVmlldyBjZW50ZXI6Y2VudGVySW5Db250YWluZXJWaWV3 Q29vcmRpbmF0ZXNdKTsKIAotICAgIGlmICgoX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNBdHRhY2ht ZW50IHx8IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UpICYmIF9wb3NpdGlvbkluZm9ybWF0 aW9uLmltYWdlKSB7Ci0gICAgICAgIFtzZWxmIF9zdGFydFN1cHByZXNzaW5nU2VsZWN0aW9uQXNz aXN0YW50Rm9yUmVhc29uOldlYktpdDo6SW50ZXJhY3Rpb25Jc0hhcHBlbmluZ107CisgICAgcmV0 dXJuIGFkb3B0TlMoW1tVSVRhcmdldGVkUHJldmlldyBhbGxvY10gaW5pdFdpdGhWaWV3OnNuYXBz aG90VmlldyBwYXJhbWV0ZXJzOnBhcmFtZXRlcnMuZ2V0KCkgdGFyZ2V0OnRhcmdldC5nZXQoKV0p OworfQogCi0gICAgICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBjZ0ltYWdlID0gX3Bvc2l0aW9u SW5mb3JtYXRpb24uaW1hZ2UtPm1ha2VDR0ltYWdlQ29weSgpOwotICAgICAgICBhdXRvIGltYWdl ID0gYWRvcHROUyhbW1VJSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpjZ0ltYWdlLmdldCgp XSk7CistIChVSVRhcmdldGVkUHJldmlldyAqKV9lbnN1cmVUYXJnZXRlZFByZXZpZXcKK3sKKyAg ICBpZiAoX2NvbnRleHRNZW51SW50ZXJhY3Rpb25UYXJnZXRlZFByZXZpZXcpCisgICAgICAgIHJl dHVybiBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldy5nZXQoKTsKIAotICAg ICAgICByZXR1cm4gY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3KGltYWdlLmdldCgpLCBzZWxmLCBzZWxm LnVuc2NhbGVkVmlldywgX3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzLCB7IH0sIG5pbCkuYXV0 b3JlbGVhc2UoKTsKKyAgICBSZXRhaW5QdHI8VUlUYXJnZXRlZFByZXZpZXc+IHRhcmdldGVkUHJl dmlldzsKKworICAgIGlmIChfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xpbmsgJiYgX3Bvc2l0aW9u SW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250ZW50SW1hZ2UpIHsKKyAgICAgICAgYXV0byBp bmRpY2F0b3IgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNhdG9yOworICAgICAgICBh dXRvIHRleHRJbmRpY2F0b3JJbWFnZSA9IHVpSW1hZ2VGb3JJbWFnZShpbmRpY2F0b3IuY29udGVu dEltYWdlLmdldCgpKTsKKyAgICAgICAgdGFyZ2V0ZWRQcmV2aWV3ID0gY3JlYXRlVGFyZ2V0ZWRQ cmV2aWV3KHRleHRJbmRpY2F0b3JJbWFnZS5nZXQoKSwgc2VsZiwgc2VsZi51bnNjYWxlZFZpZXcs IGluZGljYXRvci50ZXh0Qm91bmRpbmdSZWN0SW5Sb290Vmlld0Nvb3JkaW5hdGVzLCBpbmRpY2F0 b3IudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcywgW1VJQ29sb3IgY29sb3JXaXRo Q0dDb2xvcjpjYWNoZWRDR0NvbG9yKGluZGljYXRvci5lc3RpbWF0ZWRCYWNrZ3JvdW5kQ29sb3Ip XSk7CisgICAgfSBlbHNlIGlmICgoX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNBdHRhY2htZW50IHx8 IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UpICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmlt YWdlKSB7CisgICAgICAgIGF1dG8gY2dJbWFnZSA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdl LT5tYWtlQ0dJbWFnZUNvcHkoKTsKKyAgICAgICAgYXV0byBpbWFnZSA9IGFkb3B0TlMoW1tVSUlt YWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKV0pOworICAgICAgICB0YXJn ZXRlZFByZXZpZXcgPSBjcmVhdGVUYXJnZXRlZFByZXZpZXcoaW1hZ2UuZ2V0KCksIHNlbGYsIHNl bGYudW5zY2FsZWRWaWV3LCBfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMsIHsgfSwgbmlsKTsK ICAgICB9CiAKLSAgICByZXR1cm4gbmlsOworICAgIGlmICghdGFyZ2V0ZWRQcmV2aWV3KQorICAg ICAgICB0YXJnZXRlZFByZXZpZXcgPSBjcmVhdGVGYWxsYmFja1RhcmdldGVkUHJldmlldyhzZWxm LCBzZWxmLnVuc2NhbGVkVmlldywgX3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzKTsKKworICAg IF9jb250ZXh0TWVudUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3ID0gV1RGTW92ZSh0YXJnZXRl ZFByZXZpZXcpOworICAgIHJldHVybiBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJl dmlldy5nZXQoKTsKIH0KIAogLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVy YWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9y SGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJh dGlvbiAqKWNvbmZpZ3VyYXRpb24KIHsKLSAgICByZXR1cm4gW3NlbGYgX3RhcmdldGVkUHJldmll d107CisgICAgW3NlbGYgX3N0YXJ0U3VwcHJlc3NpbmdTZWxlY3Rpb25Bc3Npc3RhbnRGb3JSZWFz b246V2ViS2l0OjpJbnRlcmFjdGlvbklzSGFwcGVuaW5nXTsKKyAgICByZXR1cm4gW3NlbGYgX2Vu c3VyZVRhcmdldGVkUHJldmlld107CiB9CiAKIC0gKHZvaWQpY29udGV4dE1lbnVJbnRlcmFjdGlv bldpbGxQcmVzZW50OihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbgpAQCAt NzkwNSw3ICs3OTIxLDcgQEAgLSAodm9pZCljb250ZXh0TWVudUludGVyYWN0aW9uV2lsbFByZXNl bnQ6KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW8KIAogLSAoVUlUYXJnZXRl ZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9yRGlzbWlzc2luZ01lbnVXaXRoQ29uZmlndXJhdGlv bjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCiB7Ci0gICAgcmV0 dXJuIFtzZWxmIF90YXJnZXRlZFByZXZpZXddOworICAgIHJldHVybiBbc2VsZiBfZW5zdXJlVGFy Z2V0ZWRQcmV2aWV3XTsKIH0KIAogLSAodm9pZCljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNv bnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQ29tbWl0V2l0aEFuaW1hdG9y OihpZDxVSUNvbnRleHRNZW51SW50ZXJhY3Rpb25Db21taXRBbmltYXRpbmc+KWFuaW1hdG9yCkBA IC03OTg1LDYgKzgwMDEsNyBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb25EaWRFbmQ6 KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uCiAgICAgX2NvbnRleHRNZW51 TGVnYWN5TWVudSA9IG51bGxwdHI7CiAgICAgX2NvbnRleHRNZW51SGFzUmVxdWVzdGVkTGVnYWN5 RGF0YSA9IE5POwogICAgIF9jb250ZXh0TWVudUVsZW1lbnRJbmZvID0gbnVsbHB0cjsKKyAgICBf Y29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldyA9IG5pbDsKIH0KIAogQGVuZAo=