159184 2016-06-27 17:27:13 -0700 REGRESSION (r189052): Clipping occurs when using context menu to Look Up words within the Dictionary app 2016-06-27 17:38:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin commit-queue simon.fraser oldest_to_newest 1205796 0 thorton 2016-06-27 17:27:13 -0700 REGRESSION (r189052): Clipping occurs when using context menu to Look Up words within the Dictionary app 1205797 1 282192 thorton 2016-06-27 17:27:41 -0700 Created attachment 282192 Patch 1205798 2 commit-queue 2016-06-27 17:30:17 -0700 Attachment 282192 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebImmediateActionController.mm:530: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1205799 3 282192 simon.fraser 2016-06-27 17:32:26 -0700 Comment on attachment 282192 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282192&action=review Any way to test this? > Source/WebKit/mac/WebView/WebHTMLView.mm:6369 > + if (!selectionRange) > + return; OK to continue if the range is empty? 1205810 4 thorton 2016-06-27 17:38:40 -0700 (In reply to comment #3) > Comment on attachment 282192 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282192&action=review > > Any way to test this? Even if we had TextIndicator tests, I'm not sure how we could test that this particular caller does the right thing. Maybe we could have a way to get the current indicator and actually call the context menu-y method on WebHTMLView? Anyway, TextIndicator is high on my list of things that desperately needs to be testable but currently isn't (and progress has been made in the past in this direction). > > Source/WebKit/mac/WebView/WebHTMLView.mm:6369 > > + if (!selectionRange) > > + return; > > OK to continue if the range is empty? The other function will catch that. 1205811 5 thorton 2016-06-27 17:38:59 -0700 https://trac.webkit.org/changeset/202524 282192 2016-06-27 17:27:41 -0700 2016-06-27 17:31:26 -0700 Patch bug-159184-20160627172726.patch text/plain 8825 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNGQ3NDVlZGNh MjIyMGIzMzExMDg0ODYwMWI5NzEwYTIyYzI0OTllNy4uZWJlYWM5ZjFiYmE5MDVhODUzNzhlODM0 NTRhZTFmMjk5MjI4ZDA2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2 LTA2LTI3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAg IFJFR1JFU1NJT04gKHIxODkwNTIpOiBDbGlwcGluZyBvY2N1cnMgd2hlbiB1c2luZyBjb250ZXh0 IG1lbnUgdG8gTG9vayBVcCB3b3JkcyB3aXRoaW4gdGhlIERpY3Rpb25hcnkgYXBwCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkxODQKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzI2MzcwMjA2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1b V2ViSFRNTFZpZXcgX2xvb2tVcEluRGljdGlvbmFyeUZyb21NZW51Ol0pOgorICAgICAgICAqIFdl YlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlZpZXcv V2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAgKCtbV2ViSW1tZWRpYXRl QWN0aW9uQ29udHJvbGxlciBfZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdlOmluRnJhbWU6d2l0 aExvb2t1cE9wdGlvbnM6aW5kaWNhdG9yT3B0aW9uczp0cmFuc2l0aW9uOl0pOgorICAgICAgICAo LVtXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF9hbmltYXRpb25Db250cm9sbGVyRm9yVGV4 dF0pOgorICAgICAgICAoZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdlKTogRGVsZXRlZC4KKyAg ICAgICAgV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlcidzIGNvZGUgdG8gbWFrZSBhIERpY3Rp b25hcnlQb3B1cEluZm8gYW5kIFRleHRJbmRpY2F0b3IKKyAgICAgICAgZnJvbSBhIFJhbmdlIGlu IFdlYktpdDEgaXMgbXVjaCBiZXR0ZXIgdGhhbiBXZWJIVE1MVmlldydzOyB1c2UgaXQgaW4gYm90 aCBjYXNlcy4KKwogMjAxNi0wNi0yNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4K IAogICAgICAgICBQbGF5YmFjayBjb250cm9scyByZWZlciB0byB3cm9uZyBlbGVtZW50IHdoZW4g cGxheWluZyBtdWx0aXBsZSBpdGVtcyBpbiBhIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJIVE1MVmlldy5tbQppbmRleCBmZjQxYmRkYTRiODgyOTdhNDk5YTgzZGZmZTJjNjg2MTk3 YTA1NDVlLi44YmRkNzQwY2I5YWM5YWU4Y2M5MWEwZDhlOGU5ZTE5YTZlMjQzZGRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTYzNjAsMzAgKzYzNjAsMTUg QEAgc3RhdGljIEJPT0wgd3JpdGluZ0RpcmVjdGlvbktleUJpbmRpbmdzRW5hYmxlZCgpCiAKIC0g KHZvaWQpX2xvb2tVcEluRGljdGlvbmFyeUZyb21NZW51OihpZClzZW5kZXIKIHsKLSAgICAvLyBE aWN0aW9uYXJ5IEFQSSB3aWxsIGFjY2VwdCBhIHdoaXRlc3BhY2Utb25seSBzdHJpbmcgYW5kIGRp c3BsYXkgVUkgYXMgaWYgaXQgd2VyZSByZWFsIHRleHQsCi0gICAgLy8gc28gYmFpbCBvdXQgZWFy bHkgdG8gYXZvaWQgdGhhdC4KLSAgICBpZiAoW1tbc2VsZiBzZWxlY3RlZFN0cmluZ10gX3dlYmtp dF9zdHJpbmdCeVRyaW1taW5nV2hpdGVzcGFjZV0gbGVuZ3RoXSA9PSAwKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJTdHJpbmcgPSBbc2VsZiBzZWxlY3Rl ZEF0dHJpYnV0ZWRTdHJpbmddOwotCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoW3NlbGYg X2ZyYW1lXSk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVybjsKIAotICAgIE5T UmVjdCByZWN0ID0gY29yZUZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb25Cb3VuZHMoKTsKLQot ICAgIE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyA9IFthdHRyU3RyaW5nIGZvbnRBdHRyaWJ1dGVz SW5SYW5nZTpOU01ha2VSYW5nZSgwLCAxKV07Ci0gICAgTlNGb250ICpmb250ID0gW2F0dHJpYnV0 ZXMgb2JqZWN0Rm9yS2V5Ok5TRm9udEF0dHJpYnV0ZU5hbWVdOwotICAgIGlmIChmb250KQotICAg ICAgICByZWN0Lm9yaWdpbi55ICs9IFtmb250IGRlc2NlbmRlcl07CisgICAgUmVmUHRyPFJhbmdl PiBzZWxlY3Rpb25SYW5nZSA9IGNvcmVGcmFtZS0+c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkuZmly c3RSYW5nZSgpOworICAgIGlmICghc2VsZWN0aW9uUmFuZ2UpCisgICAgICAgIHJldHVybjsKIAot ICAgIERpY3Rpb25hcnlQb3B1cEluZm8gaW5mbzsKLSAgICBpbmZvLmF0dHJpYnV0ZWRTdHJpbmcg PSBhdHRyU3RyaW5nOwotICAgIGluZm8ub3JpZ2luID0gY29yZUZyYW1lLT52aWV3KCktPmNvbnRl bnRzVG9XaW5kb3coZW5jbG9zaW5nSW50UmVjdChyZWN0KSkubG9jYXRpb24oKTsKLSAgICBpZiAo YXV0byB0ZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbklu RnJhbWUoKmNvcmVGcmFtZSwgVGV4dEluZGljYXRvck9wdGlvbkluY2x1ZGVTbmFwc2hvdFdpdGhT ZWxlY3Rpb25IaWdobGlnaHQsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpC b3VuY2VBbmRDcm9zc2ZhZGUpKQotICAgICAgICBpbmZvLnRleHRJbmRpY2F0b3IgPSB0ZXh0SW5k aWNhdG9yLT5kYXRhKCk7Ci0gICAgW1tzZWxmIF93ZWJWaWV3XSBfc2hvd0RpY3Rpb25hcnlMb29r dXBQb3B1cDppbmZvXTsKKyAgICBbW3NlbGYgX3dlYlZpZXddIF9zaG93RGljdGlvbmFyeUxvb2t1 cFBvcHVwOltXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF9kaWN0aW9uYXJ5UG9wdXBJbmZv Rm9yUmFuZ2U6KnNlbGVjdGlvblJhbmdlIGluRnJhbWU6Y29yZUZyYW1lIHdpdGhMb29rdXBPcHRp b25zOm5pbCBpbmRpY2F0b3JPcHRpb25zOlRleHRJbmRpY2F0b3JPcHRpb25JbmNsdWRlU25hcHNo b3RXaXRoU2VsZWN0aW9uSGlnaGxpZ2h0IHRyYW5zaXRpb246VGV4dEluZGljYXRvclByZXNlbnRh dGlvblRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFkZV1dOwogfQogCiAtICh2b2lkKXF1aWNr TG9va1dpdGhFdmVudDooTlNFdmVudCAqKWV2ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCmluZGV4IGY4MThm NWY0YjgxMzgwMmVkYzM4Y2IxNGU2NjBlMDljOWE4MTU5NTEuLmRkZDZjMjJmMDAxZTFlMjU0MjBk OTFjZWM0MmVmY2VlODYxZWQzYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCkBAIC0yOCwxMiArMjgsMjAg QEAKICNpbXBvcnQgIldlYlVJRGVsZWdhdGVQcml2YXRlLmgiCiAjaW1wb3J0IDxXZWJDb3JlL0hp dFRlc3RSZXN1bHQuaD4KICNpbXBvcnQgPFdlYkNvcmUvTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJl UmVjb2duaXplclNQSS5oPgorI2ltcG9ydCA8V2ViQ29yZS9UZXh0SW5kaWNhdG9yLmg+CiAjaW1w b3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBjbGFzcyBEREFjdGlvbkNvbnRleHQ7CiBAY2xhc3Mg UUxQcmV2aWV3TWVudUl0ZW07CitAY2xhc3MgTlNEaWN0aW9uYXJ5OwogQGNsYXNzIFdlYlZpZXc7 CiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEZyYW1lOworY2xhc3MgUmFuZ2U7CitzdHJ1 Y3QgRGljdGlvbmFyeVBvcHVwSW5mbzsKK307CisKIEBpbnRlcmZhY2UgV2ViSW1tZWRpYXRlQWN0 aW9uQ29udHJvbGxlciA6IE5TT2JqZWN0IDxOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25p emVyRGVsZWdhdGU+IHsKIEBwcml2YXRlCiAgICAgV2ViVmlldyAqX3dlYlZpZXc7CkBAIC01NSw2 ICs2Myw4IEBACiAKIC0gKE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilpbW1l ZGlhdGVBY3Rpb25SZWNvZ25pemVyOwogCisrIChXZWJDb3JlOjpEaWN0aW9uYXJ5UG9wdXBJbmZv KV9kaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2U6KFdlYkNvcmU6OlJhbmdlJilyYW5nZSBpbkZy YW1lOihXZWJDb3JlOjpGcmFtZSopZnJhbWUgd2l0aExvb2t1cE9wdGlvbnM6KE5TRGljdGlvbmFy eSAqKWxvb2t1cE9wdGlvbnMgaW5kaWNhdG9yT3B0aW9uczooV2ViQ29yZTo6VGV4dEluZGljYXRv ck9wdGlvbnMpaW5kaWNhdG9yT3B0aW9ucyB0cmFuc2l0aW9uOihXZWJDb3JlOjpUZXh0SW5kaWNh dG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbilwcmVzZW50YXRpb25UcmFuc2l0aW9uOworCiBAZW5k CiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW0KaW5kZXggOTRmNzJm NGIyZTYzNTg3MmViMWYxMjQ4YWRhM2EyMjNhMjkxODAzNC4uY2I0ZjM3Yzg2NmNmYmE4ZDE3MDJk MWY5YjMwMmRmZWU1OGNhODU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQpAQCAtNTAyLDEyICs1MDIs MTQgQEAgc3RhdGljIEludFJlY3QgZWxlbWVudEJvdW5kaW5nQm94SW5XaW5kb3dDb29yZGluYXRl c0Zyb21Ob2RlKE5vZGUqIG5vZGUpCiAKICNwcmFnbWEgbWFyayBUZXh0IGFjdGlvbgogCi1zdGF0 aWMgRGljdGlvbmFyeVBvcHVwSW5mbyBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoRnJhbWUq IGZyYW1lLCBSYW5nZSYgcmFuZ2UsIE5TRGljdGlvbmFyeSAqb3B0aW9ucywgVGV4dEluZGljYXRv clByZXNlbnRhdGlvblRyYW5zaXRpb24gcHJlc2VudGF0aW9uVHJhbnNpdGlvbikKKysgKERpY3Rp b25hcnlQb3B1cEluZm8pX2RpY3Rpb25hcnlQb3B1cEluZm9Gb3JSYW5nZTooUmFuZ2UmKXJhbmdl IGluRnJhbWU6KEZyYW1lKilmcmFtZSB3aXRoTG9va3VwT3B0aW9uczooTlNEaWN0aW9uYXJ5ICop bG9va3VwT3B0aW9ucyBpbmRpY2F0b3JPcHRpb25zOihUZXh0SW5kaWNhdG9yT3B0aW9ucylpbmRp Y2F0b3JPcHRpb25zIHRyYW5zaXRpb246KFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0 aW9uKXByZXNlbnRhdGlvblRyYW5zaXRpb24KIHsKKyAgICAvLyBEaWN0aW9uYXJ5IEFQSSB3aWxs IGFjY2VwdCBhIHdoaXRlc3BhY2Utb25seSBzdHJpbmcgYW5kIGRpc3BsYXkgVUkgYXMgaWYgaXQg d2VyZSByZWFsIHRleHQsCisgICAgLy8gc28gYmFpbCBvdXQgZWFybHkgdG8gYXZvaWQgdGhhdC4K ICAgICBEaWN0aW9uYXJ5UG9wdXBJbmZvIHBvcHVwSW5mbzsKICAgICBpZiAocmFuZ2UudGV4dCgp LnN0cmlwV2hpdGVTcGFjZSgpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHBvcHVwSW5mbzsK LSAgICAKKwogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSByYW5nZS5zdGFydENvbnRhaW5l cigpLnJlbmRlcmVyKCk7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlID0gcmVuZGVyZXIt PnN0eWxlKCk7CiAKQEAgLTUxOSwxMyArNTIxLDEzIEBAIHN0YXRpYyBEaWN0aW9uYXJ5UG9wdXBJ bmZvIGRpY3Rpb25hcnlQb3B1cEluZm9Gb3JSYW5nZShGcmFtZSogZnJhbWUsIFJhbmdlJiByYW5n CiAgICAgSW50UmVjdCByYW5nZVJlY3QgPSBmcmFtZS0+dmlldygpLT5jb250ZW50c1RvV2luZG93 KHF1YWRzWzBdLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpOwogCiAgICAgcG9wdXBJbmZvLm9yaWdp biA9IE5TTWFrZVBvaW50KHJhbmdlUmVjdC54KCksIHJhbmdlUmVjdC55KCkgKyAoc3R5bGUuZm9u dE1ldHJpY3MoKS5kZXNjZW50KCkgKiBmcmFtZS0+cGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSkp OwotICAgIHBvcHVwSW5mby5vcHRpb25zID0gb3B0aW9uczsKKyAgICBwb3B1cEluZm8ub3B0aW9u cyA9IGxvb2t1cE9wdGlvbnM7CiAKICAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKm5zQXR0cmlidXRl ZFN0cmluZyA9IGVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbVJhbmdlKHJhbmdlLCBJbmNsdWRl SW1hZ2VzSW5BdHRyaWJ1dGVkU3RyaW5nOjpObyk7CiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZUF0 dHJpYnV0ZWRTdHJpbmc+IHNjYWxlZE5TQXR0cmlidXRlZFN0cmluZyA9IGFkb3B0TlMoW1tOU011 dGFibGVBdHRyaWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0V2l0aFN0cmluZzpbbnNBdHRyaWJ1dGVk U3RyaW5nIHN0cmluZ11dKTsKICAgICBOU0ZvbnRNYW5hZ2VyICpmb250TWFuYWdlciA9IFtOU0Zv bnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXTsKIAotICAgIFtuc0F0dHJpYnV0ZWRTdHJpbmcg ZW51bWVyYXRlQXR0cmlidXRlc0luUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgW25zQXR0cmlidXRlZFN0 cmluZyBsZW5ndGhdKSBvcHRpb25zOjAgdXNpbmdCbG9jazpeKE5TRGljdGlvbmFyeSAqYXR0cmli dXRlcywgTlNSYW5nZSByYW5nZSwgQk9PTCAqc3RvcCkgeworICAgIFtuc0F0dHJpYnV0ZWRTdHJp bmcgZW51bWVyYXRlQXR0cmlidXRlc0luUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgW25zQXR0cmlidXRl ZFN0cmluZyBsZW5ndGhdKSBvcHRpb25zOjAgdXNpbmdCbG9jazpeKE5TRGljdGlvbmFyeSAqYXR0 cmlidXRlcywgTlNSYW5nZSBhdHRyaWJ1dGVSYW5nZSwgQk9PTCAqc3RvcCkgewogICAgICAgICBS ZXRhaW5QdHI8TlNNdXRhYmxlRGljdGlvbmFyeT4gc2NhbGVkQXR0cmlidXRlcyA9IGFkb3B0TlMo W2F0dHJpYnV0ZXMgbXV0YWJsZUNvcHldKTsKIAogICAgICAgICBOU0ZvbnQgKmZvbnQgPSBbc2Nh bGVkQXR0cmlidXRlcyBvYmplY3RGb3JLZXk6TlNGb250QXR0cmlidXRlTmFtZV07CkBAIC01MzQs MTIgKzUzNiwxMiBAQCBzdGF0aWMgRGljdGlvbmFyeVBvcHVwSW5mbyBkaWN0aW9uYXJ5UG9wdXBJ bmZvRm9yUmFuZ2UoRnJhbWUqIGZyYW1lLCBSYW5nZSYgcmFuZwogICAgICAgICAgICAgW3NjYWxl ZEF0dHJpYnV0ZXMgc2V0T2JqZWN0OmZvbnQgZm9yS2V5Ok5TRm9udEF0dHJpYnV0ZU5hbWVdOwog ICAgICAgICB9CiAKLSAgICAgICAgW3NjYWxlZE5TQXR0cmlidXRlZFN0cmluZyBhZGRBdHRyaWJ1 dGVzOnNjYWxlZEF0dHJpYnV0ZXMuZ2V0KCkgcmFuZ2U6cmFuZ2VdOworICAgICAgICBbc2NhbGVk TlNBdHRyaWJ1dGVkU3RyaW5nIGFkZEF0dHJpYnV0ZXM6c2NhbGVkQXR0cmlidXRlcy5nZXQoKSBy YW5nZTphdHRyaWJ1dGVSYW5nZV07CiAgICAgfV07CiAKICAgICBwb3B1cEluZm8uYXR0cmlidXRl ZFN0cmluZyA9IHNjYWxlZE5TQXR0cmlidXRlZFN0cmluZy5nZXQoKTsKIAotICAgIGlmIChhdXRv IHRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UocmFuZ2UsIFRl eHRJbmRpY2F0b3JPcHRpb25EZWZhdWx0LCBwcmVzZW50YXRpb25UcmFuc2l0aW9uKSkKKyAgICBp ZiAoYXV0byB0ZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKHJh bmdlLCBpbmRpY2F0b3JPcHRpb25zLCBwcmVzZW50YXRpb25UcmFuc2l0aW9uKSkKICAgICAgICAg cG9wdXBJbmZvLnRleHRJbmRpY2F0b3IgPSB0ZXh0SW5kaWNhdG9yLT5kYXRhKCk7CiAgICAgcmV0 dXJuIHBvcHVwSW5mbzsKIH0KQEAgLTU2Miw4ICs1NjQsNyBAQCBzdGF0aWMgRGljdGlvbmFyeVBv cHVwSW5mbyBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoRnJhbWUqIGZyYW1lLCBSYW5nZSYg cmFuZwogICAgIGlmICghZGljdGlvbmFyeVJhbmdlKQogICAgICAgICByZXR1cm4gbmlsOwogCi0g ICAgUmVmUHRyPFJhbmdlPiBzZWxlY3Rpb25SYW5nZSA9IGZyYW1lLT5wYWdlKCktPmZvY3VzQ29u dHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLmZp cnN0UmFuZ2UoKTsKLSAgICBEaWN0aW9uYXJ5UG9wdXBJbmZvIGRpY3Rpb25hcnlQb3B1cEluZm8g PSBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoZnJhbWUsICpkaWN0aW9uYXJ5UmFuZ2UsIG9w dGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpGYWRlSW4pOworICAg IERpY3Rpb25hcnlQb3B1cEluZm8gZGljdGlvbmFyeVBvcHVwSW5mbyA9IFtXZWJJbW1lZGlhdGVB Y3Rpb25Db250cm9sbGVyIF9kaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2U6KmRpY3Rpb25hcnlS YW5nZSBpbkZyYW1lOmZyYW1lIHdpdGhMb29rdXBPcHRpb25zOm9wdGlvbnMgaW5kaWNhdG9yT3B0 aW9uczpUZXh0SW5kaWNhdG9yT3B0aW9uRGVmYXVsdCB0cmFuc2l0aW9uOiBUZXh0SW5kaWNhdG9y UHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluXTsKICAgICBpZiAoIWRpY3Rpb25hcnlQb3B1 cEluZm8uYXR0cmlidXRlZFN0cmluZykKICAgICAgICAgcmV0dXJuIG5pbDsKIAo=