190015 2018-09-26 15:26:46 -0700 [iOS] WKWebView callout bar is missing Change Writing Direction item 2019-02-15 13:36:27 -0800 1 1 1 Unclassified WebKit HTML Editing Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz wenson_hsieh bdakin commit-queue thorton wenson_hsieh oldest_to_newest 1463791 0 mitz 2018-09-26 15:26:46 -0700 When the insertion point, or a selection, is in editable text, and the paragraph writing direction is left-to-right and/or a left-to-right keyboard is active, then the callout bar should contain one of the actions {makeTextWritingDirectionRightToLeft:, makeTextWritingDirectionLeftToRight:} (depending on which is the current direction). This works in UIWebView but apparently not implemented at all in WKWebView. 1463793 1 mitz 2018-09-26 15:28:09 -0700 <rdar://problem/44810366> 1463799 2 mitz 2018-09-26 15:32:45 -0700 (In reply to mitz from comment #0) > and/or a left-to-right keyboard is active This should have said “right-to-left keyboard”. 1506692 3 362138 wenson_hsieh 2019-02-15 11:45:35 -0800 Created attachment 362138 Patch 1506696 4 362138 thorton 2019-02-15 11:54:00 -0800 Comment on attachment 362138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362138&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2827 > + if (baseWritingDirection == WebCore::WritingDirection::LeftToRight && !UIKeyboardIsRightToLeftInputModeActive()) This confused me, you explained it ("active" should read "available" or something), it might need a comment. 1506697 5 wenson_hsieh 2019-02-15 11:54:30 -0800 (In reply to Tim Horton from comment #4) > Comment on attachment 362138 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=362138&action=review > > > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2827 > > + if (baseWritingDirection == WebCore::WritingDirection::LeftToRight && !UIKeyboardIsRightToLeftInputModeActive()) > > This confused me, you explained it ("active" should read "available" or > something), it might need a comment. 👍 1506718 6 362147 wenson_hsieh 2019-02-15 12:44:36 -0800 Created attachment 362147 Patch for landing 1506751 7 commit-queue 2019-02-15 13:35:09 -0800 The commit-queue encountered the following flaky tests while processing attachment 362147: media/modern-media-controls/compact-media-controls/compact-media-controls-layout.html bug 194720 (author: graouts@apple.com) The commit-queue is continuing to process your patch. 1506752 8 362147 commit-queue 2019-02-15 13:35:57 -0800 Comment on attachment 362147 Patch for landing Clearing flags on attachment: 362147 Committed r241614: <https://trac.webkit.org/changeset/241614> 362138 2019-02-15 11:45:35 -0800 2019-02-15 11:53:20 -0800 Patch bug-190015-20190215114534.patch text/plain 14963 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQwM2VmOTAwNWI0MWIwODJl NzkxODZkYTc1YWFkYjRhNzdjMzc3NjIuLjhhMmRiNDNhNTRiNGU0YTlhYzdhZDQ3M2ExNDRiZmRk N2FkYTYxMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTktMDItMTUgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV0tXZWJWaWV3 IGNhbGxvdXQgYmFyIGlzIG1pc3NpbmcgQ2hhbmdlIFdyaXRpbmcgRGlyZWN0aW9uIGl0ZW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDAxNQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDQ4MTAzNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU3VwcG9ydCAtbWFrZVRleHRXcml0aW5nRGlyZWN0aW9u TGVmdFRvUmlnaHQ6IGFuZCAtbWFrZVRleHRXcml0aW5nRGlyZWN0aW9uUmlnaHRUb0xlZnQ6IGlu IFdLV2ViVmlldyBvbiBpT1MuCisgICAgICAgIFRvIG1hdGNoIGJlaGF2aW9yIGluIG5hdGl2ZSBV SVRleHRWaWV3cyBvbiBpT1MsIHdlIGltcGxlbWVudCB0aGVzZSBtZXRob2RzIGJ5IGNoYW5naW5n IHRoZSAqYmFzZSogd3JpdGluZworICAgICAgICBkaXJlY3Rpb24sIHJhdGhlciB0aGFuIHRoZSB0 ZXh0IHdyaXRpbmcgZGlyZWN0aW9uICh0aGlzIGlzIGluIGNvbnRyYXN0IHRvIG1hY09TLCB3aGlj aCBoYXMgZGlmZmVyZW50CisgICAgICAgIE5TUmVzcG9uZGVyIG1ldGhvZHMgZm9yIGNoYW5naW5n IHRoZSBiYXNlIHdyaXRpbmcgZGlyZWN0aW9uIGFzIG9wcG9zZWQgdG8gdGhlIHRleHQgd3JpdGlu ZyBkaXJlY3Rpb24pLgorCisgICAgICAgIEFkZGl0aW9uYWxseSBmaXhlcyB0aGUgaW1wbGVtZW50 YXRpb24gb2YgLW1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbk5hdHVyYWw6LCB3aGljaCBjdXJyZW50 bHkgYXR0ZW1wdHMgdG8gY2hhbmdlCisgICAgICAgIHRoZSB0ZXh0IHdyaXRpbmcgZGlyZWN0aW9u IGluc3RlYWQgb2YgdGhlIGJhc2Ugd3JpdGluZyBkaXJlY3Rpb24uCisKKyAgICAgICAgKiBQbGF0 Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisKKyAgICAgICAgQWRkIGEgZm9yd2FyZCBkZWNsYXJh dGlvbiBmb3Iga2V5Ym9hcmRzIFNQSSB0byBkZXRlcm1pbmUgd2hldGhlciB0aGUgdXNlciBoYXMg YW4gYWN0aXZlIFJUTCBrZXlib2FyZC4KKworICAgICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2Rl IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjpk ZWNvZGUpOgorICAgICAgICAoV2ViS2l0OjpvcGVyYXRvcjw8KToKKyAgICAgICAgKiBTaGFyZWQv RWRpdG9yU3RhdGUuaDoKKworICAgICAgICBQbHVtYiB0aGUgYmFzZSB3cml0aW5nIGRpcmVjdGlv biB0byB0aGUgVUkgcHJvY2VzcyB0aHJvdWdoIEVkaXRvclN0YXRlLgorCisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25OYXR1cmFsRm9yV2ViVmlldzpdKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25MZWZ0VG9SaWdodEZv cldlYlZpZXc6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgbWFrZVRleHRXcml0aW5nRGly ZWN0aW9uUmlnaHRUb0xlZnRGb3JXZWJWaWV3Ol0pOgorCisgICAgICAgIEltcGxlbWVudCB0aGUg bmV3IFNQSSAoc2VlIGFib3ZlIGZvciBtb3JlIGRldGFpbHMpLgorCisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgY2FuUGVyZm9ybUFjdGlvbkZvcldlYlZpZXc6d2l0aFNlbmRlcjpdKToKKworICAg ICAgICBJbXBsZW1lbnQgLWNhblBlcmZvcm1BY3Rpb246IGZvciBMVFIgYW5kIFJUTCBhY3Rpb25z LiBUbyBtYXRjaCBleGlzdGluZyBVSVdlYlZpZXcgYmVoYXZpb3IsIHdlIG9ubHkgZW5hYmxlCisg ICAgICAgIHRoZXNlIGFjdGlvbnMgaWYgZWl0aGVyIHRoZSBiYXNlIHdyaXRpbmcgZGlyZWN0aW9u IGlzIFJUTCwgb3IgdGhlIHVzZXIgaGFzIGFuIGFjdGl2ZSBSVEwga2V5Ym9hcmQuIFRoaXMgbWVh bnMsCisgICAgICAgIGZvciBpbnN0YW5jZSwgdGhhdCBpbiB0aGUgY2FzZSB3aGVyZSBhIHVzZXIg d2l0aCBvbmx5IGFuIGVuZ2xpc2gga2V5Ym9hcmQgaXMgZWRpdGluZyBMVFIgY29udGVudCwgd2Ug d291bGQgbmV2ZXIKKyAgICAgICAgc2hvdyBhbiBvcHRpb24gdG8gY29udmVydCB0byBSVEwuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmVkaXRvclN0YXRlIGNvbnN0KToKKwogMjAxOS0wMi0xNCAgV2Vuc29uIEhz aWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBTdXBwb3J0IHBh c3RpbmcgaXRlbS1wcm92aWRlci1iYWNrZWQgZGF0YSBvbiB0aGUgcGFzdGVib2FyZCBhcyBhdHRh Y2htZW50IGVsZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5o CmluZGV4IDAyYzYwMDE4ZDRhNDVmYTQ2OTZjODJmNjJkZWZlMDhjMDI5ZTNmMDMuLjM5NGZmZTFk YmQ4ZjUzZDc2ZGE1ODFhMGQyMzE0MmFiZjU2ZTkzNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC0xMTQzLDYgKzExNDMsNyBAQCBXVEZfRVhURVJOX0Nf QkVHSU4KIAogQk9PTCBVSUtleWJvYXJkRW5hYmxlZElucHV0TW9kZXNBbGxvd09uZVRvTWFueVNo b3J0Y3V0cyh2b2lkKTsKIEJPT0wgVUlLZXlib2FyZEVuYWJsZWRJbnB1dE1vZGVzQWxsb3dDaGlu ZXNlVHJhbnNsaXRlcmF0aW9uRm9yVGV4dChOU1N0cmluZyAqKTsKK0JPT0wgVUlLZXlib2FyZElz UmlnaHRUb0xlZnRJbnB1dE1vZGVBY3RpdmUodm9pZCk7CiAKIGV4dGVybiBjb25zdCBmbG9hdCBV SVRhYmxlQ2VsbERlZmF1bHRGb250U2l6ZTsKIGV4dGVybiBjb25zdCBmbG9hdCBVSVRhYmxlVmll d0NlbGxEZWZhdWx0Rm9udFNpemU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9F ZGl0b3JTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAKaW5k ZXggMjJiOGIxNDc5MTk5OGExNTE1ZTQ2YWEwOGFkZWIyYWQ4MzcxOTc4MC4uYzExNTNiMjg2M2E1 MGI5N2IwNDZkMjVkOTM3MTFkZTVkZDNkZjIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvRWRpdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0 YXRlLmNwcApAQCAtMTExLDEyICsxMTEsMTMgQEAgdm9pZCBFZGl0b3JTdGF0ZTo6UG9zdExheW91 dERhdGE6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAjaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkgfHwgUExBVEZPUk0oR1RLKQogICAgIGVuY29kZXIgPDwgY2FyZXRSZWN0QXRT dGFydDsKICNlbmRpZgotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpIHx8IFBMQVRGT1JNKE1BQykK KyNpZiBQTEFURk9STShDT0NPQSkKICAgICBlbmNvZGVyIDw8IGZvY3VzZWRFbGVtZW50UmVjdDsK ICAgICBlbmNvZGVyIDw8IHNlbGVjdGVkVGV4dExlbmd0aDsKICAgICBlbmNvZGVyIDw8IHRleHRB bGlnbm1lbnQ7CiAgICAgZW5jb2RlciA8PCB0ZXh0Q29sb3I7CiAgICAgZW5jb2RlciA8PCBlbmNs b3NpbmdMaXN0VHlwZTsKKyAgICBlbmNvZGVyIDw8IGJhc2VXcml0aW5nRGlyZWN0aW9uOwogI2Vu ZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBlbmNvZGVyIDw8IGNhcmV0UmVjdEF0 RW5kOwpAQCAtMTUzLDcgKzE1NCw3IEBAIGJvb2wgRWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRh OjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBQb3N0TGF5b3V0RGF0YSYKICAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHJlc3VsdC5jYXJldFJlY3RBdFN0YXJ0KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgfHwgUExBVEZPUk0oTUFD KQorI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmZv Y3VzZWRFbGVtZW50UmVjdCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5zZWxlY3RlZFRleHRMZW5ndGgpKQpAQCAtMTY0LDYgKzE2NSw4IEBA IGJvb2wgRWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBk ZWNvZGVyLCBQb3N0TGF5b3V0RGF0YSYKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUocmVzdWx0LmVuY2xvc2luZ0xpc3RUeXBlKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmJhc2VXcml0aW5nRGlyZWN0 aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5jYXJldFJlY3RBdEVuZCkpCkBA IC0yNjQsNyArMjY3LDcgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywg Y29uc3QgRWRpdG9yU3RhdGUmIGVkaXRvclN0YXRlKQogICAgIGlmIChlZGl0b3JTdGF0ZS5wb3N0 TGF5b3V0RGF0YSgpLmNhcmV0UmVjdEF0U3RhcnQgIT0gSW50UmVjdCgpKQogICAgICAgICB0cy5k dW1wUHJvcGVydHkoImNhcmV0UmVjdEF0U3RhcnQiLCBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0 YSgpLmNhcmV0UmVjdEF0U3RhcnQpOwogI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkg fHwgUExBVEZPUk0oTUFDKQorI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChlZGl0b3JTdGF0 ZS5wb3N0TGF5b3V0RGF0YSgpLmZvY3VzZWRFbGVtZW50UmVjdCAhPSBJbnRSZWN0KCkpCiAgICAg ICAgIHRzLmR1bXBQcm9wZXJ0eSgiZm9jdXNlZEVsZW1lbnRSZWN0IiwgZWRpdG9yU3RhdGUucG9z dExheW91dERhdGEoKS5mb2N1c2VkRWxlbWVudFJlY3QpOwogICAgIGlmIChlZGl0b3JTdGF0ZS5w b3N0TGF5b3V0RGF0YSgpLnNlbGVjdGVkVGV4dExlbmd0aCkKQEAgLTI3NSw3ICsyNzgsOSBAQCBU ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBFZGl0b3JTdGF0ZSYg ZWRpdG9yU3RhdGUpCiAgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgidGV4dENvbG9yIiwgZWRpdG9y U3RhdGUucG9zdExheW91dERhdGEoKS50ZXh0Q29sb3IpOwogICAgIGlmIChlZGl0b3JTdGF0ZS5w b3N0TGF5b3V0RGF0YSgpLmVuY2xvc2luZ0xpc3RUeXBlICE9IE5vTGlzdCkKICAgICAgICAgdHMu ZHVtcFByb3BlcnR5KCJlbmNsb3NpbmdMaXN0VHlwZSIsIGVkaXRvclN0YXRlLnBvc3RMYXlvdXRE YXRhKCkuZW5jbG9zaW5nTGlzdFR5cGUpOwotI2VuZGlmCisgICAgaWYgKGVkaXRvclN0YXRlLnBv c3RMYXlvdXREYXRhKCkuYmFzZVdyaXRpbmdEaXJlY3Rpb24gIT0gV2ViQ29yZTo6V3JpdGluZ0Rp cmVjdGlvbjo6TmF0dXJhbCkKKyAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJiYXNlV3JpdGluZ0Rp cmVjdGlvbiIsIHN0YXRpY19jYXN0PHVpbnQ4X3Q+KGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRh KCkuYmFzZVdyaXRpbmdEaXJlY3Rpb24pKTsKKyNlbmRpZiAvLyBQTEFURk9STShDT0NPQSkKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0 YSgpLmNhcmV0UmVjdEF0RW5kICE9IEludFJlY3QoKSkKICAgICAgICAgdHMuZHVtcFByb3BlcnR5 KCJjYXJldFJlY3RBdEVuZCIsIGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuY2FyZXRSZWN0 QXRFbmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuaCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmgKaW5kZXggNWVlNDEwNWZmNzljOTY4 OGE4Y2ZjZDMyMWQ2M2QxN2JkODAwMTdhOC4uNGUxZDVhNGViMDRiNTYxZjI5ZjhkNTBmOTY1ZjAw NmUwZWJiY2I0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5oCkBAIC0yOSw2ICsyOSw3 IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9Db2xvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9udEF0 dHJpYnV0ZXMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KKyNpbmNsdWRlIDxXZWJD b3JlL1dyaXRpbmdEaXJlY3Rpb24uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC04OCwxMiArODksMTMgQEAgc3RydWN0IEVk aXRvclN0YXRlIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKSB8fCBQTEFURk9STShHVEspCiAg ICAgICAgIFdlYkNvcmU6OkludFJlY3QgY2FyZXRSZWN0QXRTdGFydDsKICNlbmRpZgotI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpIHx8IFBMQVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShDT0NPQSkK ICAgICAgICAgV2ViQ29yZTo6SW50UmVjdCBmb2N1c2VkRWxlbWVudFJlY3Q7CiAgICAgICAgIHVp bnQ2NF90IHNlbGVjdGVkVGV4dExlbmd0aCB7IDAgfTsKICAgICAgICAgdWludDMyX3QgdGV4dEFs aWdubWVudCB7IE5vQWxpZ25tZW50IH07CiAgICAgICAgIFdlYkNvcmU6OkNvbG9yIHRleHRDb2xv ciB7IFdlYkNvcmU6OkNvbG9yOjpibGFjayB9OwogICAgICAgICB1aW50MzJfdCBlbmNsb3NpbmdM aXN0VHlwZSB7IE5vTGlzdCB9OworICAgICAgICBXZWJDb3JlOjpXcml0aW5nRGlyZWN0aW9uIGJh c2VXcml0aW5nRGlyZWN0aW9uIHsgV2ViQ29yZTo6V3JpdGluZ0RpcmVjdGlvbjo6TmF0dXJhbCB9 OwogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgV2ViQ29yZTo6SW50 UmVjdCBjYXJldFJlY3RBdEVuZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAyY2M3ZDAwNzlkYjk0NDc2NWIz YzAzZDEyYzM0ZjkxMmVkY2JiZTI4Li5kZDRjYzNjOWQzMDI0OTk5YTNkNzVmMWY3MjZjOGVhNzQw MTZlY2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC0xMzEsNyArMTMxLDkgQEAgdHlwZWRlZiBzdGQ6OnBh aXI8V2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCwgSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkMKICAgICBNKGluY3JlYXNlU2l6ZSkgXAogICAgIE0oZGVjcmVhc2VTaXplKSBcCiAg ICAgTShwYXN0ZUFuZE1hdGNoU3R5bGUpIFwKLSAgICBNKG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlv bk5hdHVyYWwpCisgICAgTShtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25OYXR1cmFsKSBcCisgICAg TShtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25MZWZ0VG9SaWdodCkgXAorICAgIE0obWFrZVRleHRX cml0aW5nRGlyZWN0aW9uUmlnaHRUb0xlZnQpCiAKICNkZWZpbmUgRk9SX0VBQ0hfUFJJVkFURV9X S0NPTlRFTlRWSUVXX0FDVElPTihNKSBcCiAgICAgTShfYWxpZ25DZW50ZXIpIFwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tCmluZGV4IDVhMjA1OTZlNzkzYTQ1OWExNTFmOThjNGQ3MDYyNDBhZWEwZmE2NjQuLjI1NWVk OTMzMDQ2ZDlhOTUzNmFmM2YyYWE0MTlmMjQ0ZTg4ZWE5ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAt MjQ3MSw3ICsyNDcxLDE5IEBAIC0gKE5TU3RyaW5nICopc2VsZWN0ZWRUZXh0CiAKIC0gKHZvaWQp bWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTmF0dXJhbEZvcldlYlZpZXc6KGlkKXNlbmRlcgogewot ICAgIF9wYWdlLT5leGVjdXRlRWRpdENvbW1hbmQoIm1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbk5h dHVyYWwiX3MpOworICAgIC8vIE1hdGNoIHBsYXRmb3JtIGJlaGF2aW9yIG9uIGlPUyBhcyB3ZWxs IGFzIGxlZ2FjeSBXZWJLaXQgYmVoYXZpb3IgYnkgbW9kaWZ5aW5nIHRoZQorICAgIC8vIGJhc2Ug KHBhcmFncmFwaCkgd3JpdGluZyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIGlubGluZSBkaXJl Y3Rpb24uCisgICAgX3BhZ2UtPnNldEJhc2VXcml0aW5nRGlyZWN0aW9uKFdlYkNvcmU6OldyaXRp bmdEaXJlY3Rpb246Ok5hdHVyYWwpOworfQorCistICh2b2lkKW1ha2VUZXh0V3JpdGluZ0RpcmVj dGlvbkxlZnRUb1JpZ2h0Rm9yV2ViVmlldzooaWQpc2VuZGVyCit7CisgICAgX3BhZ2UtPnNldEJh c2VXcml0aW5nRGlyZWN0aW9uKFdlYkNvcmU6OldyaXRpbmdEaXJlY3Rpb246OkxlZnRUb1JpZ2h0 KTsKK30KKworLSAodm9pZCltYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25SaWdodFRvTGVmdEZvcldl YlZpZXc6KGlkKXNlbmRlcgoreworICAgIF9wYWdlLT5zZXRCYXNlV3JpdGluZ0RpcmVjdGlvbihX ZWJDb3JlOjpXcml0aW5nRGlyZWN0aW9uOjpSaWdodFRvTGVmdCk7CiB9CiAKIC0gKEJPT0wpaXNS ZXBsYWNlQWxsb3dlZApAQCAtMjgwNyw2ICsyODE5LDIwIEBAIC0gKEJPT0wpY2FuUGVyZm9ybUFj dGlvbkZvcldlYlZpZXc6KFNFTClhY3Rpb24gd2l0aFNlbmRlcjooaWQpc2VuZGVyCiAgICAgaWYg KGFjdGlvbiA9PSBAc2VsZWN0b3IocmVwbGFjZTopKQogICAgICAgICByZXR1cm4gZWRpdG9yU3Rh dGUuaXNDb250ZW50RWRpdGFibGUgJiYgIWVkaXRvclN0YXRlLmlzSW5QYXNzd29yZEZpZWxkOwog CisgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IobWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTGVm dFRvUmlnaHQ6KSB8fCBhY3Rpb24gPT0gQHNlbGVjdG9yKG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlv blJpZ2h0VG9MZWZ0OikpIHsKKyAgICAgICAgaWYgKCFlZGl0b3JTdGF0ZS5pc0NvbnRlbnRFZGl0 YWJsZSkKKyAgICAgICAgICAgIHJldHVybiBOTzsKKworICAgICAgICBhdXRvIGJhc2VXcml0aW5n RGlyZWN0aW9uID0gZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5iYXNlV3JpdGluZ0RpcmVj dGlvbjsKKyAgICAgICAgaWYgKGJhc2VXcml0aW5nRGlyZWN0aW9uID09IFdlYkNvcmU6OldyaXRp bmdEaXJlY3Rpb246OkxlZnRUb1JpZ2h0ICYmICFVSUtleWJvYXJkSXNSaWdodFRvTGVmdElucHV0 TW9kZUFjdGl2ZSgpKQorICAgICAgICAgICAgcmV0dXJuIE5POworCisgICAgICAgIGlmIChhY3Rp b24gPT0gQHNlbGVjdG9yKG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbkxlZnRUb1JpZ2h0OikpCisg ICAgICAgICAgICByZXR1cm4gYmFzZVdyaXRpbmdEaXJlY3Rpb24gIT0gV2ViQ29yZTo6V3JpdGlu Z0RpcmVjdGlvbjo6TGVmdFRvUmlnaHQ7CisKKyAgICAgICAgcmV0dXJuIGJhc2VXcml0aW5nRGly ZWN0aW9uICE9IFdlYkNvcmU6OldyaXRpbmdEaXJlY3Rpb246OlJpZ2h0VG9MZWZ0OworICAgIH0K KwogICAgIHJldHVybiBbc3VwZXIgY2FuUGVyZm9ybUFjdGlvbjphY3Rpb24gd2l0aFNlbmRlcjpz ZW5kZXJdOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCmluZGV4IDMzMWQ1NTg3ODE5YTZiNTIzMGZmZTcxYmJmZmUyZmM2MTc3NDEwMmYuLjhjMTI0 YmMwZTBkMWE3ZTc0ZGQ3NjU1NTZkNzA0MTUyNmZjMWUxMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMDIxLDYgKzEwMjEsOCBAQCBFZGl0 b3JTdGF0ZSBXZWJQYWdlOjplZGl0b3JTdGF0ZShJbmNsdWRlUG9zdExheW91dERhdGFIaW50IHNo b3VsZEluY2x1ZGVQb3N0TGF5bwogICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IHBvc3RMYXlvdXREYXRhLmJhc2VXcml0aW5nRGlyZWN0aW9uID0gZWRpdG9yLmJhc2VXcml0aW5n RGlyZWN0aW9uRm9yU2VsZWN0aW9uU3RhcnQoKTsKICAgICAgICAgfQogI2VuZGlmCiAgICAgfQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDA4NzM1 MjlmYmE2NmJhZGEwYjgyZWU3NjIyYjRmNzExNWMwMzExYzIuLjE2ZjI5Mzc1ZWFkNjBkNjI3M2Yy OGMxZTkwNzBhMjdiZjlmNGEyNWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wMi0xNSAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1dlYlZpZXcgY2Fs bG91dCBiYXIgaXMgbWlzc2luZyBDaGFuZ2UgV3JpdGluZyBEaXJlY3Rpb24gaXRlbQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMDE1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NDgxMDM2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIGFuIGV4aXN0aW5nIEFQSSB0ZXN0IHRoYXQgZXhlcmNp c2VzIHBsYXRmb3JtIFNQSSB0byBjaGFuZ2UgdGhlIGlubGluZSB0ZXh0IHdyaXRpbmcgZGlyZWN0 aW9uIHJ1biBvbmx5IG9uCisgICAgICAgIG1hY09TLCBhbmQgYWRkIGEgbmV3IEFQSSB0ZXN0IHRo YXQgdXNlcyBzaW1pbGFybHkgbmFtZWQgU1BJIG9uIGlPUyB0byBjaGFuZ2UgdGhlIGJhc2Ugd3Jp dGluZyBkaXJlY3Rpb24uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dLV2ViVmlld0VkaXRBY3Rpb25zLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVT VCk6CisKIDIwMTktMDItMTQgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+ CiAKICAgICAgICAgW2lPU10gU3VwcG9ydCBwYXN0aW5nIGl0ZW0tcHJvdmlkZXItYmFja2VkIGRh dGEgb24gdGhlIHBhc3RlYm9hcmQgYXMgYXR0YWNobWVudCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdFZGl0QWN0aW9u cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3RWRp dEFjdGlvbnMubW0KaW5kZXggMTAxOTQ4MjA1NGY4YTM4ZDYwMWI5YzdhZWFiMGNmMTY2MDU3Y2Zl Zi4uOWQ3YmZlNGUyZTQ5M2YwYTExN2RmYzRjNWJkZDMwNzNjNWNmODM4MiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdFZGl0QWN0aW9u cy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmll d0VkaXRBY3Rpb25zLm1tCkBAIC0yNTgsMTYgKzI1OCwzMiBAQCBURVNUKFdLV2ViVmlld0VkaXRB Y3Rpb25zLCBQYXN0ZUFuZE1hdGNoU3R5bGUpCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJXZWJLaXQi LCBbZGVzdGluYXRpb24gc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImdldFNlbGVjdGlv bigpLnRvU3RyaW5nKCkiXSk7CiB9CiAKLVRFU1QoV0tXZWJWaWV3RWRpdEFjdGlvbnMsIE1vZGlm eVRleHRXcml0aW5nRGlyZWN0aW9uKQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisKK1RFU1Qo V0tXZWJWaWV3RWRpdEFjdGlvbnMsIE1vZGlmeUJhc2VXcml0aW5nRGlyZWN0aW9uKQogewotICAg IGF1dG8gd2ViVmlldyA9IHdlYlZpZXdGb3JFZGl0QWN0aW9uVGVzdGluZyhAIjxkaXYgaWQ9J3Rl eHQnIHN0eWxlPSdkaXJlY3Rpb246IHJ0bDsgdW5pY29kZS1iaWRpOiBiaWRpLW92ZXJyaWRlOyc+ V2ViS2l0PC9kaXY+Iik7Ci0gICAgW3dlYlZpZXcgc2VsZWN0QWxsOm5pbF07CisgICAgYXV0byB3 ZWJWaWV3ID0gd2ViVmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKEAiPG1ldGEgY2hhcnNldD0ndXRm OCc+PHAgaWQ9J2VuZ2xpc2gnPkhlbGxvIHdvcmxkPC9wPjxwIGlkPSdoZWJyZXcnPtee16fXldeo INeU16nXnSDXoteR16jXmdeqPC9wPiIpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2Ny aXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24oZW5nbGlzaCkiIGNvbXBsZXRpb25IYW5k bGVyOm5pbF07CisgICAgW3dlYlZpZXcgbWFrZVRleHRXcml0aW5nRGlyZWN0aW9uUmlnaHRUb0xl ZnQ6bmlsXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07Cisg ICAgRVhQRUNUX1dLX1NUUkVRKCJydGwiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZh U2NyaXB0OkAiZ2V0Q29tcHV0ZWRTdHlsZShlbmdsaXNoKS5kaXJlY3Rpb24iXSk7CisgICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IGNhblBlcmZvcm1BY3Rpb246QHNlbGVjdG9yKG1ha2VUZXh0V3Jp dGluZ0RpcmVjdGlvblJpZ2h0VG9MZWZ0Oikgd2l0aFNlbmRlcjpuaWxdKTsKKyAgICBFWFBFQ1Rf VFJVRShbd2ViVmlldyBjYW5QZXJmb3JtQWN0aW9uOkBzZWxlY3RvcihtYWtlVGV4dFdyaXRpbmdE aXJlY3Rpb25MZWZ0VG9SaWdodDopIHdpdGhTZW5kZXI6bmlsXSk7CisKKyAgICBbd2ViVmlldyBl dmFsdWF0ZUphdmFTY3JpcHQ6QCJnZXRTZWxlY3Rpb24oKS5zZXRQb3NpdGlvbihoZWJyZXcpIiBj b21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgIFt3ZWJWaWV3IG1ha2VUZXh0V3JpdGluZ0RpcmVj dGlvbkxlZnRUb1JpZ2h0Om5pbF07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRp b25VcGRhdGVdOworICAgIEVYUEVDVF9XS19TVFJFUSgibHRyIiwgW3dlYlZpZXcgc3RyaW5nQnlF dmFsdWF0aW5nSmF2YVNjcmlwdDpAImdldENvbXB1dGVkU3R5bGUoaGVicmV3KS5kaXJlY3Rpb24i XSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGNhblBlcmZvcm1BY3Rpb246QHNlbGVjdG9y KG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbkxlZnRUb1JpZ2h0Oikgd2l0aFNlbmRlcjpuaWxdKTsK KworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAImdldFNlbGVjdGlvbigpLnNldFBv c2l0aW9uKGVuZ2xpc2gpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwogICAgIFt3ZWJWaWV3IG1h a2VUZXh0V3JpdGluZ0RpcmVjdGlvbk5hdHVyYWw6bmlsXTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEo Im5vcm1hbCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRDb21w dXRlZFN0eWxlKHRleHQpLnVuaWNvZGVCaWRpIl0pOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0 UHJlc2VudGF0aW9uVXBkYXRlXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImx0ciIsIFt3ZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRDb21wdXRlZFN0eWxlKGVuZ2xpc2gp LmRpcmVjdGlvbiJdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgY2FuUGVyZm9ybUFjdGlv bjpAc2VsZWN0b3IobWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTGVmdFRvUmlnaHQ6KSB3aXRoU2Vu ZGVyOm5pbF0pOwogfQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLQogVEVTVChXS1dlYlZp ZXdFZGl0QWN0aW9ucywgQ2hhbmdlRm9udFNpemUpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gd2Vi Vmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKCk7CkBAIC0zMjgsNyArMzQ0LDE3IEBAIFRFU1QoV0tX ZWJWaWV3RWRpdEFjdGlvbnMsIFNldEZvbnRGYW1pbHkpCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJp dGFsaWMiLCBbd2ViVmlldyBzdHlsZVByb3BlcnR5QXRTZWxlY3Rpb25TdGFydDpAImZvbnQtc3R5 bGUiXSk7CiB9CiAKLSNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZKQorI2Vsc2UKKworVEVT VChXS1dlYlZpZXdFZGl0QWN0aW9ucywgTW9kaWZ5VGV4dFdyaXRpbmdEaXJlY3Rpb24pCit7Cisg ICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKEAiPGRpdiBpZD0n dGV4dCcgc3R5bGU9J2RpcmVjdGlvbjogcnRsOyB1bmljb2RlLWJpZGk6IGJpZGktb3ZlcnJpZGU7 Jz5XZWJLaXQ8L2Rpdj4iKTsKKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAgICBbd2Vi VmlldyBtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25OYXR1cmFsOm5pbF07CisgICAgRVhQRUNUX1dL X1NUUkVRKCJub3JtYWwiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAi Z2V0Q29tcHV0ZWRTdHlsZSh0ZXh0KS51bmljb2RlQmlkaSJdKTsKK30KKworI2VuZGlmCiAKIH0g Ly8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKIAo= 362147 2019-02-15 12:44:36 -0800 2019-02-15 13:35:57 -0800 Patch for landing bug-190015-20190215124435.patch text/plain 15197 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc5OTRiNmY1ZDE5YjZlNzJl YTUzNDE1NGNhMWEyOGViMzQwMTY1YTguLjhjNTA4YWM1MWFkYjUyMWY3YmE1ZjgwMTE0NGQ2Mzg5 N2I5MGMwMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTktMDItMTUgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV0tXZWJWaWV3 IGNhbGxvdXQgYmFyIGlzIG1pc3NpbmcgQ2hhbmdlIFdyaXRpbmcgRGlyZWN0aW9uIGl0ZW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDAxNQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDQ4MTAzNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGlt IEhvcnRvbi4KKworICAgICAgICBTdXBwb3J0IC1tYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25MZWZ0 VG9SaWdodDogYW5kIC1tYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25SaWdodFRvTGVmdDogaW4gV0tX ZWJWaWV3IG9uIGlPUy4KKyAgICAgICAgVG8gbWF0Y2ggYmVoYXZpb3IgaW4gbmF0aXZlIFVJVGV4 dFZpZXdzIG9uIGlPUywgd2UgaW1wbGVtZW50IHRoZXNlIG1ldGhvZHMgYnkgY2hhbmdpbmcgdGhl ICpiYXNlKiB3cml0aW5nCisgICAgICAgIGRpcmVjdGlvbiwgcmF0aGVyIHRoYW4gdGhlIHRleHQg d3JpdGluZyBkaXJlY3Rpb24gKHRoaXMgaXMgaW4gY29udHJhc3QgdG8gbWFjT1MsIHdoaWNoIGhh cyBkaWZmZXJlbnQKKyAgICAgICAgTlNSZXNwb25kZXIgbWV0aG9kcyBmb3IgY2hhbmdpbmcgdGhl IGJhc2Ugd3JpdGluZyBkaXJlY3Rpb24gYXMgb3Bwb3NlZCB0byB0aGUgdGV4dCB3cml0aW5nIGRp cmVjdGlvbikuCisKKyAgICAgICAgQWRkaXRpb25hbGx5IGZpeGVzIHRoZSBpbXBsZW1lbnRhdGlv biBvZiAtbWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTmF0dXJhbDosIHdoaWNoIGN1cnJlbnRseSBh dHRlbXB0cyB0byBjaGFuZ2UKKyAgICAgICAgdGhlIHRleHQgd3JpdGluZyBkaXJlY3Rpb24gaW5z dGVhZCBvZiB0aGUgYmFzZSB3cml0aW5nIGRpcmVjdGlvbi4KKworICAgICAgICAqIFBsYXRmb3Jt L3NwaS9pb3MvVUlLaXRTUEkuaDoKKworICAgICAgICBBZGQgYSBmb3J3YXJkIGRlY2xhcmF0aW9u IGZvciBrZXlib2FyZHMgU1BJIHRvIGRldGVybWluZSB3aGV0aGVyIHRoZSB1c2VyIGhhcyBhbiBh Y3RpdmUgUlRMIGtleWJvYXJkLgorCisgICAgICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjplbmNvZGUgY29u c3QpOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0ZTo6UG9zdExheW91dERhdGE6OmRlY29k ZSk6CisgICAgICAgIChXZWJLaXQ6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIFNoYXJlZC9FZGl0 b3JTdGF0ZS5oOgorCisgICAgICAgIFBsdW1iIHRoZSBiYXNlIHdyaXRpbmcgZGlyZWN0aW9uIHRv IHRoZSBVSSBwcm9jZXNzIHRocm91Z2ggRWRpdG9yU3RhdGUuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbk5hdHVyYWxGb3JXZWJWaWV3Ol0pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbkxlZnRUb1JpZ2h0Rm9yV2Vi VmlldzpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBtYWtlVGV4dFdyaXRpbmdEaXJlY3Rp b25SaWdodFRvTGVmdEZvcldlYlZpZXc6XSk6CisKKyAgICAgICAgSW1wbGVtZW50IHRoZSBuZXcg U1BJIChzZWUgYWJvdmUgZm9yIG1vcmUgZGV0YWlscykuCisKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBjYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorCisgICAgICAg IEltcGxlbWVudCAtY2FuUGVyZm9ybUFjdGlvbjogZm9yIExUUiBhbmQgUlRMIGFjdGlvbnMuIFRv IG1hdGNoIGV4aXN0aW5nIFVJV2ViVmlldyBiZWhhdmlvciwgd2Ugb25seSBlbmFibGUKKyAgICAg ICAgdGhlc2UgYWN0aW9ucyBpZiBlaXRoZXIgdGhlIGJhc2Ugd3JpdGluZyBkaXJlY3Rpb24gaXMg UlRMLCBvciB0aGUgdXNlciBoYXMgYW4gYWN0aXZlIFJUTCBrZXlib2FyZC4gVGhpcyBtZWFucywK KyAgICAgICAgZm9yIGluc3RhbmNlLCB0aGF0IGluIHRoZSBjYXNlIHdoZXJlIGEgdXNlciB3aXRo IG9ubHkgYW4gRW5nbGlzaCBrZXlib2FyZCBpcyBlZGl0aW5nIExUUiBjb250ZW50LCB3ZSB3b3Vs ZCBuZXZlcgorICAgICAgICBzaG93IGFuIG9wdGlvbiB0byBjb252ZXJ0IHRvIFJUTC4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZWRpdG9yU3RhdGUgY29uc3QpOgorCiAyMDE5LTAyLTE1ICBCcmlhbiBCdXJnICA8 YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFdlYkluc3BlY3RvclVJLmZyYW1ld29y ayBkb2VzIG5vdCBuZWVkIHRvIGJlIHNvZnQtbGlua2VkIGFueW1vcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdC9Q bGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggMDJjNjAwMThkNGE0NWZhNDY5NmM4MmY2 MmRlZmUwOGMwMjllM2YwMy4uMzk0ZmZlMWRiZDhmNTNkNzZkYTU4MWEwZDIzMTQyYWJmNTZlOTM0 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgK KysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTExNDMs NiArMTE0Myw3IEBAIFdURl9FWFRFUk5fQ19CRUdJTgogCiBCT09MIFVJS2V5Ym9hcmRFbmFibGVk SW5wdXRNb2Rlc0FsbG93T25lVG9NYW55U2hvcnRjdXRzKHZvaWQpOwogQk9PTCBVSUtleWJvYXJk RW5hYmxlZElucHV0TW9kZXNBbGxvd0NoaW5lc2VUcmFuc2xpdGVyYXRpb25Gb3JUZXh0KE5TU3Ry aW5nICopOworQk9PTCBVSUtleWJvYXJkSXNSaWdodFRvTGVmdElucHV0TW9kZUFjdGl2ZSh2b2lk KTsKIAogZXh0ZXJuIGNvbnN0IGZsb2F0IFVJVGFibGVDZWxsRGVmYXVsdEZvbnRTaXplOwogZXh0 ZXJuIGNvbnN0IGZsb2F0IFVJVGFibGVWaWV3Q2VsbERlZmF1bHRGb250U2l6ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL0VkaXRvclN0YXRlLmNwcAppbmRleCAyMmI4YjE0NzkxOTk4YTE1MTVlNDZhYTA4YWRl YjJhZDgzNzE5NzgwLi5jMTE1M2IyODYzYTUwYjk3YjA0NmQyNWQ5MzcxMWRlNWRkM2RmMjAzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC0xMTEsMTIgKzExMSwxMyBAQCB2 b2lkIEVkaXRvclN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5j b2RlcikgY29uc3QKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKSB8fCBQTEFURk9STShHVEspCiAg ICAgZW5jb2RlciA8PCBjYXJldFJlY3RBdFN0YXJ0OwogI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkgfHwgUExBVEZPUk0oTUFDKQorI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGVuY29k ZXIgPDwgZm9jdXNlZEVsZW1lbnRSZWN0OwogICAgIGVuY29kZXIgPDwgc2VsZWN0ZWRUZXh0TGVu Z3RoOwogICAgIGVuY29kZXIgPDwgdGV4dEFsaWdubWVudDsKICAgICBlbmNvZGVyIDw8IHRleHRD b2xvcjsKICAgICBlbmNvZGVyIDw8IGVuY2xvc2luZ0xpc3RUeXBlOworICAgIGVuY29kZXIgPDwg YmFzZVdyaXRpbmdEaXJlY3Rpb247CiAjZW5kaWYKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog ICAgIGVuY29kZXIgPDwgY2FyZXRSZWN0QXRFbmQ7CkBAIC0xNTMsNyArMTU0LDcgQEAgYm9vbCBF ZGl0b3JTdGF0ZTo6UG9zdExheW91dERhdGE6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIs IFBvc3RMYXlvdXREYXRhJgogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNhcmV0UmVj dEF0U3RhcnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKLSNpZiBQTEFURk9STShJ T1NfRkFNSUxZKSB8fCBQTEFURk9STShNQUMpCisjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZm9jdXNlZEVsZW1lbnRSZWN0KSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNlbGVjdGVkVGV4dExl bmd0aCkpCkBAIC0xNjQsNiArMTY1LDggQEAgYm9vbCBFZGl0b3JTdGF0ZTo6UG9zdExheW91dERh dGE6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIFBvc3RMYXlvdXREYXRhJgogICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZW5jbG9zaW5n TGlzdFR5cGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShyZXN1bHQuYmFzZVdyaXRpbmdEaXJlY3Rpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAj ZW5kaWYKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0LmNhcmV0UmVjdEF0RW5kKSkKQEAgLTI2NCw3ICsyNjcsNyBAQCBUZXh0U3RyZWFtJiBv cGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBFZGl0b3JTdGF0ZSYgZWRpdG9yU3RhdGUp CiAgICAgaWYgKGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuY2FyZXRSZWN0QXRTdGFydCAh PSBJbnRSZWN0KCkpCiAgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgiY2FyZXRSZWN0QXRTdGFydCIs IGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuY2FyZXRSZWN0QXRTdGFydCk7CiAjZW5kaWYK LSNpZiBQTEFURk9STShJT1NfRkFNSUxZKSB8fCBQTEFURk9STShNQUMpCisjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgaWYgKGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuZm9jdXNlZEVsZW1l bnRSZWN0ICE9IEludFJlY3QoKSkKICAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJmb2N1c2VkRWxl bWVudFJlY3QiLCBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLmZvY3VzZWRFbGVtZW50UmVj dCk7CiAgICAgaWYgKGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuc2VsZWN0ZWRUZXh0TGVu Z3RoKQpAQCAtMjc1LDcgKzI3OCw5IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVh bSYgdHMsIGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3JTdGF0ZSkKICAgICAgICAgdHMuZHVtcFBy b3BlcnR5KCJ0ZXh0Q29sb3IiLCBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLnRleHRDb2xv cik7CiAgICAgaWYgKGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuZW5jbG9zaW5nTGlzdFR5 cGUgIT0gTm9MaXN0KQogICAgICAgICB0cy5kdW1wUHJvcGVydHkoImVuY2xvc2luZ0xpc3RUeXBl IiwgZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5lbmNsb3NpbmdMaXN0VHlwZSk7Ci0jZW5k aWYKKyAgICBpZiAoZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5iYXNlV3JpdGluZ0RpcmVj dGlvbiAhPSBXZWJDb3JlOjpXcml0aW5nRGlyZWN0aW9uOjpOYXR1cmFsKQorICAgICAgICB0cy5k dW1wUHJvcGVydHkoImJhc2VXcml0aW5nRGlyZWN0aW9uIiwgc3RhdGljX2Nhc3Q8dWludDhfdD4o ZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5iYXNlV3JpdGluZ0RpcmVjdGlvbikpOworI2Vu ZGlmIC8vIFBMQVRGT1JNKENPQ09BKQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYg KGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuY2FyZXRSZWN0QXRFbmQgIT0gSW50UmVjdCgp KQogICAgICAgICB0cy5kdW1wUHJvcGVydHkoImNhcmV0UmVjdEF0RW5kIiwgZWRpdG9yU3RhdGUu cG9zdExheW91dERhdGEoKS5jYXJldFJlY3RBdEVuZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3Rh dGUuaAppbmRleCA1ZWU0MTA1ZmY3OWM5Njg4YThjZmNkMzIxZDYzZDE3YmQ4MDAxN2E4Li40ZTFk NWE0ZWIwNGI1NjFmMjlmOGQ1MGY5NjVmMDA2ZTBlYmJjYjRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Vk aXRvclN0YXRlLmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9Gb250QXR0cmlidXRlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUv SW50UmVjdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvV3JpdGluZ0RpcmVjdGlvbi5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAg LTg4LDEyICs4OSwxMyBAQCBzdHJ1Y3QgRWRpdG9yU3RhdGUgewogI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpIHx8IFBMQVRGT1JNKEdUSykKICAgICAgICAgV2ViQ29yZTo6SW50UmVjdCBjYXJldFJl Y3RBdFN0YXJ0OwogI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgfHwgUExBVEZPUk0o TUFDKQorI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICBXZWJDb3JlOjpJbnRSZWN0IGZvY3Vz ZWRFbGVtZW50UmVjdDsKICAgICAgICAgdWludDY0X3Qgc2VsZWN0ZWRUZXh0TGVuZ3RoIHsgMCB9 OwogICAgICAgICB1aW50MzJfdCB0ZXh0QWxpZ25tZW50IHsgTm9BbGlnbm1lbnQgfTsKICAgICAg ICAgV2ViQ29yZTo6Q29sb3IgdGV4dENvbG9yIHsgV2ViQ29yZTo6Q29sb3I6OmJsYWNrIH07CiAg ICAgICAgIHVpbnQzMl90IGVuY2xvc2luZ0xpc3RUeXBlIHsgTm9MaXN0IH07CisgICAgICAgIFdl YkNvcmU6OldyaXRpbmdEaXJlY3Rpb24gYmFzZVdyaXRpbmdEaXJlY3Rpb24geyBXZWJDb3JlOjpX cml0aW5nRGlyZWN0aW9uOjpOYXR1cmFsIH07CiAjZW5kaWYKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogICAgICAgICBXZWJDb3JlOjpJbnRSZWN0IGNhcmV0UmVjdEF0RW5kOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5o CmluZGV4IDJjYzdkMDA3OWRiOTQ0NzY1YjNjMDNkMTJjMzRmOTEyZWRjYmJlMjguLmRkNGNjM2M5 ZDMwMjQ5OTlhM2Q3NWYxZjcyNmM4ZWE3NDAxNmVjZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTEzMSw3 ICsxMzEsOSBAQCB0eXBlZGVmIHN0ZDo6cGFpcjxXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRp b25SZXF1ZXN0LCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQwogICAgIE0oaW5jcmVhc2VTaXplKSBc CiAgICAgTShkZWNyZWFzZVNpemUpIFwKICAgICBNKHBhc3RlQW5kTWF0Y2hTdHlsZSkgXAotICAg IE0obWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTmF0dXJhbCkKKyAgICBNKG1ha2VUZXh0V3JpdGlu Z0RpcmVjdGlvbk5hdHVyYWwpIFwKKyAgICBNKG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbkxlZnRU b1JpZ2h0KSBcCisgICAgTShtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25SaWdodFRvTGVmdCkKIAog I2RlZmluZSBGT1JfRUFDSF9QUklWQVRFX1dLQ09OVEVOVFZJRVdfQUNUSU9OKE0pIFwKICAgICBN KF9hbGlnbkNlbnRlcikgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggYWUzNDg1Mjk5YTA5M2I3OWZiZWJi M2I2MzM0MjQxODk2NzQ3N2Y5Ni4uZTc1ODc0MDNjOTZhYWUzZDlhNTQ5MDI0MDMyNmU4NjRmNTA0 YjY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0yNDcxLDcgKzI0NzEsMTkgQEAgLSAoTlNTdHJpbmcg KilzZWxlY3RlZFRleHQKIAogLSAodm9pZCltYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25OYXR1cmFs Rm9yV2ViVmlldzooaWQpc2VuZGVyCiB7Ci0gICAgX3BhZ2UtPmV4ZWN1dGVFZGl0Q29tbWFuZCgi bWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTmF0dXJhbCJfcyk7CisgICAgLy8gTWF0Y2ggcGxhdGZv cm0gYmVoYXZpb3Igb24gaU9TIGFzIHdlbGwgYXMgbGVnYWN5IFdlYktpdCBiZWhhdmlvciBieSBt b2RpZnlpbmcgdGhlCisgICAgLy8gYmFzZSAocGFyYWdyYXBoKSB3cml0aW5nIGRpcmVjdGlvbiBy YXRoZXIgdGhhbiB0aGUgaW5saW5lIGRpcmVjdGlvbi4KKyAgICBfcGFnZS0+c2V0QmFzZVdyaXRp bmdEaXJlY3Rpb24oV2ViQ29yZTo6V3JpdGluZ0RpcmVjdGlvbjo6TmF0dXJhbCk7Cit9CisKKy0g KHZvaWQpbWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTGVmdFRvUmlnaHRGb3JXZWJWaWV3OihpZClz ZW5kZXIKK3sKKyAgICBfcGFnZS0+c2V0QmFzZVdyaXRpbmdEaXJlY3Rpb24oV2ViQ29yZTo6V3Jp dGluZ0RpcmVjdGlvbjo6TGVmdFRvUmlnaHQpOworfQorCistICh2b2lkKW1ha2VUZXh0V3JpdGlu Z0RpcmVjdGlvblJpZ2h0VG9MZWZ0Rm9yV2ViVmlldzooaWQpc2VuZGVyCit7CisgICAgX3BhZ2Ut PnNldEJhc2VXcml0aW5nRGlyZWN0aW9uKFdlYkNvcmU6OldyaXRpbmdEaXJlY3Rpb246OlJpZ2h0 VG9MZWZ0KTsKIH0KIAogLSAoQk9PTClpc1JlcGxhY2VBbGxvd2VkCkBAIC0yNzk4LDYgKzI4MTAs MjQgQEAgLSAoQk9PTCljYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzooU0VMKWFjdGlvbiB3aXRo U2VuZGVyOihpZClzZW5kZXIKICAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihyZXBsYWNlOikp CiAgICAgICAgIHJldHVybiBlZGl0b3JTdGF0ZS5pc0NvbnRlbnRFZGl0YWJsZSAmJiAhZWRpdG9y U3RhdGUuaXNJblBhc3N3b3JkRmllbGQ7CiAKKyAgICBpZiAoYWN0aW9uID09IEBzZWxlY3Rvciht YWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25MZWZ0VG9SaWdodDopIHx8IGFjdGlvbiA9PSBAc2VsZWN0 b3IobWFrZVRleHRXcml0aW5nRGlyZWN0aW9uUmlnaHRUb0xlZnQ6KSkgeworICAgICAgICBpZiAo IWVkaXRvclN0YXRlLmlzQ29udGVudEVkaXRhYmxlKQorICAgICAgICAgICAgcmV0dXJuIE5POwor CisgICAgICAgIGF1dG8gYmFzZVdyaXRpbmdEaXJlY3Rpb24gPSBlZGl0b3JTdGF0ZS5wb3N0TGF5 b3V0RGF0YSgpLmJhc2VXcml0aW5nRGlyZWN0aW9uOworICAgICAgICBpZiAoYmFzZVdyaXRpbmdE aXJlY3Rpb24gPT0gV2ViQ29yZTo6V3JpdGluZ0RpcmVjdGlvbjo6TGVmdFRvUmlnaHQgJiYgIVVJ S2V5Ym9hcmRJc1JpZ2h0VG9MZWZ0SW5wdXRNb2RlQWN0aXZlKCkpIHsKKyAgICAgICAgICAgIC8v IEEga2V5Ym9hcmQgaXMgY29uc2lkZXJlZCAiYWN0aXZlIiBpZiBpdCBpcyBhdmFpbGFibGUgZm9y IHRoZSB1c2VyIHRvIHN3aXRjaCB0by4gQXMgc3VjaCwgdGhpcyBjaGVjayBwcmV2ZW50cworICAg ICAgICAgICAgLy8gdGV4dCBkaXJlY3Rpb24gYWN0aW9ucyBmcm9tIHNob3dpbmcgdXAgaW4gdGhl IGNhc2Ugd2hlcmUgYSB1c2VyIGhhcyBvbmx5IGFkZGVkIGxlZnQtdG8tcmlnaHQga2V5Ym9hcmRz LCBhbmQKKyAgICAgICAgICAgIC8vIGlzIGFsc28gbm90IGVkaXRpbmcgcmlnaHQtdG8tbGVmdCBj b250ZW50LgorICAgICAgICAgICAgcmV0dXJuIE5POworICAgICAgICB9CisKKyAgICAgICAgaWYg KGFjdGlvbiA9PSBAc2VsZWN0b3IobWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTGVmdFRvUmlnaHQ6 KSkKKyAgICAgICAgICAgIHJldHVybiBiYXNlV3JpdGluZ0RpcmVjdGlvbiAhPSBXZWJDb3JlOjpX cml0aW5nRGlyZWN0aW9uOjpMZWZ0VG9SaWdodDsKKworICAgICAgICByZXR1cm4gYmFzZVdyaXRp bmdEaXJlY3Rpb24gIT0gV2ViQ29yZTo6V3JpdGluZ0RpcmVjdGlvbjo6UmlnaHRUb0xlZnQ7Cisg ICAgfQorCiAgICAgcmV0dXJuIFtzdXBlciBjYW5QZXJmb3JtQWN0aW9uOmFjdGlvbiB3aXRoU2Vu ZGVyOnNlbmRlcl07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKaW5kZXggZTUxODZjNGQ2YWRiNzQ4MDNjN2EzMzQ3ZTIwZWQwYzIzZThiODM5Yi4u YzkzMmI1MTYyNTkzOWM5OWNmZDZhOTgwZmZmYWIzMjE4Yzk0ZDg3YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTEwMjIsNiArMTAyMiw4IEBA IEVkaXRvclN0YXRlIFdlYlBhZ2U6OmVkaXRvclN0YXRlKEluY2x1ZGVQb3N0TGF5b3V0RGF0YUhp bnQgc2hvdWxkSW5jbHVkZVBvc3RMYXlvCiAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgcG9zdExheW91dERhdGEuYmFzZVdyaXRpbmdEaXJlY3Rpb24gPSBlZGl0b3IuYmFzZVdy aXRpbmdEaXJlY3Rpb25Gb3JTZWxlY3Rpb25TdGFydCgpOwogICAgICAgICB9CiAjZW5kaWYKICAg ICB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg Y2JlYWJhMjc0MWNiYjBkODlmMjQ4YzUyYjc5NDQzZTkwZDk1MGM2OC4uOWY2YWFkM2I1ZmM3ZGRh N2FjZDIwYTU1YjA2NjliYjBkNmViMjRiOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAyLTE1ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFdLV2ViVmll dyBjYWxsb3V0IGJhciBpcyBtaXNzaW5nIENoYW5nZSBXcml0aW5nIERpcmVjdGlvbiBpdGVtCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAwMTUKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0ODEwMzY2PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRp bSBIb3J0b24uCisKKyAgICAgICAgTWFrZSBhbiBleGlzdGluZyBBUEkgdGVzdCB0aGF0IGV4ZXJj aXNlcyBwbGF0Zm9ybSBTUEkgdG8gY2hhbmdlIHRoZSBpbmxpbmUgdGV4dCB3cml0aW5nIGRpcmVj dGlvbiBydW4gb25seSBvbgorICAgICAgICBtYWNPUywgYW5kIGFkZCBhIG5ldyBBUEkgdGVzdCB0 aGF0IHVzZXMgc2ltaWxhcmx5IG5hbWVkIFNQSSBvbiBpT1MgdG8gY2hhbmdlIHRoZSBiYXNlIHdy aXRpbmcgZGlyZWN0aW9uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XS1dlYlZpZXdFZGl0QWN0aW9ucy5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRF U1QpOgorCiAyMDE5LTAyLTE1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIG5hdmlnYXRvci5tZWRpYURldmljZXMgU2VjdXJlQ29udGV4dApkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdFZGl0 QWN0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW aWV3RWRpdEFjdGlvbnMubW0KaW5kZXggMTAxOTQ4MjA1NGY4YTM4ZDYwMWI5YzdhZWFiMGNmMTY2 MDU3Y2ZlZi4uOWQ3YmZlNGUyZTQ5M2YwYTExN2RmYzRjNWJkZDMwNzNjNWNmODM4MiAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdFZGl0 QWN0aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dL V2ViVmlld0VkaXRBY3Rpb25zLm1tCkBAIC0yNTgsMTYgKzI1OCwzMiBAQCBURVNUKFdLV2ViVmll d0VkaXRBY3Rpb25zLCBQYXN0ZUFuZE1hdGNoU3R5bGUpCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJX ZWJLaXQiLCBbZGVzdGluYXRpb24gc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImdldFNl bGVjdGlvbigpLnRvU3RyaW5nKCkiXSk7CiB9CiAKLVRFU1QoV0tXZWJWaWV3RWRpdEFjdGlvbnMs IE1vZGlmeVRleHRXcml0aW5nRGlyZWN0aW9uKQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisK K1RFU1QoV0tXZWJWaWV3RWRpdEFjdGlvbnMsIE1vZGlmeUJhc2VXcml0aW5nRGlyZWN0aW9uKQog ewotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdGb3JFZGl0QWN0aW9uVGVzdGluZyhAIjxkaXYg aWQ9J3RleHQnIHN0eWxlPSdkaXJlY3Rpb246IHJ0bDsgdW5pY29kZS1iaWRpOiBiaWRpLW92ZXJy aWRlOyc+V2ViS2l0PC9kaXY+Iik7Ci0gICAgW3dlYlZpZXcgc2VsZWN0QWxsOm5pbF07CisgICAg YXV0byB3ZWJWaWV3ID0gd2ViVmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKEAiPG1ldGEgY2hhcnNl dD0ndXRmOCc+PHAgaWQ9J2VuZ2xpc2gnPkhlbGxvIHdvcmxkPC9wPjxwIGlkPSdoZWJyZXcnPtee 16fXldeoINeU16nXnSDXoteR16jXmdeqPC9wPiIpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVK YXZhU2NyaXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24oZW5nbGlzaCkiIGNvbXBsZXRp b25IYW5kbGVyOm5pbF07CisgICAgW3dlYlZpZXcgbWFrZVRleHRXcml0aW5nRGlyZWN0aW9uUmln aHRUb0xlZnQ6bmlsXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0 ZV07CisgICAgRVhQRUNUX1dLX1NUUkVRKCJydGwiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRp bmdKYXZhU2NyaXB0OkAiZ2V0Q29tcHV0ZWRTdHlsZShlbmdsaXNoKS5kaXJlY3Rpb24iXSk7Cisg ICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGNhblBlcmZvcm1BY3Rpb246QHNlbGVjdG9yKG1ha2VU ZXh0V3JpdGluZ0RpcmVjdGlvblJpZ2h0VG9MZWZ0Oikgd2l0aFNlbmRlcjpuaWxdKTsKKyAgICBF WFBFQ1RfVFJVRShbd2ViVmlldyBjYW5QZXJmb3JtQWN0aW9uOkBzZWxlY3RvcihtYWtlVGV4dFdy aXRpbmdEaXJlY3Rpb25MZWZ0VG9SaWdodDopIHdpdGhTZW5kZXI6bmlsXSk7CisKKyAgICBbd2Vi VmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJnZXRTZWxlY3Rpb24oKS5zZXRQb3NpdGlvbihoZWJy ZXcpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgIFt3ZWJWaWV3IG1ha2VUZXh0V3JpdGlu Z0RpcmVjdGlvbkxlZnRUb1JpZ2h0Om5pbF07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVz ZW50YXRpb25VcGRhdGVdOworICAgIEVYUEVDVF9XS19TVFJFUSgibHRyIiwgW3dlYlZpZXcgc3Ry aW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImdldENvbXB1dGVkU3R5bGUoaGVicmV3KS5kaXJl Y3Rpb24iXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGNhblBlcmZvcm1BY3Rpb246QHNl bGVjdG9yKG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbkxlZnRUb1JpZ2h0Oikgd2l0aFNlbmRlcjpu aWxdKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAImdldFNlbGVjdGlvbigp LnNldFBvc2l0aW9uKGVuZ2xpc2gpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwogICAgIFt3ZWJW aWV3IG1ha2VUZXh0V3JpdGluZ0RpcmVjdGlvbk5hdHVyYWw6bmlsXTsKLSAgICBFWFBFQ1RfV0tf U1RSRVEoIm5vcm1hbCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJn ZXRDb21wdXRlZFN0eWxlKHRleHQpLnVuaWNvZGVCaWRpIl0pOworICAgIFt3ZWJWaWV3IHdhaXRG b3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImx0ciIsIFt3 ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRDb21wdXRlZFN0eWxlKGVu Z2xpc2gpLmRpcmVjdGlvbiJdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgY2FuUGVyZm9y bUFjdGlvbjpAc2VsZWN0b3IobWFrZVRleHRXcml0aW5nRGlyZWN0aW9uTGVmdFRvUmlnaHQ6KSB3 aXRoU2VuZGVyOm5pbF0pOwogfQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLQogVEVTVChX S1dlYlZpZXdFZGl0QWN0aW9ucywgQ2hhbmdlRm9udFNpemUpCiB7CiAgICAgYXV0byB3ZWJWaWV3 ID0gd2ViVmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKCk7CkBAIC0zMjgsNyArMzQ0LDE3IEBAIFRF U1QoV0tXZWJWaWV3RWRpdEFjdGlvbnMsIFNldEZvbnRGYW1pbHkpCiAgICAgRVhQRUNUX1dLX1NU UkVRKCJpdGFsaWMiLCBbd2ViVmlldyBzdHlsZVByb3BlcnR5QXRTZWxlY3Rpb25TdGFydDpAImZv bnQtc3R5bGUiXSk7CiB9CiAKLSNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZKQorI2Vsc2UK KworVEVTVChXS1dlYlZpZXdFZGl0QWN0aW9ucywgTW9kaWZ5VGV4dFdyaXRpbmdEaXJlY3Rpb24p Cit7CisgICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld0ZvckVkaXRBY3Rpb25UZXN0aW5nKEAiPGRp diBpZD0ndGV4dCcgc3R5bGU9J2RpcmVjdGlvbjogcnRsOyB1bmljb2RlLWJpZGk6IGJpZGktb3Zl cnJpZGU7Jz5XZWJLaXQ8L2Rpdj4iKTsKKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAg ICBbd2ViVmlldyBtYWtlVGV4dFdyaXRpbmdEaXJlY3Rpb25OYXR1cmFsOm5pbF07CisgICAgRVhQ RUNUX1dLX1NUUkVRKCJub3JtYWwiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2Ny aXB0OkAiZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0KS51bmljb2RlQmlkaSJdKTsKK30KKworI2VuZGlm CiAKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKIAo=