198487 2019-06-03 10:11:33 -0700 Tweak the text and underline color for data detected text 2019-06-03 12:14:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bdakin bfulgham commit-queue hi megan_gardner simon.fraser thorton webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1541258 0 timothy 2019-06-03 10:11:33 -0700 Simplify and tweak how the color is computed for data detected text. <rdar://problem/50667125> 1541259 1 371193 timothy 2019-06-03 10:21:30 -0700 Created attachment 371193 Patch 1541260 2 371193 hi 2019-06-03 10:28:06 -0700 Comment on attachment 371193 Patch r=me 1541286 3 371193 commit-queue 2019-06-03 12:14:47 -0700 Comment on attachment 371193 Patch Clearing flags on attachment: 371193 Committed r246042: <https://trac.webkit.org/changeset/246042> 1541287 4 commit-queue 2019-06-03 12:14:49 -0700 All reviewed patches have been landed. Closing bug. 371193 2019-06-03 10:21:30 -0700 2019-06-03 12:14:47 -0700 Patch bug-198487-20190603102130.patch text/plain 11692 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk2ZDI2MDljOWUzZDcy MDdmZmE5MmQxZGEyZWE3NjNmMzZhMjEwNS4uN2JiZGRkZDUyNWVhZDYwNjRiYjFkNDI0ODgzNTc5 NjA0ZDgwZDdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA2LTAzICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBUd2VhayB0aGUgdGV4 dCBhbmQgdW5kZXJsaW5lIGNvbG9yIGZvciBkYXRhIGRldGVjdGVkIHRleHQuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg0ODcKKyAgICAgICAgcmRh cjovL3Byb2JsZW0vNTA2NjcxMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0czogQ29sb3IuUkdCVG9IU0wgQVBJIHRlc3RzCisKKyAgICAgICAg KiBlZGl0aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW06CisgICAgICAgIChXZWJDb3JlOjpEYXRh RGV0ZWN0aW9uOjpkZXRlY3RDb250ZW50SW5SYW5nZSk6IFVzZSBjdXJyZW50Y29sb3Igc28gc2Vt YW50aWMgdGV4dCBjb2xvcnMgd29yay4KKyAgICAgICAgRm9yY2UgdGhlIGxpZ2h0bmVzcyBvZiB0 aGUgdW5kZXJsaW5lIGNvbG9yIHRvIHRoZSBtaWRkbGUsIGFuZCBtdWx0aXBseSB0aGUgYWxwaGEg YnkgMzglLAorICAgICAgICBzbyB0aGUgY29sb3Igd2lsbCBhcHBlYXIgb24gbGlnaHQgYW5kIGRh cmsgYmFja2dyb3VuZHMsIHNpbmNlIG9ubHkgb25lIGNvbG9yIGNhbiBiZSBzcGVjaWZpZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q29sb3I6OmdldEhTTCBjb25zdCk6IFJldHVybiBodWUgaW4gWzAuLi42KSByYW5nZSB0byBlYXNp bHkgcm91bmQtdHJpcCB3aXRoIG1ha2VSR0JBRnJvbUhTTEEoKS4KKwogMjAxOS0wNi0wMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXN5bmMgb3Zl cmZsb3cgc2Nyb2xsXSBGbGFzaGluZyBjb250ZW50IHdoZW4gc2Nyb2xsaW5nIGFzeW5jIG92ZXJm bG93IHdpdGggYSBuZWdhdGl2ZSB6LWluZGV4IGNoaWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW0KaW5kZXggZWJlNGJkYzQyMTBiNjdjMDU4ZGYwMWYx YWU5ZDUwNGUwYTMzYjc2ZS4uYmNiMjM4ZTEwNmQ3Nzc4ODNlZGUwZjM0M2FkNDZjZjRjMjk1YThk ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9EYXRhRGV0ZWN0aW9u Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQpA QCAtNTgwLDEyICs1ODAsMTQgQEAgTlNBcnJheSAqRGF0YURldGVjdGlvbjo6ZGV0ZWN0Q29udGVu dEluUmFuZ2UoUmVmUHRyPFJhbmdlPiYgY29udGV4dFJhbmdlLCBEYXRhRGUKICAgICAgICAgICAg IGF1dG8qIHBhcmVudE5vZGUgPSByYW5nZS0+c3RhcnRDb250YWluZXIoKS5wYXJlbnROb2RlKCk7 CiAgICAgICAgICAgICBpZiAoIXBhcmVudE5vZGUpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CisKICAgICAgICAgICAgIGlmICghaXM8VGV4dD4ocmFuZ2UtPnN0YXJ0Q29udGFpbmVyKCkpKQog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgICAgICBhdXRvJiBjdXJyZW50VGV4 dE5vZGUgPSBkb3duY2FzdDxUZXh0PihyYW5nZS0+c3RhcnRDb250YWluZXIoKSk7CiAgICAgICAg ICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBjdXJyZW50VGV4dE5vZGUuZG9jdW1lbnQoKTsKICAg ICAgICAgICAgIFN0cmluZyB0ZXh0Tm9kZURhdGE7Ci0gICAgICAgICAgICAKKwogICAgICAgICAg ICAgaWYgKGxhc3RUZXh0Tm9kZVRvVXBkYXRlICE9ICZjdXJyZW50VGV4dE5vZGUpIHsKICAgICAg ICAgICAgICAgICBpZiAobGFzdFRleHROb2RlVG9VcGRhdGUpCiAgICAgICAgICAgICAgICAgICAg IGxhc3RUZXh0Tm9kZVRvVXBkYXRlLT5zZXREYXRhKGxhc3ROb2RlQ29udGVudCk7CkBAIC01OTQs MTIgKzU5NiwxMiBAQCBOU0FycmF5ICpEYXRhRGV0ZWN0aW9uOjpkZXRlY3RDb250ZW50SW5SYW5n ZShSZWZQdHI8UmFuZ2U+JiBjb250ZXh0UmFuZ2UsIERhdGFEZQogICAgICAgICAgICAgICAgICAg ICB0ZXh0Tm9kZURhdGEgPSBjdXJyZW50VGV4dE5vZGUuZGF0YSgpLnN1YnN0cmluZygwLCByYW5n ZS0+c3RhcnRPZmZzZXQoKSk7CiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0 ZXh0Tm9kZURhdGEgPSBjdXJyZW50VGV4dE5vZGUuZGF0YSgpLnN1YnN0cmluZyhjb250ZW50T2Zm c2V0LCByYW5nZS0+c3RhcnRPZmZzZXQoKSAtIGNvbnRlbnRPZmZzZXQpOwotICAgICAgICAgICAg CisKICAgICAgICAgICAgIGlmICghdGV4dE5vZGVEYXRhLmlzRW1wdHkoKSkgewogICAgICAgICAg ICAgICAgIHBhcmVudE5vZGUtPmluc2VydEJlZm9yZShUZXh0OjpjcmVhdGUoZG9jdW1lbnQsIHRl eHROb2RlRGF0YSksICZjdXJyZW50VGV4dE5vZGUpOwogICAgICAgICAgICAgICAgIGNvbnRlbnRP ZmZzZXQgPSByYW5nZS0+c3RhcnRPZmZzZXQoKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IAorCiAgICAgICAgICAgICAvLyBDcmVhdGUgdGhlIGFjdHVhbCBhbmNob3Igbm9kZSBhbmQgaW5z ZXJ0IGl0IGJlZm9yZSB0aGUgY3VycmVudCBub2RlLgogICAgICAgICAgICAgdGV4dE5vZGVEYXRh ID0gY3VycmVudFRleHROb2RlLmRhdGEoKS5zdWJzdHJpbmcocmFuZ2UtPnN0YXJ0T2Zmc2V0KCks IHJhbmdlLT5lbmRPZmZzZXQoKSAtIHJhbmdlLT5zdGFydE9mZnNldCgpKTsKICAgICAgICAgICAg IFJlZjxUZXh0PiBuZXdUZXh0Tm9kZSA9IFRleHQ6OmNyZWF0ZShkb2N1bWVudCwgdGV4dE5vZGVE YXRhKTsKQEAgLTYwOCwzNSArNjEwLDMxIEBAIE5TQXJyYXkgKkRhdGFEZXRlY3Rpb246OmRldGVj dENvbnRlbnRJblJhbmdlKFJlZlB0cjxSYW5nZT4mIGNvbnRleHRSYW5nZSwgRGF0YURlCiAgICAg ICAgICAgICBSZWY8SFRNTEFuY2hvckVsZW1lbnQ+IGFuY2hvckVsZW1lbnQgPSBIVE1MQW5jaG9y RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKICAgICAgICAgICAgIGFuY2hvckVsZW1lbnQtPnNl dEhyZWYoY29ycmVzcG9uZGluZ1VSTCk7CiAgICAgICAgICAgICBhbmNob3JFbGVtZW50LT5zZXRE aXIoImx0ciIpOworICAgICAgICAgICAgYW5jaG9yRWxlbWVudC0+c2V0SW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eUNvbG9yLCBDU1NWYWx1ZUN1cnJlbnRjb2xvcik7CisKICAgICAgICAg ICAgIGlmIChzaG91bGRVc2VMaWdodExpbmtzKSB7CiAgICAgICAgICAgICAgICAgZG9jdW1lbnQu dXBkYXRlU3R5bGVJZk5lZWRlZCgpOworCiAgICAgICAgICAgICAgICAgYXV0byogcmVuZGVyU3R5 bGUgPSBwYXJlbnROb2RlLT5jb21wdXRlZFN0eWxlKCk7CiAgICAgICAgICAgICAgICAgaWYgKHJl bmRlclN0eWxlKSB7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gdGV4dENvbG9yID0gcmVuZGVy U3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKTsKICAgICAgICAg ICAgICAgICAgICAgaWYgKHRleHRDb2xvci5pc1ZhbGlkKCkpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGRvdWJsZSBoID0gMDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBzID0g MDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSB2ID0gMDsKLSAgICAgICAgICAgICAg ICAgICAgICAgIHRleHRDb2xvci5nZXRIU1YoaCwgcywgdik7Ci0KLSAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFNldCB0aGUgYWxwaGEgb2YgdGhlIHVuZGVybGluZSB0byA0NiUgaWYgdGhlIHRl eHQgY29sb3IgaXMgd2hpdGUtaXNoIChkZWZpbmVkCi0gICAgICAgICAgICAgICAgICAgICAgICAv LyBhcyBoYXZpbmcgYSBzYXR1cmF0aW9uIG9mIGxlc3MgdGhhbiAyJSBhbmQgYSB2YWx1ZS9icmln aHRuZXNzIG9yIGdyZWF0ZXIgdGhhbgotICAgICAgICAgICAgICAgICAgICAgICAgLy8gOTglKS4g T3RoZXJ3aXNlLCBzZXQgdGhlIGFscGhhIG9mIHRoZSB1bmRlcmxpbmUgdG8gMjYlLgotICAgICAg ICAgICAgICAgICAgICAgICAgZG91YmxlIG92ZXJyaWRlQWxwaGEgPSAocyA8IDAuMDIgJiYgdiA+ IDAuOTgpID8gMC40NiA6IDAuMjY7Ci0gICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHVuZGVy bGluZUNvbG9yID0gQ29sb3IoY29sb3JXaXRoT3ZlcnJpZGVBbHBoYSh0ZXh0Q29sb3IucmdiKCks IG92ZXJyaWRlQWxwaGEpKTsKLQotICAgICAgICAgICAgICAgICAgICAgICAgYW5jaG9yRWxlbWVu dC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUNvbG9yLCB0ZXh0Q29sb3IuY3Nz VGV4dCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBodWUsIHNhdHVyYXRpb24s IGxpZ2h0bmVzczsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHRDb2xvci5nZXRIU0woaHVl LCBzYXR1cmF0aW9uLCBsaWdodG5lc3MpOworCisgICAgICAgICAgICAgICAgICAgICAgICAvLyBG b3JjZSB0aGUgbGlnaHRuZXNzIG9mIHRoZSB1bmRlcmxpbmUgY29sb3IgdG8gdGhlIG1pZGRsZSwg YW5kIG11bHRpcGx5IHRoZSBhbHBoYSBieSAzOCUsCisgICAgICAgICAgICAgICAgICAgICAgICAv LyBzbyB0aGUgY29sb3Igd2lsbCBhcHBlYXIgb24gbGlnaHQgYW5kIGRhcmsgYmFja2dyb3VuZHMs IHNpbmNlIG9ubHkgb25lIGNvbG9yIGNhbiBiZSBzcGVjaWZpZWQuCisgICAgICAgICAgICAgICAg ICAgICAgICBkb3VibGUgb3ZlcnJpZGVMaWdodG5lc3MgPSAwLjU7CisgICAgICAgICAgICAgICAg ICAgICAgICBkb3VibGUgb3ZlcnJpZGVBbHBoYU11bHRpcGxpZXIgPSAwLjM4OworICAgICAgICAg ICAgICAgICAgICAgICAgYXV0byB1bmRlcmxpbmVDb2xvciA9IENvbG9yKG1ha2VSR0JBRnJvbUhT TEEoaHVlLCBzYXR1cmF0aW9uLCBvdmVycmlkZUxpZ2h0bmVzcywgb3ZlcnJpZGVBbHBoYU11bHRp cGxpZXIgKiB0ZXh0Q29sb3IuYWxwaGFBc0Zsb2F0KCkpKTsKKwogICAgICAgICAgICAgICAgICAg ICAgICAgYW5jaG9yRWxlbWVudC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVRl eHREZWNvcmF0aW9uQ29sb3IsIHVuZGVybGluZUNvbG9yLmNzc1RleHQoKSk7CiAgICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGlz PFN0eWxlZEVsZW1lbnQ+KCpwYXJlbnROb2RlKSkgewotICAgICAgICAgICAgICAgIGlmIChhdXRv KiBzdHlsZSA9IGRvd25jYXN0PFN0eWxlZEVsZW1lbnQ+KCpwYXJlbnROb2RlKS5wcmVzZW50YXRp b25BdHRyaWJ1dGVTdHlsZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIFN0cmluZyBjb2xvciA9 IHN0eWxlLT5nZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5Q29sb3IpOwotICAgICAgICAgICAg ICAgICAgICBpZiAoIWNvbG9yLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGFu Y2hvckVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlDb2xvciwgY29s b3IpOwotICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgYW5j aG9yRWxlbWVudC0+YXBwZW5kQ2hpbGQoV1RGTW92ZShuZXdUZXh0Tm9kZSkpOworCiAgICAgICAg ICAgICAvLyBBZGQgYSBzcGVjaWFsIGF0dHJpYnV0ZSB0byBtYXJrIHRoaXMgVVJMaWZpY2F0aW9u IGFzIHRoZSByZXN1bHQgb2YgZGF0YSBkZXRlY3RvcnMuCiAgICAgICAgICAgICBhbmNob3JFbGVt ZW50LT5zZXRBdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHhfYXBwbGVfZGF0YV9kZXRl Y3RvcnNBdHRyLCBBdG9taWNTdHJpbmcoInRydWUiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZy b21MaXRlcmFsKSk7CiAgICAgICAgICAgICBhbmNob3JFbGVtZW50LT5zZXRBdHRyaWJ1dGVXaXRo b3V0U3luY2hyb25pemF0aW9uKHhfYXBwbGVfZGF0YV9kZXRlY3RvcnNfdHlwZUF0dHIsIGRhdGFE ZXRlY3RvclR5cGVGb3JDYXRlZ29yeShzb2Z0TGlua19EYXRhRGV0ZWN0b3JzQ29yZV9ERFJlc3Vs dEdldENhdGVnb3J5KGNvcmVSZXN1bHQpKSk7CkBAIC02NDUsMTEgKzY0MywxMiBAQCBOU0FycmF5 ICpEYXRhRGV0ZWN0aW9uOjpkZXRlY3RDb250ZW50SW5SYW5nZShSZWZQdHI8UmFuZ2U+JiBjb250 ZXh0UmFuZ2UsIERhdGFEZQogICAgICAgICAgICAgcGFyZW50Tm9kZS0+aW5zZXJ0QmVmb3JlKFdU Rk1vdmUoYW5jaG9yRWxlbWVudCksICZjdXJyZW50VGV4dE5vZGUpOwogCiAgICAgICAgICAgICBj b250ZW50T2Zmc2V0ID0gcmFuZ2UtPmVuZE9mZnNldCgpOwotICAgICAgICAgICAgCisKICAgICAg ICAgICAgIGxhc3ROb2RlQ29udGVudCA9IGN1cnJlbnRUZXh0Tm9kZS5kYXRhKCkuc3Vic3RyaW5n KHJhbmdlLT5lbmRPZmZzZXQoKSwgY3VycmVudFRleHROb2RlLmxlbmd0aCgpIC0gcmFuZ2UtPmVu ZE9mZnNldCgpKTsKICAgICAgICAgICAgIGxhc3RUZXh0Tm9kZVRvVXBkYXRlID0gJmN1cnJlbnRU ZXh0Tm9kZTsKICAgICAgICAgfSAgICAgICAgCiAgICAgfQorCiAgICAgaWYgKGxhc3RUZXh0Tm9k ZVRvVXBkYXRlKQogICAgICAgICBsYXN0VGV4dE5vZGVUb1VwZGF0ZS0+c2V0RGF0YShsYXN0Tm9k ZUNvbnRlbnQpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvQ29sb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3Iu Y3BwCmluZGV4IDY4MGE5Y2I2NmU3YTU4Y2IzOTk5ZjMwNDUyYmUzNWIxYzM3NTc2YzEuLmM3NGQw MjE5NjEwYzdiYzczOGZjOWMxN2IzNTUxNjI0YzM5ODc5MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKQEAgLTU0Miw3ICs1NDIsNyBAQCB2b2lkIENvbG9y OjpnZXRIU0woZG91YmxlJiBodWUsIGRvdWJsZSYgc2F0dXJhdGlvbiwgZG91YmxlJiBsaWdodG5l c3MpIGNvbnN0CiB7CiAgICAgLy8gaHR0cDovL2VuLndpa2lwZWRpYS5vcmcvd2lraS9IU0xfY29s b3Jfc3BhY2UuIFRoaXMgaXMgYSBkaXJlY3QgY29weSBvZgogICAgIC8vIHRoZSBhbGdvcml0aG0g dGhlcmVpbiwgYWx0aG91Z2ggaXQncyAzNjBebyBiYXNlZCBhbmQgd2UgZW5kIHVwIHdhbnRpbmcK LSAgICAvLyBbMC4uLjEpIGJhc2VkLiBJdCdzIGNsZWFyZXIgaWYgd2Ugc3RpY2sgdG8gMzYwXm8g dW50aWwgdGhlIGVuZC4KKyAgICAvLyBbMC4uLjYpIGJhc2VkLiBJdCdzIGNsZWFyZXIgaWYgd2Ug c3RpY2sgdG8gMzYwXm8gdW50aWwgdGhlIGVuZC4KICAgICBkb3VibGUgciA9IHN0YXRpY19jYXN0 PGRvdWJsZT4ocmVkKCkpIC8gMjU1LjA7CiAgICAgZG91YmxlIGcgPSBzdGF0aWNfY2FzdDxkb3Vi bGU+KGdyZWVuKCkpIC8gMjU1LjA7CiAgICAgZG91YmxlIGIgPSBzdGF0aWNfY2FzdDxkb3VibGU+ KGJsdWUoKSkgLyAyNTUuMDsKQEAgLTU2Miw4ICs1NjIsOCBAQCB2b2lkIENvbG9yOjpnZXRIU0wo ZG91YmxlJiBodWUsIGRvdWJsZSYgc2F0dXJhdGlvbiwgZG91YmxlJiBsaWdodG5lc3MpIGNvbnN0 CiAgICAgaWYgKGh1ZSA+PSAzNjAuMCkKICAgICAgICAgaHVlIC09IDM2MC4wOwogCi0gICAgLy8g bWFrZVJHQkFGcm9tSFNMQSBhc3N1bWVzIHRoYXQgaHVlIGlzIGluIFswLi4uMSkuCi0gICAgaHVl IC89IDM2MC4wOworICAgIC8vIG1ha2VSR0JBRnJvbUhTTEEgYXNzdW1lcyB0aGF0IGh1ZSBpcyBp biBbMC4uLjYpLgorICAgIGh1ZSAvPSA2MC4wOwogCiAgICAgbGlnaHRuZXNzID0gMC41ICogKG1h eCArIG1pbik7CiAgICAgaWYgKCFjaHJvbWEpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjg4MzQ5MDMzY2VlYzcyOGJkY2QyYjI4ZDkyMjcyNTQ5 ZTBjNjc0Yy4uZDM1ODNlNzI1Y2I2YzFkNDljZjUxZWNjZWNmMGJiNmE4MzY0YmMyMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE5LTA2LTAzICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwor ICAgICAgICBUd2VhayB0aGUgdGV4dCBhbmQgdW5kZXJsaW5lIGNvbG9yIGZvciBkYXRhIGRldGVj dGVkIHRleHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTg0ODcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNTA2NjcxMjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViQ29yZS9Db2xvci5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKTogQWRkZWQg Q29sb3IuUkdCVG9IU0wgdGVzdHMuCisKIDIwMTktMDUtMzEgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CiAKICAgICAgICAgVGVzdFdlYktpdEFQSS5XS1dlYlZpZXcuTG9jYWxTdG9y YWdlUHJvY2Vzc1N1c3BlbmRzIGlzIGZsYWt5CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYkNvcmUvQ29sb3IuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJDb3JlL0NvbG9yLmNwcAppbmRleCA2MWFmMWM2NjBkMWUwMzA3MjM1NzljM2MxMWUxNmM1YTY2 NjUyOTExLi5jMTEwNWUwMzI3Y2ZlNWQwNDBjNWRkMDZiNDk1OTJjMGVkNDFmMGJlIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29sb3IuY3BwCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xvci5jcHAKQEAgLTEsNSArMSw1IEBA CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiwgMjAxOSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE0 NCw2ICsxNDQsMTAyIEBAIFRFU1QoQ29sb3IsIFJHQlRvSFNWX0xpZ2h0R3JheSkKICAgICBFWFBF Q1RfRE9VQkxFX0VRKDAuNzUyOTQxMTc2NDcwNTg4MjIsIHYpOwogfQogCitURVNUKENvbG9yLCBS R0JUb0hTTF9XaGl0ZSkKK3sKKyAgICBDb2xvciBjb2xvciA9IENvbG9yOjp3aGl0ZTsKKworICAg IGRvdWJsZSBodWUsIHNhdHVyYXRpb24sIGxpZ2h0bmVzczsKKyAgICBjb2xvci5nZXRIU0woaHVl LCBzYXR1cmF0aW9uLCBsaWdodG5lc3MpOworCisgICAgRVhQRUNUX0RPVUJMRV9FUSgwLCBodWUp OworICAgIEVYUEVDVF9ET1VCTEVfRVEoMCwgc2F0dXJhdGlvbik7CisgICAgRVhQRUNUX0RPVUJM RV9FUSgxLCBsaWdodG5lc3MpOworfQorCitURVNUKENvbG9yLCBSR0JUb0hTTF9CbGFjaykKK3sK KyAgICBDb2xvciBjb2xvciA9IENvbG9yOjpibGFjazsKKworICAgIGRvdWJsZSBodWUsIHNhdHVy YXRpb24sIGxpZ2h0bmVzczsKKyAgICBjb2xvci5nZXRIU0woaHVlLCBzYXR1cmF0aW9uLCBsaWdo dG5lc3MpOworCisgICAgRVhQRUNUX0RPVUJMRV9FUSgwLCBodWUpOworICAgIEVYUEVDVF9ET1VC TEVfRVEoMCwgc2F0dXJhdGlvbik7CisgICAgRVhQRUNUX0RPVUJMRV9FUSgwLCBsaWdodG5lc3Mp OworfQorCitURVNUKENvbG9yLCBSR0JUb0hTTF9SZWQpCit7CisgICAgQ29sb3IgY29sb3IoMjU1 LCAwLCAwKTsKKworICAgIGRvdWJsZSBodWUsIHNhdHVyYXRpb24sIGxpZ2h0bmVzczsKKyAgICBj b2xvci5nZXRIU0woaHVlLCBzYXR1cmF0aW9uLCBsaWdodG5lc3MpOworCisgICAgRVhQRUNUX0RP VUJMRV9FUSgwLCBodWUpOworICAgIEVYUEVDVF9ET1VCTEVfRVEoMSwgc2F0dXJhdGlvbik7Cisg ICAgRVhQRUNUX0RPVUJMRV9FUSgwLjUsIGxpZ2h0bmVzcyk7Cit9CisKK1RFU1QoQ29sb3IsIFJH QlRvSFNMX0dyZWVuKQoreworICAgIENvbG9yIGNvbG9yKDAsIDI1NSwgMCk7CisKKyAgICBkb3Vi bGUgaHVlLCBzYXR1cmF0aW9uLCBsaWdodG5lc3M7CisgICAgY29sb3IuZ2V0SFNMKGh1ZSwgc2F0 dXJhdGlvbiwgbGlnaHRuZXNzKTsKKworICAgIEVYUEVDVF9ET1VCTEVfRVEoMiwgaHVlKTsKKyAg ICBFWFBFQ1RfRE9VQkxFX0VRKDEsIHNhdHVyYXRpb24pOworICAgIEVYUEVDVF9ET1VCTEVfRVEo MC41LCBsaWdodG5lc3MpOworfQorCitURVNUKENvbG9yLCBSR0JUb0hTTF9CbHVlKQoreworICAg IENvbG9yIGNvbG9yKDAsIDAsIDI1NSk7CisKKyAgICBkb3VibGUgaHVlLCBzYXR1cmF0aW9uLCBs aWdodG5lc3M7CisgICAgY29sb3IuZ2V0SFNMKGh1ZSwgc2F0dXJhdGlvbiwgbGlnaHRuZXNzKTsK KworICAgIEVYUEVDVF9ET1VCTEVfRVEoNCwgaHVlKTsKKyAgICBFWFBFQ1RfRE9VQkxFX0VRKDEs IHNhdHVyYXRpb24pOworICAgIEVYUEVDVF9ET1VCTEVfRVEoMC41LCBsaWdodG5lc3MpOworfQor CitURVNUKENvbG9yLCBSR0JUb0hTTF9EYXJrR3JheSkKK3sKKyAgICBDb2xvciBjb2xvciA9IENv bG9yOjpkYXJrR3JheTsKKworICAgIGRvdWJsZSBodWUsIHNhdHVyYXRpb24sIGxpZ2h0bmVzczsK KyAgICBjb2xvci5nZXRIU0woaHVlLCBzYXR1cmF0aW9uLCBsaWdodG5lc3MpOworCisgICAgRVhQ RUNUX0RPVUJMRV9FUSgwLCBodWUpOworICAgIEVYUEVDVF9ET1VCTEVfRVEoMCwgc2F0dXJhdGlv bik7CisgICAgRVhQRUNUX0RPVUJMRV9FUSgwLjUwMTk2MDc4NDMxMzcyNTQ4LCBsaWdodG5lc3Mp OworfQorCitURVNUKENvbG9yLCBSR0JUb0hTTF9HcmF5KQoreworICAgIENvbG9yIGNvbG9yID0g Q29sb3I6OmdyYXk7CisKKyAgICBkb3VibGUgaHVlLCBzYXR1cmF0aW9uLCBsaWdodG5lc3M7Cisg ICAgY29sb3IuZ2V0SFNMKGh1ZSwgc2F0dXJhdGlvbiwgbGlnaHRuZXNzKTsKKworICAgIEVYUEVD VF9ET1VCTEVfRVEoMCwgaHVlKTsKKyAgICBFWFBFQ1RfRE9VQkxFX0VRKDAsIHNhdHVyYXRpb24p OworICAgIEVYUEVDVF9ET1VCTEVfRVEoMC42Mjc0NTA5ODAzOTIxNTY4NSwgbGlnaHRuZXNzKTsK K30KKworVEVTVChDb2xvciwgUkdCVG9IU0xfTGlnaHRHcmF5KQoreworICAgIENvbG9yIGNvbG9y ID0gQ29sb3I6OmxpZ2h0R3JheTsKKworICAgIGRvdWJsZSBodWUsIHNhdHVyYXRpb24sIGxpZ2h0 bmVzczsKKyAgICBjb2xvci5nZXRIU0woaHVlLCBzYXR1cmF0aW9uLCBsaWdodG5lc3MpOworCisg ICAgRVhQRUNUX0RPVUJMRV9FUSgwLCBodWUpOworICAgIEVYUEVDVF9ET1VCTEVfRVEoMCwgc2F0 dXJhdGlvbik7CisgICAgRVhQRUNUX0RPVUJMRV9FUSgwLjc1Mjk0MTE3NjQ3MDU4ODIyLCBsaWdo dG5lc3MpOworfQorCiBURVNUKENvbG9yLCBWYWxpZGl0eSkKIHsKICAgICBDb2xvciBpbnZhbGlk Q29sb3I7Cg==