154138 2016-02-11 16:22:19 -0800 EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should be called EditableRoot instead 2016-02-12 10:53:39 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned ap bdakin enrica sam thorton oldest_to_newest 1163924 0 bdakin 2016-02-11 16:22:19 -0800 EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should be called EditableRoot instead 1163926 1 271102 bdakin 2016-02-11 16:24:22 -0800 Created attachment 271102 Patch This is kind of a rubber-stamp situation, but I thought I would post a patch anyway. 1163933 2 bdakin 2016-02-11 16:32:21 -0800 Thanks Alexey! http://trac.webkit.org/changeset/196456 1163961 3 271102 darin 2016-02-11 17:39:04 -0800 Comment on attachment 271102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271102&action=review > Source/WebKit/mac/WebView/WebFrameInternal.h:66 > enum class NSRangeIsRelativeTo : uint8_t { Is it really OK for us to have something that happens to use the NS prefix? I think that’s recipe for conflict with AppKit and Foundation! 1164200 4 bdakin 2016-02-12 10:47:05 -0800 (In reply to comment #3) > Comment on attachment 271102 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=271102&action=review > > > Source/WebKit/mac/WebView/WebFrameInternal.h:66 > > enum class NSRangeIsRelativeTo : uint8_t { > > Is it really OK for us to have something that happens to use the NS prefix? > I think that’s recipe for conflict with AppKit and Foundation! That is very true. I will re-name. 1164204 5 bdakin 2016-02-12 10:53:39 -0800 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 271102 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=271102&action=review > > > > > Source/WebKit/mac/WebView/WebFrameInternal.h:66 > > > enum class NSRangeIsRelativeTo : uint8_t { > > > > Is it really OK for us to have something that happens to use the NS prefix? > > I think that’s recipe for conflict with AppKit and Foundation! > > That is very true. I will re-name. I posted a re-name here: https://bugs.webkit.org/show_bug.cgi?id=154174 271102 2016-02-11 16:24:22 -0800 2016-02-11 16:30:07 -0800 Patch for-review.txt text/plain 9165 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjQ1NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBFZGl0aW5nUmFuZ2VJc1JlbGF0aXZl VG86OkRvY3VtZW50IGFuZCBOU1JhbmdlSXNSZWxhdGl2ZVRvOjpEb2N1bWVudCBzaG91bGQgCisg ICAgICAgIGJlIGNhbGxlZCBFZGl0YWJsZVJvb3QgaW5zdGVhZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MTM4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWRpdGFibGVSb290IGlzIG11Y2ggbW9yZSBh Y2N1cmF0ZSB0aGFuIERvY3VtZW50LgorICAgICAgICAqIFNoYXJlZC9FZGl0aW5nUmFuZ2UuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjppbnNlcnRUZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6OnNlbGVjdGVkUmFuZ2VXaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJhbmdlRnJvbUVkaXRpbmdSYW5nZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKwogMjAxNi0wMi0xMSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE1v dmUgRG93bmxvYWQgYXV0aGVudGljYXRpb24gY29kZSB0byBBdXRoZW50aWNhdGlvbk1hbmFnZXIK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0aW5nUmFuZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdGluZ1JhbmdlLmgJKHJldmlzaW9uIDE5NjQ1MikK KysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0aW5nUmFuZ2UuaAkod29ya2luZyBjb3B5KQpA QCAtMzIsNyArMzIsNyBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGVudW0gY2xhc3MgRWRpdGlu Z1JhbmdlSXNSZWxhdGl2ZVRvIDogdWludDhfdCB7Ci0gICAgRG9jdW1lbnQsCisgICAgRWRpdGFi bGVSb290LAogICAgIFBhcmFncmFwaCwKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE5NjQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTYxLDcgKzU2MSw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSb290TGF5ZXIoTGF5 ZXJPclZpZXcqKTsKICAgICBMYXllck9yVmlldyogYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RM YXllcigpIGNvbnN0OwogCi0gICAgdm9pZCBpbnNlcnRUZXh0QXN5bmMoY29uc3QgU3RyaW5nJiB0 ZXh0LCBjb25zdCBFZGl0aW5nUmFuZ2UmIHJlcGxhY2VtZW50UmFuZ2UsIGJvb2wgcmVnaXN0ZXJV bmRvR3JvdXAgPSBmYWxzZSwgRWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvID0gRWRpdGluZ1Jhbmdl SXNSZWxhdGl2ZVRvOjpEb2N1bWVudCk7CisgICAgdm9pZCBpbnNlcnRUZXh0QXN5bmMoY29uc3Qg U3RyaW5nJiB0ZXh0LCBjb25zdCBFZGl0aW5nUmFuZ2UmIHJlcGxhY2VtZW50UmFuZ2UsIGJvb2wg cmVnaXN0ZXJVbmRvR3JvdXAgPSBmYWxzZSwgRWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvID0gRWRp dGluZ1JhbmdlSXNSZWxhdGl2ZVRvOjpFZGl0YWJsZVJvb3QpOwogICAgIHZvaWQgZ2V0TWFya2Vk UmFuZ2VBc3luYyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKEVkaXRpbmdSYW5nZSwgQ2FsbGJhY2tCYXNl OjpFcnJvcik+KTsKICAgICB2b2lkIGdldFNlbGVjdGVkUmFuZ2VBc3luYyhzdGQ6OmZ1bmN0aW9u PHZvaWQgKEVkaXRpbmdSYW5nZSwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+KTsKICAgICB2b2lkIGNo YXJhY3RlckluZGV4Rm9yUG9pbnRBc3luYyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIHN0ZDo6 ZnVuY3Rpb248dm9pZCAodWludDY0X3QsIENhbGxiYWNrQmFzZTo6RXJyb3IpPik7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCShyZXZpc2lv biAxOTY0NTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwu bW0JKHdvcmtpbmcgY29weSkKQEAgLTM1NTYsNyArMzU1Niw3IEBAIHZvaWQgV2ViVmlld0ltcGw6 Omluc2VydFRleHQoaWQgc3RyaW5nLCAKICAgICBpZiAoIWRpY3RhdGlvbkFsdGVybmF0aXZlcy5p c0VtcHR5KCkpCiAgICAgICAgIG1fcGFnZS0+aW5zZXJ0RGljdGF0ZWRUZXh0QXN5bmMoZXZlbnRU ZXh0LCByZXBsYWNlbWVudFJhbmdlLCBkaWN0YXRpb25BbHRlcm5hdGl2ZXMsIHJlZ2lzdGVyVW5k b0dyb3VwKTsKICAgICBlbHNlCi0gICAgICAgIG1fcGFnZS0+aW5zZXJ0VGV4dEFzeW5jKGV2ZW50 VGV4dCwgcmVwbGFjZW1lbnRSYW5nZSwgcmVnaXN0ZXJVbmRvR3JvdXAsIG5lZWRUb1JlbW92ZVNv ZnRTcGFjZSA/IEVkaXRpbmdSYW5nZUlzUmVsYXRpdmVUbzo6UGFyYWdyYXBoIDogRWRpdGluZ1Jh bmdlSXNSZWxhdGl2ZVRvOjpEb2N1bWVudCk7CisgICAgICAgIG1fcGFnZS0+aW5zZXJ0VGV4dEFz eW5jKGV2ZW50VGV4dCwgcmVwbGFjZW1lbnRSYW5nZSwgcmVnaXN0ZXJVbmRvR3JvdXAsIG5lZWRU b1JlbW92ZVNvZnRTcGFjZSA/IEVkaXRpbmdSYW5nZUlzUmVsYXRpdmVUbzo6UGFyYWdyYXBoIDog RWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvOjpFZGl0YWJsZVJvb3QpOwogfQogCiB2b2lkIFdlYlZp ZXdJbXBsOjpzZWxlY3RlZFJhbmdlV2l0aENvbXBsZXRpb25IYW5kbGVyKHZvaWQoXmNvbXBsZXRp b25IYW5kbGVyUHRyKShOU1JhbmdlIHNlbGVjdGVkUmFuZ2UpKQpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTk2NDUyKQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01MDM4LDcgKzUwMzgsNyBAQCBQYXNzUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBX ZWJQYWdlOjpyYW5nCiAgICAgZWxzZQogICAgICAgICBsZW5ndGggPSBJTlRfTUFYIC0gcmFuZ2Uu bG9jYXRpb247CiAKLSAgICBpZiAoZWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvID09IEVkaXRpbmdS YW5nZUlzUmVsYXRpdmVUbzo6RG9jdW1lbnQpIHsKKyAgICBpZiAoZWRpdGluZ1JhbmdlSXNSZWxh dGl2ZVRvID09IEVkaXRpbmdSYW5nZUlzUmVsYXRpdmVUbzo6RWRpdGFibGVSb290KSB7CiAgICAg ICAgIC8vIE91ciBjcml0aWNhbCBhc3N1bXB0aW9uIGlzIHRoYXQgdGhpcyBjb2RlIHBhdGggaXMg Y2FsbGVkIGJ5IGlucHV0IG1ldGhvZHMgdGhhdAogICAgICAgICAvLyBjb25jZW50cmF0ZSBvbiBh IGdpdmVuIGFyZWEgY29udGFpbmluZyB0aGUgc2VsZWN0aW9uLgogICAgICAgICAvLyBXZSBoYXZl IHRvIGRvIHRoaXMgYmVjYXVzZSBvZiB0ZXh0IGZpZWxkcyBhbmQgdGV4dGFyZWFzLiBUaGUgRE9N IGZvciB0aG9zZSBpcyBub3QKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTk2NDUyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjQ3LDcgKzY0Nyw3IEBA IHB1YmxpYzoKICAgICAKICAgICB2b2lkIHNlbmRDb21wbGV4VGV4dElucHV0VG9QbHVnaW4odWlu dDY0X3QgcGx1Z2luQ29tcGxleFRleHRJbnB1dElkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgdGV4 dElucHV0KTsKIAotICAgIHZvaWQgaW5zZXJ0VGV4dEFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwg Y29uc3QgRWRpdGluZ1JhbmdlJiByZXBsYWNlbWVudFJhbmdlLCBib29sIHJlZ2lzdGVyVW5kb0dy b3VwID0gZmFsc2UsIHVpbnQzMl90IGVkaXRpbmdSYW5nZUlzUmVsYXRpdmVUbyA9ICh1aW50MzJf dClFZGl0aW5nUmFuZ2VJc1JlbGF0aXZlVG86OkRvY3VtZW50KTsKKyAgICB2b2lkIGluc2VydFRl eHRBc3luYyhjb25zdCBTdHJpbmcmIHRleHQsIGNvbnN0IEVkaXRpbmdSYW5nZSYgcmVwbGFjZW1l bnRSYW5nZSwgYm9vbCByZWdpc3RlclVuZG9Hcm91cCA9IGZhbHNlLCB1aW50MzJfdCBlZGl0aW5n UmFuZ2VJc1JlbGF0aXZlVG8gPSAodWludDMyX3QpRWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvOjpF ZGl0YWJsZVJvb3QpOwogICAgIHZvaWQgZ2V0TWFya2VkUmFuZ2VBc3luYyh1aW50NjRfdCBjYWxs YmFja0lEKTsKICAgICB2b2lkIGdldFNlbGVjdGVkUmFuZ2VBc3luYyh1aW50NjRfdCBjYWxsYmFj a0lEKTsKICAgICB2b2lkIGNoYXJhY3RlckluZGV4Rm9yUG9pbnRBc3luYyhjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwpAQCAtMTEzNiw3ICsxMTM2LDcgQEAg cHJpdmF0ZToKICAgICBzdGF0aWMgUGx1Z2luVmlldyogZm9jdXNlZFBsdWdpblZpZXdGb3JGcmFt ZShXZWJDb3JlOjpGcmFtZSYpOwogICAgIHN0YXRpYyBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3Rm9y RnJhbWUoV2ViQ29yZTo6RnJhbWUqKTsKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNvcmU6 OlJhbmdlPiByYW5nZUZyb21FZGl0aW5nUmFuZ2UoV2ViQ29yZTo6RnJhbWUmLCBjb25zdCBFZGl0 aW5nUmFuZ2UmLCBFZGl0aW5nUmFuZ2VJc1JlbGF0aXZlVG8gPSBFZGl0aW5nUmFuZ2VJc1JlbGF0 aXZlVG86OkRvY3VtZW50KTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4g cmFuZ2VGcm9tRWRpdGluZ1JhbmdlKFdlYkNvcmU6OkZyYW1lJiwgY29uc3QgRWRpdGluZ1Jhbmdl JiwgRWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvID0gRWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvOjpF ZGl0YWJsZVJvb3QpOwogCiAgICAgdm9pZCByZXBvcnRVc2VkRmVhdHVyZXMoKTsKIApJbmRleDog U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTk2NDU1KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTYtMDItMTEgIEJldGgg RGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIEVkaXRpbmdSYW5nZUlzUmVsYXRp dmVUbzo6RG9jdW1lbnQgYW5kIE5TUmFuZ2VJc1JlbGF0aXZlVG86OkRvY3VtZW50IHNob3VsZCAK KyAgICAgICAgYmUgY2FsbGVkIEVkaXRhYmxlUm9vdCBpbnN0ZWFkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQxMzgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFZGl0YWJsZVJvb3QgaXMgbXVjaCBtb3Jl IGFjY3VyYXRlIHRoYW4gRG9jdW1lbnQuCisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToK KyAgICAgICAgKC1bV2ViRnJhbWUgX2NvbnZlcnRUb0RPTVJhbmdlOl0pOgorICAgICAgICAoLVtX ZWJGcmFtZSBfY29udmVydFRvRE9NUmFuZ2U6cmFuZ2VJc1JlbGF0aXZlVG86XSk6CisgICAgICAg ICogV2ViVmlldy9XZWJGcmFtZUludGVybmFsLmg6CisgICAgICAgICogV2ViVmlldy9XZWJIVE1M Vmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgaW5zZXJ0VGV4dDpdKToKKwogMjAxNi0w Mi0xMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU29mdCBzcGFj ZXMgYXJlIG9mdGVuIHRyYWNrZWQgaW4gdGhlIHdyb25nIHNwb3QKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJGcmFtZS5tbQkocmV2aXNpb24gMTk2NDUyKQorKysgU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNzkzLDcgKzc5Myw3 IEBAIC0gKE5TUmFuZ2UpX2NvbnZlcnRUb05TUmFuZ2U6KFJhbmdlICopcmEKIAogLSAoUGFzc1Jl ZlB0cjxSYW5nZT4pX2NvbnZlcnRUb0RPTVJhbmdlOihOU1JhbmdlKW5zcmFuZ2UKIHsKLSAgICBy ZXR1cm4gW3NlbGYgX2NvbnZlcnRUb0RPTVJhbmdlOm5zcmFuZ2UgcmFuZ2VJc1JlbGF0aXZlVG86 TlNSYW5nZUlzUmVsYXRpdmVUbzo6RG9jdW1lbnRdOworICAgIHJldHVybiBbc2VsZiBfY29udmVy dFRvRE9NUmFuZ2U6bnNyYW5nZSByYW5nZUlzUmVsYXRpdmVUbzpOU1JhbmdlSXNSZWxhdGl2ZVRv OjpFZGl0YWJsZVJvb3RdOwogfQogCiAtIChQYXNzUmVmUHRyPFJhbmdlPilfY29udmVydFRvRE9N UmFuZ2U6KE5TUmFuZ2UpbnNyYW5nZSByYW5nZUlzUmVsYXRpdmVUbzooTlNSYW5nZUlzUmVsYXRp dmVUbylyYW5nZUlzUmVsYXRpdmVUbwpAQCAtODAzLDcgKzgwMyw3IEBAIC0gKFBhc3NSZWZQdHI8 UmFuZ2U+KV9jb252ZXJ0VG9ET01SYW5nZToKICAgICBpZiAobnNyYW5nZS5sZW5ndGggPiBJTlRf TUFYIHx8IG5zcmFuZ2UubG9jYXRpb24gKyBuc3JhbmdlLmxlbmd0aCA+IElOVF9NQVgpCiAgICAg ICAgIG5zcmFuZ2UubGVuZ3RoID0gSU5UX01BWCAtIG5zcmFuZ2UubG9jYXRpb247CiAKLSAgICBp ZiAocmFuZ2VJc1JlbGF0aXZlVG8gPT0gTlNSYW5nZUlzUmVsYXRpdmVUbzo6RG9jdW1lbnQpIHsK KyAgICBpZiAocmFuZ2VJc1JlbGF0aXZlVG8gPT0gTlNSYW5nZUlzUmVsYXRpdmVUbzo6RWRpdGFi bGVSb290KSB7CiAgICAgICAgIC8vIE91ciBjcml0aWNhbCBhc3N1bXB0aW9uIGlzIHRoYXQgdGhp cyBjb2RlIHBhdGggaXMgb25seSBjYWxsZWQgYnkgaW5wdXQgbWV0aG9kcyB0aGF0CiAgICAgICAg IC8vIGNvbmNlbnRyYXRlIG9uIGEgZ2l2ZW4gYXJlYSBjb250YWluaW5nIHRoZSBzZWxlY3Rpb24K ICAgICAgICAgLy8gV2UgaGF2ZSB0byBkbyB0aGlzIGJlY2F1c2Ugb2YgdGV4dCBmaWVsZHMgYW5k IHRleHRhcmVhcy4gVGhlIERPTSBmb3IgdGhvc2UgaXMgbm90CkluZGV4OiBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaAkocmV2aXNpb24gMTk2NDUyKQorKysg U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZUludGVybmFsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTY0LDcgKzY0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdHlwZWRlZiBXZWJDb3Jl OjpIaXN0b3J5SXRlbSBXZWJDb3JlSGlzdG9yeUl0ZW07CiAKIGVudW0gY2xhc3MgTlNSYW5nZUlz UmVsYXRpdmVUbyA6IHVpbnQ4X3QgewotICAgIERvY3VtZW50LAorICAgIEVkaXRhYmxlUm9vdCwK ICAgICBQYXJhZ3JhcGgsCiB9OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi SFRNTFZpZXcubW0JKHJldmlzaW9uIDE5NjQ1MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTcxMTQsNyArNzExNCw3IEBAIC0g KHZvaWQpaW5zZXJ0VGV4dDooaWQpc3RyaW5nCiAjZW5kaWYKIAogICAgIGlmIChyZXBsYWNlbWVu dFJhbmdlLmxvY2F0aW9uICE9IE5TTm90Rm91bmQpIHsKLSAgICAgICAgTlNSYW5nZUlzUmVsYXRp dmVUbyByYW5nZUlzUmVsYXRpdmVUbyA9IG5lZWRUb1JlbW92ZVNvZnRTcGFjZSA/IE5TUmFuZ2VJ c1JlbGF0aXZlVG86OlBhcmFncmFwaCA6IE5TUmFuZ2VJc1JlbGF0aXZlVG86OkRvY3VtZW50Owor ICAgICAgICBOU1JhbmdlSXNSZWxhdGl2ZVRvIHJhbmdlSXNSZWxhdGl2ZVRvID0gbmVlZFRvUmVt b3ZlU29mdFNwYWNlID8gTlNSYW5nZUlzUmVsYXRpdmVUbzo6UGFyYWdyYXBoIDogTlNSYW5nZUlz UmVsYXRpdmVUbzo6RWRpdGFibGVSb290OwogICAgICAgICBSZWZQdHI8UmFuZ2U+IGRvbVJhbmdl ID0gW1tzZWxmIF9mcmFtZV0gX2NvbnZlcnRUb0RPTVJhbmdlOnJlcGxhY2VtZW50UmFuZ2UgcmFu Z2VJc1JlbGF0aXZlVG86cmFuZ2VJc1JlbGF0aXZlVG9dOwogICAgICAgICBpZiAoZG9tUmFuZ2Up CiAgICAgICAgICAgICBjb3JlRnJhbWUtPnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihWaXNpYmxl U2VsZWN0aW9uKCpkb21SYW5nZSwgU0VMX0RFRkFVTFRfQUZGSU5JVFkpKTsK