167943 2017-02-07 09:48:13 -0800 [GTK] Handle extended colors in cairo and texture mapper backends 2017-02-07 22:42:55 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Cairo, Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply cmarcelo commit-queue kondapallykalyan luiz noam oldest_to_newest 1274033 0 cgarcia 2017-02-07 09:48:13 -0800 It will fix all css3/color tests. 1274034 1 300816 cgarcia 2017-02-07 09:51:50 -0800 Created attachment 300816 Patch 1274273 2 cgarcia 2017-02-07 22:42:55 -0800 Committed r211853: <http://trac.webkit.org/changeset/211853> 300816 2017-02-07 09:51:50 -0800 2017-02-07 15:04:52 -0800 Patch wk-extended-colors.diff text/plain 9130 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOTgwZmIxNjAxYi4uOWQ1YzAzNGM1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNCBAQAogMjAxNy0wMi0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gSGFuZGxlIGV4dGVuZGVkIGNvbG9ycyBpbiBjYWly byBhbmQgdGV4dHVyZSBtYXBwZXIgYmFja2VuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Nzk0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeGVzOiBjc3MzL2NvbG9yL2JhY2tncm91bmRzLWFuZC1i b3JkZXJzLmh0bWwKKyAgICAgICAgICAgICAgIGNzczMvY29sb3IvYm94LXNoYWRvd3MuaHRtbAor ICAgICAgICAgICAgICAgY3NzMy9jb2xvci9jYW52YXMuaHRtbAorICAgICAgICAgICAgICAgY3Nz My9jb2xvci9jb21wb3NpdGVkLXNvbGlkLWJhY2tncm91bmRzLmh0bWwKKyAgICAgICAgICAgICAg IGNzczMvY29sb3IvdGV4dC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Db2xv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVtdWx0aXBsaWVkQVJHQkZyb21Db2xvcik6IEhh bmRsZSB0aGUgY2FzZSBvZiBjb2xvciBiZWluZyBleHRlbmRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9DYWlyb1V0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpz ZXRTb3VyY2VSR0JBRnJvbUNvbG9yKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zmls bFJlY3RXaXRoQ29sb3IpOiBVc2UgaXNWaXNpYmxlKCkgaW5zdGVhZCBvZiBhbHBoYSgpLgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3RWxsaXBzZSk6IERpdHRvLgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9Db2xvckd0ay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb2xvcjo6b3BlcmF0b3IgR2RrUkdCQSk6IEhhbmRsZSB0aGUgY2FzZSBvZiBjb2xvciBi ZWluZyBleHRlbmRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6ZHJhd051 bWJlcik6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YmxlbmRXaXRoT3BhY2l0eSk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGYpOiBV c2UgaXNWaXNpYmxlKCkgaW5zdGVhZCBvZiBhbHBoYSgpLgorICAgICAgICAoV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMpOiBEaXR0by4KKworMjAxNy0w Mi0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAg ICAgUkVHUkVTU0lPTihyMjEwNzQwKTogW0dUS10gMi4xNSBicm9rZSBlbWJlZGRlZCB2aWRlb3Mg aW4gR05PTUUncyB5ZWxwIGFwcAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY3ODg3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0NvbG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Nv bG9yLmNwcAppbmRleCBmYTU2N2NjNzU2Yy4uNGM4NzA1ZTBhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKQEAgLTYxNiwxNSArNjE2LDE2IEBAIENvbG9y IGNvbG9yRnJvbVByZW11bHRpcGxpZWRBUkdCKFJHQkEzMiBwaXhlbENvbG9yKQogCiBSR0JBMzIg cHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogewotICAgIHVu c2lnbmVkIHBpeGVsQ29sb3I7CisgICAgaWYgKGNvbG9yLmlzT3BhcXVlKCkpIHsKKyAgICAgICAg aWYgKGNvbG9yLmlzRXh0ZW5kZWQoKSkKKyAgICAgICAgICAgIHJldHVybiBtYWtlUkdCKGNvbG9y LmFzRXh0ZW5kZWQoKS5yZWQoKSAqIDI1NSwgY29sb3IuYXNFeHRlbmRlZCgpLmdyZWVuKCkgKiAy NTUsIGNvbG9yLmFzRXh0ZW5kZWQoKS5ibHVlKCkgKiAyNTUpOworICAgICAgICByZXR1cm4gY29s b3IucmdiKCk7CisgICAgfQogCi0gICAgdW5zaWduZWQgYWxwaGEgPSBjb2xvci5hbHBoYSgpOwot ICAgIGlmIChhbHBoYSA8IDI1NSkKLSAgICAgICAgcGl4ZWxDb2xvciA9IG1ha2VQcmVtdWx0aXBs aWVkUkdCQShjb2xvci5yZWQoKSwgY29sb3IuZ3JlZW4oKSwgY29sb3IuYmx1ZSgpLCBhbHBoYSk7 Ci0gICAgZWxzZQotICAgICAgICBwaXhlbENvbG9yID0gY29sb3IucmdiKCk7CisgICAgaWYgKGNv bG9yLmlzRXh0ZW5kZWQoKSkKKyAgICAgICAgcmV0dXJuIG1ha2VQcmVtdWx0aXBsaWVkUkdCQShj b2xvci5hc0V4dGVuZGVkKCkucmVkKCkgKiAyNTUsIGNvbG9yLmFzRXh0ZW5kZWQoKS5ncmVlbigp ICogMjU1LCBjb2xvci5hc0V4dGVuZGVkKCkuYmx1ZSgpICogMjU1LCBjb2xvci5hc0V4dGVuZGVk KCkuYWxwaGEoKSAqIDI1NSk7CiAKLSAgICByZXR1cm4gcGl4ZWxDb2xvcjsKKyAgICByZXR1cm4g bWFrZVByZW11bHRpcGxpZWRSR0JBKGNvbG9yLnJlZCgpLCBjb2xvci5ncmVlbigpLCBjb2xvci5i bHVlKCksIGNvbG9yLmFscGhhKCkpOwogfQogCiBDb2xvciBibGVuZChjb25zdCBDb2xvciYgZnJv bSwgY29uc3QgQ29sb3ImIHRvLCBkb3VibGUgcHJvZ3Jlc3MsIGJvb2wgYmxlbmRQcmVtdWx0aXBs aWVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v Q2Fpcm9VdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vQ2Fpcm9VdGlsaXRpZXMuY3BwCmluZGV4IDE1ZThmZmNmYjFiLi5mYzQ4NTg5NDAxNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9VdGls aXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Nh aXJvVXRpbGl0aWVzLmNwcApAQCAtNjYsOSArNjYsMTMgQEAgdm9pZCBjb3B5Q29udGV4dFByb3Bl cnRpZXMoY2Fpcm9fdCogc3JjQ3IsIGNhaXJvX3QqIGRzdENyKQogCiB2b2lkIHNldFNvdXJjZVJH QkFGcm9tQ29sb3IoY2Fpcm9fdCogY29udGV4dCwgY29uc3QgQ29sb3ImIGNvbG9yKQogewotICAg IGZsb2F0IHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhOwotICAgIGNvbG9yLmdldFJHQkEocmVkLCBn cmVlbiwgYmx1ZSwgYWxwaGEpOwotICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiYShjb250ZXh0LCBy ZWQsIGdyZWVuLCBibHVlLCBhbHBoYSk7CisgICAgaWYgKGNvbG9yLmlzRXh0ZW5kZWQoKSkKKyAg ICAgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2JhKGNvbnRleHQsIGNvbG9yLmFzRXh0ZW5kZWQoKS5y ZWQoKSwgY29sb3IuYXNFeHRlbmRlZCgpLmdyZWVuKCksIGNvbG9yLmFzRXh0ZW5kZWQoKS5ibHVl KCksIGNvbG9yLmFzRXh0ZW5kZWQoKS5hbHBoYSgpKTsKKyAgICBlbHNlIHsKKyAgICAgICAgZmxv YXQgcmVkLCBncmVlbiwgYmx1ZSwgYWxwaGE7CisgICAgICAgIGNvbG9yLmdldFJHQkEocmVkLCBn cmVlbiwgYmx1ZSwgYWxwaGEpOworICAgICAgICBjYWlyb19zZXRfc291cmNlX3JnYmEoY29udGV4 dCwgcmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEpOworICAgIH0KIH0KIAogdm9pZCBhcHBlbmRQYXRo VG9DYWlyb0NvbnRleHQoY2Fpcm9fdCogdG8sIGNhaXJvX3QqIGZyb20pCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWly by5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHRDYWlyby5jcHAKaW5kZXggMTMyZmMwN2Q1YjIuLmY4YTMzZWMyNDUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRD YWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC03MCw4ICs3MCw5IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIC8vIEEgaGVscGVyIHdoaWNoIHF1aWNrbHkgZmlsbHMgYSByZWN0YW5nbGUgd2l0aCBhIHNp bXBsZSBjb2xvciBmaWxsLgogc3RhdGljIGlubGluZSB2b2lkIGZpbGxSZWN0V2l0aENvbG9yKGNh aXJvX3QqIGNyLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsK LSAgICBpZiAoIWNvbG9yLmFscGhhKCkgJiYgY2Fpcm9fZ2V0X29wZXJhdG9yKGNyKSA9PSBDQUlS T19PUEVSQVRPUl9PVkVSKQorICAgIGlmICghY29sb3IuaXNWaXNpYmxlKCkgJiYgY2Fpcm9fZ2V0 X29wZXJhdG9yKGNyKSA9PSBDQUlST19PUEVSQVRPUl9PVkVSKQogICAgICAgICByZXR1cm47CisK ICAgICBzZXRTb3VyY2VSR0JBRnJvbUNvbG9yKGNyLCBjb2xvcik7CiAgICAgY2Fpcm9fcmVjdGFu Z2xlKGNyLCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7 CiAgICAgY2Fpcm9fZmlsbChjcik7CkBAIC0zODcsNyArMzg4LDcgQEAgdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdFbGxpcHNlKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICBjYWlyb19hcmMo Y3IsIDAuLCAwLiwgMS4sIDAuLCAyICogcGlGbG9hdCk7CiAgICAgY2Fpcm9fcmVzdG9yZShjcik7 CiAKLSAgICBpZiAoZmlsbENvbG9yKCkuYWxwaGEoKSkgeworICAgIGlmIChmaWxsQ29sb3IoKS5p c1Zpc2libGUoKSkgewogICAgICAgICBzZXRTb3VyY2VSR0JBRnJvbUNvbG9yKGNyLCBmaWxsQ29s b3IoKSk7CiAgICAgICAgIGNhaXJvX2ZpbGxfcHJlc2VydmUoY3IpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Db2xvckd0ay5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvQ29sb3JHdGsuY3BwCmluZGV4IGFl YTM3ZjhjMWQzLi40ZDk0YTY5NDcwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3RrL0NvbG9yR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvQ29sb3JHdGsuY3BwCkBAIC00MSwxMCArNDEsMTIgQEAgQ29sb3I6OkNv bG9yKGNvbnN0IEdka1JHQkEmIGMpCiAKIENvbG9yOjpvcGVyYXRvciBHZGtSR0JBKCkgY29uc3QK IHsKKyAgICBpZiAoaXNFeHRlbmRlZCgpKQorICAgICAgICByZXR1cm4geyBhc0V4dGVuZGVkKCku cmVkKCksIGFzRXh0ZW5kZWQoKS5ncmVlbigpLCBhc0V4dGVuZGVkKCkuYmx1ZSgpLCBhc0V4dGVu ZGVkKCkuYWxwaGEoKSB9OworCiAgICAgZG91YmxlIHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhOwog ICAgIGdldFJHQkEocmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEpOwotICAgIEdka1JHQkEgcmdiYSA9 IHsgcmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEgfTsKLSAgICByZXR1cm4gcmdiYTsKKyAgICByZXR1 cm4geyByZWQsIGdyZWVuLCBibHVlLCBhbHBoYSB9OwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJHTC5jcHAKaW5kZXggMTYwMzQwNDdiNzAuLmE2M2VkY2U4NzJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckdMLmNwcApAQCAtMjQ2LDkgKzI0NiwxNSBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd051 bWJlcihpbnQgbnVtYmVyLCBjb25zdCBDb2xvciYgY29sb3IsIGNvbnN0IEZsb2F0UG9pbgogICAg IGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlKENB SVJPX0ZPUk1BVF9BUkdCMzIsIHdpZHRoLCBoZWlnaHQpOwogICAgIGNhaXJvX3QqIGNyID0gY2Fp cm9fY3JlYXRlKHN1cmZhY2UpOwogCi0gICAgZmxvYXQgciwgZywgYiwgYTsKLSAgICBjb2xvci5n ZXRSR0JBKHIsIGcsIGIsIGEpOwotICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiYShjciwgYiwgZywg ciwgYSk7IC8vIFNpbmNlIHdlIHdvbid0IHN3YXAgUitCIHdoZW4gdXBsb2FkaW5nIGEgdGV4dHVy ZSwgcGFpbnQgd2l0aCB0aGUgc3dhcHBlZCBSK0IgY29sb3IuCisgICAgLy8gU2luY2Ugd2Ugd29u J3Qgc3dhcCBSK0Igd2hlbiB1cGxvYWRpbmcgYSB0ZXh0dXJlLCBwYWludCB3aXRoIHRoZSBzd2Fw cGVkIFIrQiBjb2xvci4KKyAgICBpZiAoY29sb3IuaXNFeHRlbmRlZCgpKQorICAgICAgICBjYWly b19zZXRfc291cmNlX3JnYmEoY3IsIGNvbG9yLmFzRXh0ZW5kZWQoKS5ibHVlKCksIGNvbG9yLmFz RXh0ZW5kZWQoKS5ncmVlbigpLCBjb2xvci5hc0V4dGVuZGVkKCkucmVkKCksIGNvbG9yLmFzRXh0 ZW5kZWQoKS5hbHBoYSgpKTsKKyAgICBlbHNlIHsKKyAgICAgICAgZmxvYXQgciwgZywgYiwgYTsK KyAgICAgICAgY29sb3IuZ2V0UkdCQShyLCBnLCBiLCBhKTsKKyAgICAgICAgY2Fpcm9fc2V0X3Nv dXJjZV9yZ2JhKGNyLCBiLCBnLCByLCBhKTsKKyAgICB9CisKICAgICBjYWlyb19yZWN0YW5nbGUo Y3IsIDAsIDAsIHdpZHRoLCBoZWlnaHQpOwogICAgIGNhaXJvX2ZpbGwoY3IpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IDQ5MTBjZjBhYzdlLi5kMzljZmZjYmI3OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJMYXllci5jcHAKQEAgLTg1LDExICs4NSwxMCBAQCB2b2lkIFRleHR1cmVN YXBwZXJMYXllcjo6cGFpbnQoKQogCiBzdGF0aWMgQ29sb3IgYmxlbmRXaXRoT3BhY2l0eShjb25z dCBDb2xvciYgY29sb3IsIGZsb2F0IG9wYWNpdHkpCiB7Ci0gICAgUkdCQTMyIHJnYmEgPSBjb2xv ci5yZ2IoKTsKLSAgICAvLyBTZWUgQ29sb3I6OmdldFJHQkEoKSB0byBrbm93IGhvdyB0byBleHRy YWN0IGFscGhhIGZyb20gY29sb3IuCi0gICAgZmxvYXQgYWxwaGEgPSBhbHBoYUNoYW5uZWwocmdi YSkgLyAyNTUuOwotICAgIGZsb2F0IGVmZmVjdGl2ZUFscGhhID0gYWxwaGEgKiBvcGFjaXR5Owot ICAgIHJldHVybiBDb2xvcihjb2xvcldpdGhPdmVycmlkZUFscGhhKHJnYmEsIGVmZmVjdGl2ZUFs cGhhKSk7CisgICAgaWYgKGNvbG9yLmlzT3BhcXVlKCkgJiYgb3BhY2l0eSA9PSAxLikKKyAgICAg ICAgcmV0dXJuIGNvbG9yOworCisgICAgcmV0dXJuIGNvbG9yLmNvbG9yV2l0aEFscGhhTXVsdGlw bGllZEJ5KG9wYWNpdHkpOwogfQogCiB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZVBh dHRlcm5UcmFuc2Zvcm1JZk5lZWRlZCgpCkBAIC0xMTQsNyArMTEzLDcgQEAgdm9pZCBUZXh0dXJl TWFwcGVyTGF5ZXI6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBv cHRpb25zKQogICAgIHRyYW5zZm9ybS5tdWx0aXBseShvcHRpb25zLnRyYW5zZm9ybSk7CiAgICAg dHJhbnNmb3JtLm11bHRpcGx5KG1fY3VycmVudFRyYW5zZm9ybS5jb21iaW5lZCgpKTsKIAotICAg IGlmIChtX3N0YXRlLnNvbGlkQ29sb3IuaXNWYWxpZCgpICYmICFtX3N0YXRlLmNvbnRlbnRzUmVj dC5pc0VtcHR5KCkgJiYgbV9zdGF0ZS5zb2xpZENvbG9yLmFscGhhKCkpIHsKKyAgICBpZiAobV9z dGF0ZS5zb2xpZENvbG9yLmlzVmFsaWQoKSAmJiAhbV9zdGF0ZS5jb250ZW50c1JlY3QuaXNFbXB0 eSgpICYmIG1fc3RhdGUuc29saWRDb2xvci5pc1Zpc2libGUoKSkgewogICAgICAgICBvcHRpb25z LnRleHR1cmVNYXBwZXIuZHJhd1NvbGlkQ29sb3IobV9zdGF0ZS5jb250ZW50c1JlY3QsIHRyYW5z Zm9ybSwgYmxlbmRXaXRoT3BhY2l0eShtX3N0YXRlLnNvbGlkQ29sb3IsIG9wdGlvbnMub3BhY2l0 eSkpOwogICAgICAgICBpZiAobV9zdGF0ZS5zaG93RGVidWdCb3JkZXJzKQogICAgICAgICAgICAg b3B0aW9ucy50ZXh0dXJlTWFwcGVyLmRyYXdCb3JkZXIobV9zdGF0ZS5kZWJ1Z0JvcmRlckNvbG9y LCBtX3N0YXRlLmRlYnVnQm9yZGVyV2lkdGgsIGxheWVyUmVjdCgpLCB0cmFuc2Zvcm0pOwpAQCAt MjU2LDcgKzI1NSw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJl Z2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vCiAgICAgRmxvYXRSZWN0IGJv dW5kaW5nUmVjdDsKICAgICBpZiAobV9iYWNraW5nU3RvcmUgfHwgbV9zdGF0ZS5tYXNrc1RvQm91 bmRzIHx8IG1fc3RhdGUubWFza0xheWVyIHx8IGhhc0ZpbHRlcnMoKSkKICAgICAgICAgYm91bmRp bmdSZWN0ID0gbGF5ZXJSZWN0KCk7Ci0gICAgZWxzZSBpZiAobV9jb250ZW50c0xheWVyIHx8IG1f c3RhdGUuc29saWRDb2xvci5hbHBoYSgpKQorICAgIGVsc2UgaWYgKG1fY29udGVudHNMYXllciB8 fCBtX3N0YXRlLnNvbGlkQ29sb3IuaXNWaXNpYmxlKCkpCiAgICAgICAgIGJvdW5kaW5nUmVjdCA9 IG1fc3RhdGUuY29udGVudHNSZWN0OwogCiAgICAgaWYgKG1fY3VycmVudEZpbHRlcnMuaGFzT3V0 c2V0cygpKSB7Cg==