153600 2016-01-28 10:50:17 -0800 Should avoid navigation for some data detector urls 2016-01-28 11:40:55 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica sam thorton oldest_to_newest 1159778 0 enrica 2016-01-28 10:50:17 -0800 Click on some type of data detector links should not trigger a navigation request. 1159790 1 270129 enrica 2016-01-28 10:58:20 -0800 Created attachment 270129 Patch 1159794 2 270129 thorton 2016-01-28 11:03:46 -0800 Comment on attachment 270129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270129&action=review > Source/WebCore/editing/cocoa/DataDetection.mm:66 > +#if PLATFORM(MAC) None of this code seems iOS specific? > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:682 > + requestPositionInformation(IntPoint((CGPoint)m_potentialTapLocation)); Why are you going FloatPoint->CGPoint->IntPoint? You should probably use one of the FloatPoint->IntPoint conversion functions (roundedIntPoint?) 1159813 3 enrica 2016-01-28 11:35:48 -0800 (In reply to comment #2) > Comment on attachment 270129 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270129&action=review > > > Source/WebCore/editing/cocoa/DataDetection.mm:66 > > +#if PLATFORM(MAC) > > None of this code seems iOS specific? It is not, but this behavior is iOS specific. Al least for now. > > > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:682 > > + requestPositionInformation(IntPoint((CGPoint)m_potentialTapLocation)); > > Why are you going FloatPoint->CGPoint->IntPoint? You should probably use one > of the FloatPoint->IntPoint conversion functions (roundedIntPoint?) Right! I forgot about that. Will fix it. 1159823 4 enrica 2016-01-28 11:40:55 -0800 Committed revision 195769. 270129 2016-01-28 10:58:20 -0800 2016-01-28 11:03:46 -0800 Patch ddwk2-part5.txt text/plain 9969 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTc0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTAxLTI4ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdWxkIGF2b2lkIG5hdmln YXRpb24gZm9yIHNvbWUgZGF0YSBkZXRlY3RvciB1cmxzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaW5nIGhlbHBlciBmdW5jdGlvbiB0byBkZWNp ZGUgd2hldGhlciB0aGUgZGVmYXVsdCBhY3Rpb24gc2hvdWxkIGJlIHBlcmZvcm1lZC4KKworICAg ICAgICAqIGVkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5oOgorICAgICAgICAqIGVkaXRpbmcv Y29jb2EvRGF0YURldGVjdGlvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFEZXRlY3Rpb246 OnNob3VsZENhbmNlbERlZmF1bHRBY3Rpb24pOgorCiAyMDE2LTAxLTI4ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5leHBlY3RlZCBjb250ZW50IHdyYXBwaW5n IGF0IGh0dHA6Ly9lbWFpbC5vc2guY29tL0gvMi92MTAwMDAwMTUyNDc0ZmViOGVjN2MxYTFmNGJi ZTVjN2MwL0hUTUwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVj dGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURl dGVjdGlvbi5oCShyZXZpc2lvbiAxOTU3NDEpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nv Y29hL0RhdGFEZXRlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksNyBAQCBwdWJs aWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIE5TQXJyYXkgKmRldGVjdENvbnRlbnRJblJh bmdlKFJlZlB0cjxSYW5nZT4mIGNvbnRleHRSYW5nZSwgRGF0YURldGVjdG9yVHlwZXMpOwogICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGlzRGF0YURldGVjdG9yTGluayhFbGVtZW50Kik7 CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBkYXRhRGV0ZWN0b3JJZGVudGlmaWVy KEVsZW1lbnQqKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBzaG91bGRDYW5jZWxE ZWZhdWx0QWN0aW9uKEVsZW1lbnQqKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW0JKHJl dmlzaW9uIDE5NTc0MSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVj dGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsMjQgQEAgU3RyaW5nIERhdGFEZXRl Y3Rpb246OmRhdGFEZXRlY3RvcklkZW50aQogICAgIHJldHVybiBlbGVtZW50LT5nZXRBdHRyaWJ1 dGUoZGF0YURldGVjdG9yc0F0dHJpYnV0ZVJlc3VsdEtleSk7CiB9CiAKK2Jvb2wgRGF0YURldGVj dGlvbjo6c2hvdWxkQ2FuY2VsRGVmYXVsdEFjdGlvbihFbGVtZW50KiBlbGVtZW50KQoreworI2lm IFBMQVRGT1JNKE1BQykKKyAgICBVTlVTRURfUEFSQU0oZWxlbWVudCk7CisgICAgcmV0dXJuIGZh bHNlOworI2Vsc2UKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFsc28gY29tcHV0ZSB0aGUgRERS ZXN1bHRSZWYgYW5kIGNoZWNrIHRoZSByZXN1bHQgY2F0ZWdvcnkuCisgICAgaWYgKCFpczxIVE1M QW5jaG9yRWxlbWVudD4oKmVsZW1lbnQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYg KGVsZW1lbnQtPmdldEF0dHJpYnV0ZShkYXRhRGV0ZWN0b3JzVVJMU2NoZW1lKSAhPSAidHJ1ZSIp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBTdHJpbmcgdHlwZSA9IGVsZW1lbnQtPmdldEF0 dHJpYnV0ZShkYXRhRGV0ZWN0b3JzQXR0cmlidXRlVHlwZUtleSk7CisgICAgaWYgKHR5cGUgPT0g Im1pc2MiIHx8IHR5cGUgPT0gImNhbGVuZGFyLWV2ZW50IiB8fCB0eXBlID09ICJ0ZWxlcGhvbmUi KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKwog I2lmIFBMQVRGT1JNKE1BQykKIAogc3RhdGljIFJldGFpblB0cjxEREFjdGlvbkNvbnRleHQ+IGRl dGVjdEl0ZW1BdFBvc2l0aW9uV2l0aFJhbmdlKFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiwgUmVm UHRyPFJhbmdlPiBjb250ZXh0UmFuZ2UsIEZsb2F0UmVjdCYgZGV0ZWN0ZWREYXRhQm91bmRpbmdC b3gsIFJlZlB0cjxSYW5nZT4mIGRldGVjdGVkRGF0YVJhbmdlKQpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gMTk1NzU5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMzUgQEAKKzIwMTYtMDEtMjggIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFw cGxlLmNvbT4KKworICAgICAgICBTaG91bGQgYXZvaWQgbmF2aWdhdGlvbiBmb3Igc29tZSBkYXRh IGRldGVjdG9yIHVybHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTM2MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXaGVuIGEgdGFwIGlzIGNvbW1pdGVkLCB3ZSBub3JtYWxseSBnZW5lcmF0ZSBhIHN5 bnRoZXRpYyBjbGljayBpZgorICAgICAgICB0aGUgbm9kZSByZXNwb25kcyB0byBjbGljayBldmVu dHMuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyB0aGUgbG9naWMgdG8gcHJldmVudCB0aGF0IGZy b20gaGFwcGVuaW5nIGlmIHRoZSBub2RlCisgICAgICAgIGlzIGEgZGF0YSBkZXRlY3RvciBsaW5r IHdpdGggY2VydGFpbiBjaGFyYWN0ZXJpc3RpY3MgKGNhbGVuZGFyIGV2ZW50LCB0ZWxlcGhvbmUs IGV0Yy4pLgorICAgICAgICBJZiB0aGlzIGlzIHRoZSBjYXNlLCB3ZSBjb21wdXRlIHRoZSBpbnRl cmFjdGlvbiBpbmZvcm1hdGlvbiBhcyBwb3NpdGlvbiwgc2VuZCBpdAorICAgICAgICBvdmVyIHRv IHRoZSBVSSBwcm9jZXNzIGFuZCBub3RpZnkgdGhhdCB3ZSBkaWQgbm90IGhhbmRsZSB0aGUgdGFw LgorICAgICAgICBUaGUgcGFnZSBjbGllbnQgaXMgbm93IGFsc28gbm90aWZpZWQgb2YgdGhpcyBl dmVudCBhbmQgY2FuIHNob3cgdGhlIGRhdGEgZGV0ZWN0b3Igc2hlZXQgaWYKKyAgICAgICAgYXBw cm9wcmlhdGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1w bDo6dG9vbFRpcENoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZGlk Tm90SGFuZGxlVGFwQXNDbGljayk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpk ZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGNsZWFyU2VsZWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZE5v dEhhbmRsZVRhcEFzQ2xpY2s6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Bvc2l0aW9u SW5mb3JtYXRpb25EaWRDaGFuZ2U6XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJQYWdl UHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkTm90SGFuZGxl VGFwQXNDbGljayk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb21taXRQb3RlbnRpYWxUYXApOgorCiAy MDE2LTAxLTI4ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFtpT1NdIFVwZGF0ZSBXZWIgUHJvY2VzcyBzYW5kYm94IHByb2ZpbGUgZm9yIGF1ZGlvZGV2aWNl Y2xvY2sgYWNjZXNzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHJl dmlzaW9uIDE5NTc0MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTIxMiw2ICsyMTIsNyBAQCBwdWJsaWM6CiAjaWYgUExBVEZPUk0o SU9TKQogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UG9pbnQgYWNjZXNzaWJpbGl0eVNjcmVlblRv Um9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSA9IDA7CiAgICAgdmlydHVhbCBXZWJD b3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9BY2Nlc3NpYmlsaXR5U2NyZWVuKGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZE5vdEhhbmRsZVRhcEFzQ2xpY2so Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSA9IDA7CiAjZW5kaWYKICAgICAKICAgICB2aXJ0dWFs IHZvaWQgZG9uZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiwgYm9v bCB3YXNFdmVudEhhbmRsZWQpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUGFnZUNsaWVudEltcGxJT1MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgJKHJldmlzaW9uIDE5NTc0MSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAkod29ya2luZyBjb3B5 KQpAQCAtMTg1LDYgKzE4NSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlz aExvYWRGb3JNYWluRnJhbWUoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbExv YWRGb3JNYWluRnJhbWUoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkU2FtZURvY3Vt ZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZShTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSkgb3Zl cnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZE5vdEhhbmRsZVRhcEFzQ2xpY2soY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmKSBvdmVycmlkZTsKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VC YWNrZ3JvdW5kQ29sb3IoKSBvdmVycmlkZTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCShyZXZpc2lvbiAxOTU3NDEpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMzAsNiArMjMwLDExIEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnRvb2xU aXBDaGFuZ2VkKGNvbnMKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCit2b2lkIFBhZ2VDbGll bnRJbXBsOjpkaWROb3RIYW5kbGVUYXBBc0NsaWNrKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBw b2ludCkKK3sKKyAgICBbbV9jb250ZW50VmlldyBfZGlkTm90SGFuZGxlVGFwQXNDbGljazpwb2lu dF07Cit9CisKIGJvb2wgUGFnZUNsaWVudEltcGw6OmRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9u UGVybWlzc2lvblJlcXVlc3QoV2ViRnJhbWVQcm94eSYgZnJhbWUsIEFQSTo6U2VjdXJpdHlPcmln aW4mIG9yaWdpbiwgR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByb3h5JiByZXF1ZXN0KQog ewogICAgIFtbd3JhcHBlcihtX3dlYlZpZXctPl9wYWdlLT5wcm9jZXNzKCkucHJvY2Vzc1Bvb2wo KSkgX2dlb2xvY2F0aW9uUHJvdmlkZXJdIGRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUmVxdWVz dEZyb21PcmlnaW46b3JpZ2luLnNlY3VyaXR5T3JpZ2luKCkgZnJhbWU6ZnJhbWUgcmVxdWVzdDpy ZXF1ZXN0IHZpZXc6bV93ZWJWaWV3XTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAkocmV2aXNpb24gMTk1 NzQxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTg1LDYgKzE4NSw3IEBAIHN0cnVjdCBXS0F1dG9D b3JyZWN0aW9uRGF0YSB7CiAtICh2b2lkKV93ZWJUb3VjaEV2ZW50Oihjb25zdCBXZWJLaXQ6Ok5h dGl2ZVdlYlRvdWNoRXZlbnQmKXRvdWNoRXZlbnQgcHJldmVudHNOYXRpdmVHZXN0dXJlczooQk9P TClwcmV2ZW50c0RlZmF1bHQ7CiAjZW5kaWYKIC0gKHZvaWQpX2NvbW1pdFBvdGVudGlhbFRhcEZh aWxlZDsKKy0gKHZvaWQpX2RpZE5vdEhhbmRsZVRhcEFzQ2xpY2s6KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jilwb2ludDsKIC0gKHZvaWQpX2RpZEdldFRhcEhpZ2hsaWdodEZvclJlcXVlc3Q6KHVp bnQ2NF90KXJlcXVlc3RJRCBjb2xvcjooY29uc3QgV2ViQ29yZTo6Q29sb3ImKWNvbG9yIHF1YWRz Oihjb25zdCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRRdWFkPiYpaGlnaGxpZ2h0ZWRRdWFkcyB0b3BM ZWZ0UmFkaXVzOihjb25zdCBXZWJDb3JlOjpJbnRTaXplJil0b3BMZWZ0UmFkaXVzIHRvcFJpZ2h0 UmFkaXVzOihjb25zdCBXZWJDb3JlOjpJbnRTaXplJil0b3BSaWdodFJhZGl1cyBib3R0b21MZWZ0 UmFkaXVzOihjb25zdCBXZWJDb3JlOjpJbnRTaXplJilib3R0b21MZWZ0UmFkaXVzIGJvdHRvbVJp Z2h0UmFkaXVzOihjb25zdCBXZWJDb3JlOjpJbnRTaXplJilib3R0b21SaWdodFJhZGl1czsKIAog LSAoQk9PTClfbWF5RGlzYWJsZURvdWJsZVRhcEdlc3R1cmVzRHVyaW5nU2luZ2xlVGFwOwpJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE5NTc0MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xNDAyLDYgKzE0MDIsMTQgQEAgLSAodm9pZCljbGVhclNlbGVjdGlvbgogICAgIF9wYWdlLT5j bGVhclNlbGVjdGlvbigpOwogfQogCistICh2b2lkKV9kaWROb3RIYW5kbGVUYXBBc0NsaWNrOihj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYpcG9pbnQKK3sKKyAgICAvLyBGSVhNRTogd2Ugc2hvdWxk IGFsc28gdGFrZSBpbnRvIGFjY291bnQgd2hldGhlciBvciBub3QgdGhlIFVJIGRlbGVnYXRlCisg ICAgLy8gaGFzIGhhbmRsZWQgdGhpcyBub3RpZmljYXRpb24uCisgICAgaWYgKF9oYXNWYWxpZFBv c2l0aW9uSW5mb3JtYXRpb24gJiYgcG9pbnQgPT0gX3Bvc2l0aW9uSW5mb3JtYXRpb24ucG9pbnQg JiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNEYXRhRGV0ZWN0b3JMaW5rKQorICAgICAgICBbc2Vs ZiBfc2hvd0RhdGFEZXRlY3RvcnNTaGVldF07Cit9CisKIC0gKHZvaWQpX3Bvc2l0aW9uSW5mb3Jt YXRpb25EaWRDaGFuZ2U6KGNvbnN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJilp bmZvCiB7CiAgICAgX3Bvc2l0aW9uSW5mb3JtYXRpb24gPSBpbmZvOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0JKHJldmlzaW9uIDE5 NTc0MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1t CSh3b3JraW5nIGNvcHkpCkBAIC05MzIsNiArOTMyLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNv bW1pdFBvdGVudGlhbFRhcEZhaQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkTm90SGFuZGxlVGFw QXNDbGljayhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQpCiB7CisgICAgbV9wYWdlQ2xp ZW50LmRpZE5vdEhhbmRsZVRhcEFzQ2xpY2socG9pbnQpOwogICAgIG1fdWlDbGllbnQtPmRpZE5v dEhhbmRsZVRhcEFzQ2xpY2socG9pbnQpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCShyZXZpc2lvbiAxOTU3 NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0JKHdvcmtpbmcgY29weSkKQEAgLTY3Nyw5ICs2NzcsMTMgQEAgdm9pZCBXZWJQYWdlOjpjb21t aXRQb3RlbnRpYWxUYXAodWludDY0XwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYg KG1fcG90ZW50aWFsVGFwTm9kZSA9PSBub2RlUmVzcG9uZGluZ1RvQ2xpY2spCi0gICAgICAgIGhh bmRsZVN5bnRoZXRpY0NsaWNrKG5vZGVSZXNwb25kaW5nVG9DbGljaywgYWRqdXN0ZWRQb2ludCk7 Ci0gICAgZWxzZQorICAgIGlmIChtX3BvdGVudGlhbFRhcE5vZGUgPT0gbm9kZVJlc3BvbmRpbmdU b0NsaWNrKSB7CisgICAgICAgIGlmIChpczxFbGVtZW50Pigqbm9kZVJlc3BvbmRpbmdUb0NsaWNr KSAmJiBEYXRhRGV0ZWN0aW9uOjpzaG91bGRDYW5jZWxEZWZhdWx0QWN0aW9uKCZkb3duY2FzdDxF bGVtZW50Pigqbm9kZVJlc3BvbmRpbmdUb0NsaWNrKSkpIHsKKyAgICAgICAgICAgIHJlcXVlc3RQ b3NpdGlvbkluZm9ybWF0aW9uKEludFBvaW50KChDR1BvaW50KW1fcG90ZW50aWFsVGFwTG9jYXRp b24pKTsKKyAgICAgICAgICAgIGNvbW1pdFBvdGVudGlhbFRhcEZhaWxlZCgpOworICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgIGhhbmRsZVN5bnRoZXRpY0NsaWNrKG5vZGVSZXNwb25kaW5nVG9D bGljaywgYWRqdXN0ZWRQb2ludCk7CisgICAgfSBlbHNlCiAgICAgICAgIGNvbW1pdFBvdGVudGlh bFRhcEZhaWxlZCgpOwogCiAgICAgbV9wb3RlbnRpYWxUYXBOb2RlID0gbnVsbHB0cjsK