135789 2014-08-10 03:57:26 -0700 Yelp phone number highlights often disappear 2014-08-10 18:27:43 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton beidson enrica oldest_to_newest 1028096 0 thorton 2014-08-10 03:57:26 -0700 <rdar://problem/17971057> 1. Go to http://www.yelp.com/biz/back-a-yard-san-jose 2. Select part of the phone number right under the map. 3. Highlight it, unhighlight it, repeat. 4. Goto 1 and do it faster if you can't reproduce. Expected: The semi-highlighted phone number should always result in a full-phone number highlight, not a selection overlay. Actual: It often shows up as a selection overlay instead, and you can't get back to the phone number highlight. 1028097 1 236346 thorton 2014-08-10 03:58:15 -0700 Created attachment 236346 repro 1028098 2 thorton 2014-08-10 04:10:33 -0700 I built this on top of https://bugs.webkit.org/show_bug.cgi?id=135787 because why not, but that means it won't apply yet. If we decide not to do that I'm sure we can rebase this on ToT but it will be a bit of work. 1028099 3 236347 thorton 2014-08-10 04:13:59 -0700 Created attachment 236347 patch 1028120 4 thorton 2014-08-10 18:27:43 -0700 http://trac.webkit.org/changeset/172383 236346 2014-08-10 03:58:15 -0700 2014-08-10 03:58:15 -0700 repro 17971057-frameselection.html text/html 263 thorton PGlmcmFtZSBpZD0iZiIgc3JjPSJkYXRhOnRleHQvaHRtbCxhc2RmIiBzdHlsZT0idmlzaWJpbGl0 eTogaGlkZGVuOyI+PC9pZnJhbWU+CjxzY3JpcHQ+CnNldEludGVydmFsKGZ1bmN0aW9uICgpIHsK ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJmIikuY29udGVudERvY3VtZW50LndyaXRlKCJh Iik7Cn0sIDEwMCk7Cjwvc2NyaXB0Pgo8YnIvPjxici8+CgoxICg4MDApIE1ZLUFQUExFCgo8YnI+ PGEgaHJlZj0iaHR0cDovL2FwcGxlLmNvbSI+YXNkZjwvYT4= 236347 2014-08-10 04:13:59 -0700 2014-08-10 07:28:05 -0700 patch yelp.diff text/plain 16956 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNmFiNjYxLi43MTA4MWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMDgtMTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgWWVscCBwaG9uZSBudW1iZXIgaGlnaGxpZ2h0cyBvZnRlbiBkaXNhcHBlYXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTc4OQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTc5NzEwNTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzKToKKyAgICAg ICAgKFdlYkNvcmU6OkVkaXRvcjo6Y2xlYXJEYXRhRGV0ZWN0ZWRUZWxlcGhvbmVOdW1iZXJzKTog RGVsZXRlZC4KKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yOjpkZXRlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlcyk6CisgICAgICAgICogcGFnZS9F ZGl0b3JDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVudDo6c2VsZWN0ZWRU ZWxlcGhvbmVOdW1iZXJSYW5nZXNDaGFuZ2VkKToKKyAgICAgICAgQ2FjaGUgYW5kIGV4cG9zZSBk ZXRlY3RlZCB0ZWxlcGhvbmUgbnVtYmVyIHJhbmdlcyBvbiBFZGl0b3IuCisgICAgICAgIENoYW5n ZSBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQgdG8gdGFrZSBubyBhcmd1bWVu dHM7IGl0J3MKKyAgICAgICAganVzdCBhIG5vdGlmaWNhdGlvbiBub3cuCisKIDIwMTQtMDgtMDkg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTdWJwaXhlbCByZW5k ZXJpbmc6IFRyYW5zZm9ybXMgb24gbm9uLWNvbXBvc2l0aW5nIGxheWVycyBsZWF2ZSBiaXRzIGJl aGluZCB3aGVuIHRoZSBib3ggYm91bmRhcmllcyBjaGFuZ2VzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3IuY3BwCmluZGV4IGEzZGE5YTIuLjc0MjVmNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5j cHAKQEAgLTMzNjIsMTEgKzMzNjIsMTMgQEAgdm9pZCBFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JU ZWxlcGhvbmVOdW1iZXJzKCkKICAgICBpZiAoIXNob3VsZERldGVjdFRlbGVwaG9uZU51bWJlcnMo KSB8fCAhY2xpZW50KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIG1fZGV0ZWN0ZWRUZWxlcGhv bmVOdW1iZXJSYW5nZXMuY2xlYXIoKTsKKwogICAgIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiBtYXJr ZWRSYW5nZXM7CiAKICAgICBGcmFtZVNlbGVjdGlvbiYgZnJhbWVTZWxlY3Rpb24gPSBtX2ZyYW1l LnNlbGVjdGlvbigpOwogICAgIGlmICghZnJhbWVTZWxlY3Rpb24uaXNSYW5nZSgpKSB7Ci0gICAg ICAgIGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQobWFya2Vk UmFuZ2VzKTsKKyAgICAgICAgY2xpZW50KCktPnNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2Vz Q2hhbmdlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIFJlZlB0cjxSYW5nZT4gc2Vs ZWN0ZWRSYW5nZSA9IGZyYW1lU2VsZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdlKCk7CkBAIC0zMzk0 LDIwICszMzk2LDE5IEBAIHZvaWQgRWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9yVGVsZXBob25lTnVt YmVycygpCiAgICAgUmVmUHRyPFJhbmdlPiBleHRlbmRlZFJhbmdlID0gZXh0ZW5kZWRTZWxlY3Rp b24udG9Ob3JtYWxpemVkUmFuZ2UoKTsKIAogICAgIGlmICghZXh0ZW5kZWRSYW5nZSkgewotICAg ICAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXNDaGFuZ2VkKG1hcmtl ZFJhbmdlcyk7CisgICAgICAgIGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdl c0NoYW5nZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIHNjYW5SYW5nZUZvclRl bGVwaG9uZU51bWJlcnMoKmV4dGVuZGVkUmFuZ2UsIGV4dGVuZGVkUmFuZ2UtPnRleHQoKSwgbWFy a2VkUmFuZ2VzKTsKIAogICAgIC8vIE9ubHkgY29uc2lkZXIgcmFuZ2VzIHdpdGggYSBkZXRlY3Rl ZCB0ZWxlcGhvbmUgbnVtYmVyIGlmIHRoZXkgb3ZlcmxhcCB3aXRoIHRoZSBhY3R1YWwgc2VsZWN0 aW9uIHJhbmdlLgotICAgIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiBtYXJrZWRSYW5nZXNJbnRlcnNl Y3RpbmdTZWxlY3Rpb247CiAgICAgZm9yIChhdXRvJiByYW5nZSA6IG1hcmtlZFJhbmdlcykgewog ICAgICAgICBpZiAocmFuZ2VzT3ZlcmxhcChyYW5nZS5nZXQoKSwgc2VsZWN0ZWRSYW5nZS5nZXQo KSkpCi0gICAgICAgICAgICBtYXJrZWRSYW5nZXNJbnRlcnNlY3RpbmdTZWxlY3Rpb24uYXBwZW5k KHJhbmdlKTsKKyAgICAgICAgICAgIG1fZGV0ZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXMuYXBw ZW5kKHJhbmdlKTsKICAgICB9CiAKLSAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVOdW1i ZXJSYW5nZXNDaGFuZ2VkKG1hcmtlZFJhbmdlc0ludGVyc2VjdGluZ1NlbGVjdGlvbik7CisgICAg Y2xpZW50KCktPnNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZCgpOwogfQogCiB2 b2lkIEVkaXRvcjo6c2NhblJhbmdlRm9yVGVsZXBob25lTnVtYmVycyhSYW5nZSYgcmFuZ2UsIGNv bnN0IFN0cmluZ1ZpZXcmIHN0cmluZ1ZpZXcsIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiYgbWFya2Vk UmFuZ2VzKQpAQCAtMzQ0OCwxMyArMzQ0OSw2IEBAIHZvaWQgRWRpdG9yOjpzY2FuUmFuZ2VGb3JU ZWxlcGhvbmVOdW1iZXJzKFJhbmdlJiByYW5nZSwgY29uc3QgU3RyaW5nVmlldyYgc3RyaW5nCiAg ICAgfQogfQogCi12b2lkIEVkaXRvcjo6Y2xlYXJEYXRhRGV0ZWN0ZWRUZWxlcGhvbmVOdW1iZXJz KCkKLXsKLSAgICBkb2N1bWVudCgpLm1hcmtlcnMoKS5yZW1vdmVNYXJrZXJzKERvY3VtZW50TWFy a2VyOjpUZWxlcGhvbmVOdW1iZXIpOwotCi0gICAgLy8gRklYTUU6IERvIG90aGVyIFVJIGNsZWFu dXAgaGVyZSBvbmNlIHdlIGhhdmUgb3RoZXIgVUkuCi19Ci0KICNlbmRpZiAvLyBFTkFCTEUoVEVM RVBIT05FX05VTUJFUl9ERVRFQ1RJT04pICYmICFQTEFURk9STShJT1MpCiAKIHZvaWQgRWRpdG9y Ojp1cGRhdGVFZGl0b3JVSU5vd0lmU2NoZWR1bGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCmlu ZGV4IGEwYjJlZDMuLjgxMThiOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaApAQCAtNDUwLDYg KzQ1MCw3IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RFVEVDVElP TikgJiYgIVBMQVRGT1JNKElPUykKICAgICB2b2lkIHNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVO dW1iZXJzKCk7CisgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JiBkZXRlY3RlZFRlbGVw aG9uZU51bWJlclJhbmdlcygpIGNvbnN0IHsgcmV0dXJuIG1fZGV0ZWN0ZWRUZWxlcGhvbmVOdW1i ZXJSYW5nZXM7IH0KICNlbmRpZgogCiBwcml2YXRlOgpAQCAtNTIxLDkgKzUyMiw5IEBAIHByaXZh dGU6CiAgICAgYm9vbCBzaG91bGREZXRlY3RUZWxlcGhvbmVOdW1iZXJzKCk7CiAgICAgdm9pZCBz Y2FuU2VsZWN0aW9uRm9yVGVsZXBob25lTnVtYmVycyhUaW1lcjxFZGl0b3I+Jik7CiAgICAgdm9p ZCBzY2FuUmFuZ2VGb3JUZWxlcGhvbmVOdW1iZXJzKFJhbmdlJiwgY29uc3QgU3RyaW5nVmlldyYs IFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiYgbWFya2VkUmFuZ2VzKTsKLSAgICB2b2lkIGNsZWFyRGF0 YURldGVjdGVkVGVsZXBob25lTnVtYmVycygpOwogCiAgICAgVGltZXI8RWRpdG9yPiBtX3RlbGVw aG9uZU51bWJlckRldGVjdGlvblVwZGF0ZVRpbWVyOworICAgIFZlY3RvcjxSZWZQdHI8UmFuZ2U+ PiBtX2RldGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzOwogI2VuZGlmCiB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0VkaXRvckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9FZGl0b3JDbGllbnQuaAppbmRleCBkZTcyYmQwLi4yYmUzMDExIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0VkaXRvckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRWRpdG9yQ2xpZW50LmgKQEAgLTE4Miw3ICsxODIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIHNldElucHV0TWV0aG9kU3RhdGUoYm9vbCBlbmFibGVkKSA9IDA7CiAKICNpZiBFTkFC TEUoU0VSVklDRV9DT05UUk9MUykgfHwgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9O KQotICAgIHZpcnR1YWwgdm9pZCBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQo Y29uc3QgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JikgeyB9CisgICAgdmlydHVhbCB2b2lkIHNlbGVj dGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZCgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBz ZWxlY3Rpb25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8TGF5b3V0UmVjdD4mLCBjb25zdCBW ZWN0b3I8R2FwUmVjdHM+JiwgYm9vbCkgeyB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGIxMmNm MzguLmMwOTQzMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MSBAQAorMjAxNC0wOC0xMCAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBZZWxwIHBob25l IG51bWJlciBoaWdobGlnaHRzIG9mdGVuIGRpc2FwcGVhcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1Nzg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xNzk3MTA1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTaW5jZSBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQgZG9lc24ndCBw cm92aWRlIGFuIGFzc29jaWF0ZWQKKyAgICAgICAgRnJhbWUsIGFuIGluY29taW5nIHNlbGVjdGVk VGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZCBmcm9tIGEgc3ViZnJhbWUKKyAgICAgICAgd291 bGQgb3ZlcndyaXRlIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIncyBjYWNoZWQgKGFuZCBwb3Rl bnRpYWxseSBhY3RpdmUpCisgICAgICAgIHRlbGVwaG9uZSBudW1iZXIgaGlnaGxpZ2h0cy4KKwor ICAgICAgICBUaGlzIGhhcHBlbnMgYSBsb3Qgb24gWWVscCwgYmVjYXVzZSB0aGV5IGhhdmUgbWFu eSBzdWJmcmFtZXMgd2hpY2ggYXJlCisgICAgICAgIGRvaW5nIGxheW91dCBvbiBhIHJlZ3VsYXIg YmFzaXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNs aWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkVkaXRvckNsaWVudDo6c2VsZWN0ZWRUZWxl cGhvbmVOdW1iZXJSYW5nZXNDaGFuZ2VkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkVkaXRvckNsaWVudC5oOgorICAgICAgICBBZGp1c3QgdG8gdGhlIG5ldyAobGFj ayBvZikgYXJndW1lbnRzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2Vz T3ZlcmxheUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Nl cnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXI6OnNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZCk6Cisg ICAgICAgIEFkanVzdCBsb2dnaW5nOyB3ZSBjYW4gcmV2aXNpdCBpdCBsYXRlci4KKworICAgICAg ICAoV2ViS2l0OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpidWlsZFBob25lTnVtYmVySGln aGxpZ2h0cyk6CisgICAgICAgIFdoZW4gYnVpbGRpbmcgcGhvbmUgbnVtYmVyIGhpZ2hsaWdodHMs IHdhbGsgdGhlIEZyYW1lIHRyZWUgYW5kIHJldHJpZXZlCisgICAgICAgIHRoZW0gZnJvbSBhbGwg b2YgdGhlIEVkaXRvcnMuCisKKyAgICAgICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJv bGxlcjo6ZGlkUmVidWlsZFBvdGVudGlhbEhpZ2hsaWdodHMpOgorICAgICAgICAoV2ViS2l0OjpT ZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjp0ZWxlcGhvbmVOdW1iZXJSYW5nZXNGb3JGb2N1c2Vk RnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpkZXRl cm1pbmVBY3RpdmVIaWdobGlnaHQpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlc092ZXJsYXlD b250cm9sbGVyOjpoYW5kbGVDbGljayk6CisgICAgICAgIFJldHJpZXZlIHRoZSBkZXRlY3RlZCB0 ZWxlcGhvbmUgbnVtYmVyIHJhbmdlcyBmcm9tIHRoZSBmb2N1c2VkIGZyYW1lCisgICAgICAgIHdo ZW4gY29tYmluaW5nIHRlbGVwaG9uZSBudW1iZXJzIHdpdGggc2VsZWN0aW9uIHNlcnZpY2VzLgor ICAgICAgICBUaGlzIGVuc3VyZXMgdGhhdCB3ZSBkb24ndCBzaG93IGNvbWJpbmVkIHBob25lIG51 bWJlciBoaWdobGlnaHRzIGZyb20gb3RoZXIgZnJhbWVzLgorCiAyMDE0LTA4LTA5ICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yIFNlcnZp Y2VPdmVybGF5Q29udHJvbGxlciBpbiBwcmVwYXJhdGlvbiBmb3IgZmFkaW5nIGJldHdlZW4gaGln aGxpZ2h0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwCmluZGV4IDU3ZTE5ZWUuLmJmZjc2ZjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRp dG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkVkaXRvckNsaWVudC5jcHAKQEAgLTUzMiwxMCArNTMyLDEwIEBAIGJvb2wgV2ViRWRp dG9yQ2xpZW50OjpzdXBwb3J0c0dsb2JhbFNlbGVjdGlvbigpCiB9CiAKICNpZiBFTkFCTEUoU0VS VklDRV9DT05UUk9MUykgfHwgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQotdm9p ZCBXZWJFZGl0b3JDbGllbnQ6OnNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZChj b25zdCBWZWN0b3I8UmVmUHRyPFJhbmdlPj4mIHJhbmdlcykKK3ZvaWQgV2ViRWRpdG9yQ2xpZW50 OjpzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQoKQogewogI2lmIFBMQVRGT1JN KE1BQykKLSAgICBtX3BhZ2UtPnNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIoKS5zZWxlY3RlZFRl bGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQocmFuZ2VzKTsKKyAgICBtX3BhZ2UtPnNlcnZpY2Vz T3ZlcmxheUNvbnRyb2xsZXIoKS5zZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQo KTsKICNlbmRpZgogfQogdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnNlbGVjdGlvblJlY3RzRGlkQ2hh bmdlKGNvbnN0IFZlY3RvcjxMYXlvdXRSZWN0PiYgcmVjdHMsIGNvbnN0IFZlY3RvcjxHYXBSZWN0 cz4mIGdhcFJlY3RzLCBib29sIGlzVGV4dE9ubHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuaAppbmRleCBh MzNmNDA2Li5mMzRhOWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmgKQEAgLTE2OSw3ICsxNjksNyBA QCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0dsb2JhbFNlbGVjdGlvbigpIG92 ZXJyaWRlOwogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKSB8fCBFTkFC TEUoU0VSVklDRV9DT05UUk9MUykKLSAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0ZWRUZWxlcGhvbmVO dW1iZXJSYW5nZXNDaGFuZ2VkKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+PiYp IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdl c0NoYW5nZWQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0aW9uUmVjdHNEaWRD aGFuZ2UoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkxheW91dFJlY3Q+JiwgY29uc3QgVmVjdG9yPFdl YkNvcmU6OkdhcFJlY3RzPiYsIGJvb2wgaXNUZXh0T25seSkgb3ZlcnJpZGU7CiAjZW5kaWYKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9TZXJ2 aWNlc092ZXJsYXlDb250cm9sbGVyLmgKaW5kZXggMzk5ZTc1Yy4uN2VlZWVhMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2VzT3ZlcmxheUNvbnRy b2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNP dmVybGF5Q29udHJvbGxlci5oCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKFNFUlZJQ0Vf Q09OVFJPTFMpIHx8IEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RFVEVDVElPTikKIAogI2luY2x1 ZGUgIlBhZ2VPdmVybGF5LmgiCisjaW5jbHVkZSAiV2ViRnJhbWUuaCIKICNpbmNsdWRlIDxXZWJD b3JlL1JhbmdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9UaW1lci5oPgogI2luY2x1ZGUgPHd0Zi9S ZWZDb3VudGVkLmg+CkBAIC01MCw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBTZXJ2aWNlc092ZXJs YXlDb250cm9sbGVyKFdlYlBhZ2UmKTsKICAgICB+U2VydmljZXNPdmVybGF5Q29udHJvbGxlcigp OwogCi0gICAgdm9pZCBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQoY29uc3Qg VmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpSYW5nZT4+Jik7CisgICAgdm9pZCBzZWxlY3RlZFRlbGVw aG9uZU51bWJlclJhbmdlc0NoYW5nZWQoKTsKICAgICB2b2lkIHNlbGVjdGlvblJlY3RzRGlkQ2hh bmdlKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpMYXlvdXRSZWN0PiYsIGNvbnN0IFZlY3RvcjxXZWJD b3JlOjpHYXBSZWN0cz4mLCBib29sIGlzVGV4dE9ubHkpOwogCiBwcml2YXRlOgpAQCAtMTA5LDEz ICsxMTAsMTQgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBib29sIGhpZ2hsaWdodHNBcmVFcXVp dmFsZW50KGNvbnN0IEhpZ2hsaWdodCogYSwgY29uc3QgSGlnaGxpZ2h0KiBiKTsKIAorICAgIFZl Y3RvcjxSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+PiB0ZWxlcGhvbmVOdW1iZXJSYW5nZXNGb3JGb2N1 c2VkRnJhbWUoKTsKKwogICAgIFdlYlBhZ2UmIG1fd2ViUGFnZTsKICAgICBQYWdlT3ZlcmxheSog bV9zZXJ2aWNlc092ZXJsYXk7CiAKICAgICBSZWZQdHI8SGlnaGxpZ2h0PiBtX2FjdGl2ZUhpZ2hs aWdodDsKICAgICBIYXNoU2V0PFJlZlB0cjxIaWdobGlnaHQ+PiBtX3BvdGVudGlhbEhpZ2hsaWdo dHM7CiAKLSAgICBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlJhbmdlPj4gbV9jdXJyZW50VGVsZXBo b25lTnVtYmVyUmFuZ2VzOwogICAgIFZlY3RvcjxXZWJDb3JlOjpMYXlvdXRSZWN0PiBtX2N1cnJl bnRTZWxlY3Rpb25SZWN0czsKICAgICBib29sIG1faXNUZXh0T25seTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNlc092ZXJsYXlDb250 cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNl c092ZXJsYXlDb250cm9sbGVyLm1tCmluZGV4IDU4NzYwOWQuLjRhMmRlMjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvU2VydmljZXNPdmVybGF5Q29u dHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Nl cnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIubW0KQEAgLTMzLDYgKzMzLDcgQEAKICNpbXBvcnQgIldl YlByb2Nlc3MuaCIKICNpbXBvcnQgPFdlYkNvcmUvRG9jdW1lbnQuaD4KICNpbXBvcnQgPFdlYkNv cmUvRmxvYXRRdWFkLmg+CisjaW1wb3J0IDxXZWJDb3JlL0ZvY3VzQ29udHJvbGxlci5oPgogI2lt cG9ydCA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KICNpbXBvcnQgPFdlYkNvcmUvR2FwUmVjdHMuaD4K ICNpbXBvcnQgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CkBAIC0yMjQsMTIgKzIyNSwxMCBA QCB2b2lkIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OnNlbGVjdGlvblJlY3RzRGlkQ2hhbmdl KGNvbnN0IFZlY3RvcjxMYXlvdXRSZWN0PgogI2VuZGlmCiB9CiAKLXZvaWQgU2VydmljZXNPdmVy bGF5Q29udHJvbGxlcjo6c2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXNDaGFuZ2VkKGNvbnN0 IFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiYgcmFuZ2VzKQordm9pZCBTZXJ2aWNlc092ZXJsYXlDb250 cm9sbGVyOjpzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQoKQogewogI2lmIFBM QVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+IDEwOTAKLSAg ICBMT0coU2VydmljZXMsICJTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyIC0gVGVsZXBob25lIG51 bWJlciByYW5nZXMgY2hhbmdlZCAtIEhhZCAlbHUsIG5vdyBoYXZlICVsdVxuIiwgbV9jdXJyZW50 VGVsZXBob25lTnVtYmVyUmFuZ2VzLnNpemUoKSwgcmFuZ2VzLnNpemUoKSk7Ci0gICAgbV9jdXJy ZW50VGVsZXBob25lTnVtYmVyUmFuZ2VzID0gcmFuZ2VzOwotCisgICAgTE9HKFNlcnZpY2VzLCAi U2VydmljZXNPdmVybGF5Q29udHJvbGxlciAtIFRlbGVwaG9uZSBudW1iZXIgcmFuZ2VzIGNoYW5n ZWRcbiIpOwogICAgIGJ1aWxkUGhvbmVOdW1iZXJIaWdobGlnaHRzKCk7CiAjZWxzZQogICAgIFVO VVNFRF9QQVJBTShyYW5nZXMpOwpAQCAtMzIzLDI1ICszMjIsMzAgQEAgdm9pZCBTZXJ2aWNlc092 ZXJsYXlDb250cm9sbGVyOjpidWlsZFBob25lTnVtYmVySGlnaGxpZ2h0cygpCiB7CiAgICAgcmVt b3ZlQWxsUG90ZW50aWFsSGlnaGxpZ2h0c09mVHlwZShIaWdobGlnaHQ6OlR5cGU6OlRlbGVwaG9u ZU51bWJlcik7CiAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jdXJyZW50VGVsZXBo b25lTnVtYmVyUmFuZ2VzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBUaGlzIHdp bGwgY2hva2UgaWYgdGhlIHJhbmdlIHdyYXBzIGFyb3VuZCB0aGUgZWRnZSBvZiB0aGUgdmlldy4K LSAgICAgICAgLy8gV2hhdCBzaG91bGQgd2UgZG8gaW4gdGhhdCBjYXNlPwotICAgICAgICBJbnRS ZWN0IHJlY3QgPSB0ZXh0UXVhZHNUb0JvdW5kaW5nUmVjdEZvclJhbmdlKCptX2N1cnJlbnRUZWxl cGhvbmVOdW1iZXJSYW5nZXNbaV0pOwotCi0gICAgICAgIC8vIENvbnZlcnQgdG8gdGhlIG1haW4g ZG9jdW1lbnQncyBjb29yZGluYXRlIHNwYWNlLgotICAgICAgICAvLyBGSVhNRTogSXQncyBhIGxp dHRsZSBjcmF6eSB0byBjYWxsIGNvbnRlbnRzVG9XaW5kb3cgYW5kIHRoZW4gd2luZG93VG9Db250 ZW50cyBpbiBvcmRlciB0byBnZXQgdGhlIHJpZ2h0IGNvb3JkaW5hdGUgc3BhY2UuCi0gICAgICAg IC8vIFdlIHNob3VsZCBjb25zaWRlciBhZGRpbmcgY29udmVyc2lvbiBmdW5jdGlvbnMgdG8gU2Ny b2xsVmlldyBmb3IgY29udGVudHNUb0RvY3VtZW50KCkuIFJpZ2h0IG5vdywgY29udGVudHNUb1Jv b3RWaWV3KCkgaXMKLSAgICAgICAgLy8gbm90IGVxdWl2YWxlbnQgdG8gd2hhdCB3ZSBuZWVkIHdo ZW4geW91IGhhdmUgYSB0b3BDb250ZW50SW5zZXQgb3IgYSBoZWFkZXIgYmFubmVyLgotICAgICAg ICBGcmFtZVZpZXcqIHZpZXdGb3JSYW5nZSA9IG1fY3VycmVudFRlbGVwaG9uZU51bWJlclJhbmdl c1tpXS0+b3duZXJEb2N1bWVudCgpLnZpZXcoKTsKLSAgICAgICAgaWYgKCF2aWV3Rm9yUmFuZ2Up Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgRnJhbWVWaWV3JiBtYWluRnJhbWVWaWV3 ID0gKm1fd2ViUGFnZS5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS52aWV3KCk7Ci0gICAgICAgIHJl Y3Quc2V0TG9jYXRpb24obWFpbkZyYW1lVmlldy53aW5kb3dUb0NvbnRlbnRzKHZpZXdGb3JSYW5n ZS0+Y29udGVudHNUb1dpbmRvdyhyZWN0LmxvY2F0aW9uKCkpKSk7CisgICAgRnJhbWUqIG1haW5G cmFtZSA9IG1fd2ViUGFnZS5tYWluRnJhbWUoKTsKKyAgICBGcmFtZVZpZXcmIG1haW5GcmFtZVZp ZXcgPSAqbWFpbkZyYW1lLT52aWV3KCk7CisKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1haW5G cmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgeworICAg ICAgICBhdXRvJiByYW5nZXMgPSBmcmFtZS0+ZWRpdG9yKCkuZGV0ZWN0ZWRUZWxlcGhvbmVOdW1i ZXJSYW5nZXMoKTsKKyAgICAgICAgZm9yIChhdXRvJiByYW5nZSA6IHJhbmdlcykgeworICAgICAg ICAgICAgLy8gRklYTUU6IFRoaXMgd2lsbCBjaG9rZSBpZiB0aGUgcmFuZ2Ugd3JhcHMgYXJvdW5k IHRoZSBlZGdlIG9mIHRoZSB2aWV3LgorICAgICAgICAgICAgLy8gV2hhdCBzaG91bGQgd2UgZG8g aW4gdGhhdCBjYXNlPworICAgICAgICAgICAgSW50UmVjdCByZWN0ID0gdGV4dFF1YWRzVG9Cb3Vu ZGluZ1JlY3RGb3JSYW5nZSgqcmFuZ2UpOworCisgICAgICAgICAgICAvLyBDb252ZXJ0IHRvIHRo ZSBtYWluIGRvY3VtZW50J3MgY29vcmRpbmF0ZSBzcGFjZS4KKyAgICAgICAgICAgIC8vIEZJWE1F OiBJdCdzIGEgbGl0dGxlIGNyYXp5IHRvIGNhbGwgY29udGVudHNUb1dpbmRvdyBhbmQgdGhlbiB3 aW5kb3dUb0NvbnRlbnRzIGluIG9yZGVyIHRvIGdldCB0aGUgcmlnaHQgY29vcmRpbmF0ZSBzcGFj ZS4KKyAgICAgICAgICAgIC8vIFdlIHNob3VsZCBjb25zaWRlciBhZGRpbmcgY29udmVyc2lvbiBm dW5jdGlvbnMgdG8gU2Nyb2xsVmlldyBmb3IgY29udGVudHNUb0RvY3VtZW50KCkuIFJpZ2h0IG5v dywgY29udGVudHNUb1Jvb3RWaWV3KCkgaXMKKyAgICAgICAgICAgIC8vIG5vdCBlcXVpdmFsZW50 IHRvIHdoYXQgd2UgbmVlZCB3aGVuIHlvdSBoYXZlIGEgdG9wQ29udGVudEluc2V0IG9yIGEgaGVh ZGVyIGJhbm5lci4KKyAgICAgICAgICAgIEZyYW1lVmlldyogdmlld0ZvclJhbmdlID0gcmFuZ2Ut Pm93bmVyRG9jdW1lbnQoKS52aWV3KCk7CisgICAgICAgICAgICBpZiAoIXZpZXdGb3JSYW5nZSkK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHJlY3Quc2V0TG9jYXRpb24o bWFpbkZyYW1lVmlldy53aW5kb3dUb0NvbnRlbnRzKHZpZXdGb3JSYW5nZS0+Y29udGVudHNUb1dp bmRvdyhyZWN0LmxvY2F0aW9uKCkpKSk7CiAKLSAgICAgICAgQ0dSZWN0IGNnUmVjdCA9IHJlY3Q7 Ci0gICAgICAgIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4gZGRIaWdobGlnaHQgPSBhZG9wdENG KERESGlnaGxpZ2h0Q3JlYXRlV2l0aFJlY3RzSW5WaXNpYmxlUmVjdFdpdGhTdHlsZUFuZERpcmVj dGlvbihudWxscHRyLCAmY2dSZWN0LCAxLCBtYWluRnJhbWVWaWV3LnZpc2libGVDb250ZW50UmVj dCgpLCBEREhpZ2hsaWdodE91dGxpbmVXaXRoQXJyb3csIFlFUywgTlNXcml0aW5nRGlyZWN0aW9u TmF0dXJhbCwgTk8sIFlFUykpOworICAgICAgICAgICAgQ0dSZWN0IGNnUmVjdCA9IHJlY3Q7Cisg ICAgICAgICAgICBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IGRkSGlnaGxpZ2h0ID0gYWRvcHRD RihEREhpZ2hsaWdodENyZWF0ZVdpdGhSZWN0c0luVmlzaWJsZVJlY3RXaXRoU3R5bGVBbmREaXJl Y3Rpb24obnVsbHB0ciwgJmNnUmVjdCwgMSwgbWFpbkZyYW1lVmlldy52aXNpYmxlQ29udGVudFJl Y3QoKSwgRERIaWdobGlnaHRPdXRsaW5lV2l0aEFycm93LCBZRVMsIE5TV3JpdGluZ0RpcmVjdGlv bk5hdHVyYWwsIE5PLCBZRVMpKTsKIAotICAgICAgICBtX3BvdGVudGlhbEhpZ2hsaWdodHMuYWRk KEhpZ2hsaWdodDo6Y3JlYXRlRm9yVGVsZXBob25lTnVtYmVyKGRkSGlnaGxpZ2h0LCBtX2N1cnJl bnRUZWxlcGhvbmVOdW1iZXJSYW5nZXNbaV0pKTsKKyAgICAgICAgICAgIG1fcG90ZW50aWFsSGln aGxpZ2h0cy5hZGQoSGlnaGxpZ2h0OjpjcmVhdGVGb3JUZWxlcGhvbmVOdW1iZXIoZGRIaWdobGln aHQsIHJhbmdlKSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBkaWRSZWJ1aWxkUG90ZW50aWFs SGlnaGxpZ2h0cygpOwpAQCAtMzgwLDcgKzM4NCw3IEBAIHZvaWQgU2VydmljZXNPdmVybGF5Q29u dHJvbGxlcjo6ZGlkUmVidWlsZFBvdGVudGlhbEhpZ2hsaWdodHMoKQogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgaWYgKG1fY3VycmVudFRlbGVwaG9uZU51bWJlclJhbmdlcy5pc0VtcHR5 KCkgJiYgIWhhc1JlbGV2YW50U2VsZWN0aW9uU2VydmljZXMoKSkKKyAgICBpZiAodGVsZXBob25l TnVtYmVyUmFuZ2VzRm9yRm9jdXNlZEZyYW1lKCkuaXNFbXB0eSgpICYmICFoYXNSZWxldmFudFNl bGVjdGlvblNlcnZpY2VzKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGNyZWF0ZU92ZXJsYXlJ Zk5lZWRlZCgpOwpAQCAtMzk5LDYgKzQwMywxNSBAQCB2b2lkIFNlcnZpY2VzT3ZlcmxheUNvbnRy b2xsZXI6OmNyZWF0ZU92ZXJsYXlJZk5lZWRlZCgpCiAgICAgbV9zZXJ2aWNlc092ZXJsYXktPnNl dE5lZWRzRGlzcGxheSgpOwogfQogCitWZWN0b3I8UmVmUHRyPFJhbmdlPj4gU2VydmljZXNPdmVy bGF5Q29udHJvbGxlcjo6dGVsZXBob25lTnVtYmVyUmFuZ2VzRm9yRm9jdXNlZEZyYW1lKCkKK3sK KyAgICBQYWdlKiBwYWdlID0gbV93ZWJQYWdlLmNvcmVQYWdlKCk7CisgICAgaWYgKCFwYWdlKQor ICAgICAgICByZXR1cm4gVmVjdG9yPFJlZlB0cjxSYW5nZT4+KCk7CisKKyAgICByZXR1cm4gcGFn ZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCkuZWRpdG9yKCkuZGV0ZWN0 ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXMoKTsKK30KKwogYm9vbCBTZXJ2aWNlc092ZXJsYXlDb250 cm9sbGVyOjpoaWdobGlnaHRzQXJlRXF1aXZhbGVudChjb25zdCBIaWdobGlnaHQqIGEsIGNvbnN0 IEhpZ2hsaWdodCogYikKIHsKICAgICBpZiAoYSA9PSBiKQpAQCAtNDI3LDcgKzQ0MCw3IEBAIHZv aWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6ZGV0ZXJtaW5lQWN0aXZlSGlnaGxpZ2h0KGJv b2wmIG1vdXNlSXNPdmVyQWN0aXZlCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAg ICAgICAgIC8vIElmIHRoaXMgaGlnaGxpZ2h0IGhhcyBubyBjb21wYXRpYmxlIHNlcnZpY2VzLCBp dCBjYW4ndCBiZSBhY3RpdmUsIHVubGVzcyB3ZSBoYXZlIHRlbGVwaG9uZSBudW1iZXIgaGlnaGxp Z2h0cyB0byBzaG93IGluIHRoZSBjb21iaW5lZCBtZW51LgotICAgICAgICAgICAgaWYgKG1fY3Vy cmVudFRlbGVwaG9uZU51bWJlclJhbmdlcy5pc0VtcHR5KCkgJiYgIWhhc1JlbGV2YW50U2VsZWN0 aW9uU2VydmljZXMoKSkKKyAgICAgICAgICAgIGlmICh0ZWxlcGhvbmVOdW1iZXJSYW5nZXNGb3JG b2N1c2VkRnJhbWUoKS5pc0VtcHR5KCkgJiYgIWhhc1JlbGV2YW50U2VsZWN0aW9uU2VydmljZXMo KSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCkBAIC01MDUsOSArNTE4 LDEwIEBAIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6aGFuZGxlQ2xpY2soY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIGNsaWNrUG9pbnQsCiAgICAgSW50UG9pbnQgd2luZG93UG9pbnQg PSBmcmFtZVZpZXctPmNvbnRlbnRzVG9XaW5kb3coY2xpY2tQb2ludCk7CiAKICAgICBpZiAoaGln aGxpZ2h0LnR5cGUoKSA9PSBIaWdobGlnaHQ6OlR5cGU6OlNlbGVjdGlvbikgeworICAgICAgICBh dXRvIHRlbGVwaG9uZU51bWJlclJhbmdlcyA9IHRlbGVwaG9uZU51bWJlclJhbmdlc0ZvckZvY3Vz ZWRGcmFtZSgpOwogICAgICAgICBWZWN0b3I8U3RyaW5nPiBzZWxlY3RlZFRlbGVwaG9uZU51bWJl cnM7Ci0gICAgICAgIHNlbGVjdGVkVGVsZXBob25lTnVtYmVycy5yZXNlcnZlQ2FwYWNpdHkobV9j dXJyZW50VGVsZXBob25lTnVtYmVyUmFuZ2VzLnNpemUoKSk7Ci0gICAgICAgIGZvciAoYXV0byYg cmFuZ2UgOiBtX2N1cnJlbnRUZWxlcGhvbmVOdW1iZXJSYW5nZXMpCisgICAgICAgIHNlbGVjdGVk VGVsZXBob25lTnVtYmVycy5yZXNlcnZlQ2FwYWNpdHkodGVsZXBob25lTnVtYmVyUmFuZ2VzLnNp emUoKSk7CisgICAgICAgIGZvciAoYXV0byYgcmFuZ2UgOiB0ZWxlcGhvbmVOdW1iZXJSYW5nZXMp CiAgICAgICAgICAgICBzZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMuYXBwZW5kKHJhbmdlLT50ZXh0 KCkpOwogCiAgICAgICAgIG1fd2ViUGFnZS5oYW5kbGVTZWxlY3Rpb25TZXJ2aWNlQ2xpY2sobV93 ZWJQYWdlLmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnNlbGVjdGlvbigpLCBzZWxlY3RlZFRlbGVw aG9uZU51bWJlcnMsIHdpbmRvd1BvaW50KTsK