57773 2011-04-04 11:59:28 -0700 Add a fast path for simple color backgrounds 2011-04-05 17:53:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser mdelaney7 simon.fraser oldest_to_newest 378936 0 simon.fraser 2011-04-04 11:59:28 -0700 We currently render rounded-corner color backgrounds via setting a clipping path and then filling the rect. This is slow in CG; it's better to just create a path for the rounded rect and fill it. 378946 1 88094 simon.fraser 2011-04-04 12:13:13 -0700 Created attachment 88094 Patch 379836 2 simon.fraser 2011-04-05 13:32:56 -0700 http://trac.webkit.org/changeset/82969 380005 3 simon.fraser 2011-04-05 17:53:38 -0700 <rdar://problem/9042985> 88094 2011-04-04 12:13:13 -0700 2011-04-04 15:15:29 -0700 Patch bug-57773-20110404121312.patch text/plain 8215 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlOGM5ZWU4MzI5N2M4YTE0 Yzc3ODQ1ODJhYWYxOWVhMjY0MTYzODY1Li43ZDRlYTQxZTU5M2QxN2VhY2I5NDQyMjEwZGFkMTRm OGM4ZGFjMGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMDQgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgZmFzdCBwYXRoIGZvciBzaW1wbGUgY29s b3IgYmFja2dyb3VuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU3NzczCisKKyAgICAgICAgQWRkIGEgZmFzdCBwYXRoIGZvciBkcmF3aW5nIHNpbXBs ZSBjb2xvciBiYWNrZ3JvdW5kcy4gSXQncworICAgICAgICBmYXN0ZXIgdG8gZmlsbCBhIHBhdGgg b3IgcmVjdCB0aGFuIGl0IGlzIHRvIHNldCB1cCBhIGNsaXAsCisgICAgICAgIGFuZCB0aGVuIHBh aW50IHRoZSByZWN0LgorICAgICAgICAKKyAgICAgICAgTm8gdmlzaWJsZSBiZWhhdmlvciBjaGFu Z2Ugc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVs T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWlu dEZpbGxMYXllckV4dGVuZGVkKToKKwogMjAxMS0wNC0wNCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1 cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAK aW5kZXggNzI4ZDUwZGIzMWIzMTZhY2ZkNTdkOGMxMzhhZGZjYTMxMzFjYWRkNy4uYzAzMDliZDFh NTllNTZjMDhkMzZlZTFiY2MzY2UxYzk5NDM2YjA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC01NTksNyArNTU5LDcgQEAg aW50IFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWRkaW5nRW5kKGJvb2wpIGNvbnN0CiAgICAgcmV0 dXJuIHBhZGRpbmcuY2FsY01pblZhbHVlKHcpOwogfQogCi12b2lkIFJlbmRlckJveE1vZGVsT2Jq ZWN0OjpwYWludEZpbGxMYXllckV4dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBj b25zdCBDb2xvciYgYywgY29uc3QgRmlsbExheWVyKiBiZ0xheWVyLCBpbnQgdHgsIGludCB0eSwg aW50IHcsIGludCBoLCBJbmxpbmVGbG93Qm94KiBib3gsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBS ZW5kZXJPYmplY3QqIGJhY2tncm91bmRPYmplY3QpCit2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0 OjpwYWludEZpbGxMYXllckV4dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBDb2xvciYgY29sb3IsIGNvbnN0IEZpbGxMYXllciogYmdMYXllciwgaW50IHR4LCBpbnQgdHks IGludCB3LCBpbnQgaCwgSW5saW5lRmxvd0JveCogYm94LCBDb21wb3NpdGVPcGVyYXRvciBvcCwg UmVuZGVyT2JqZWN0KiBiYWNrZ3JvdW5kT2JqZWN0KQogewogICAgIEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCA9IHBhaW50SW5mby5jb250ZXh0OwogICAgIGlmIChjb250ZXh0LT5wYWludGluZ0Rp c2FibGVkKCkpCkBAIC01NjcsMTMgKzU2Nyw1NCBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0 OjpwYWludEZpbGxMYXllckV4dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwog CiAgICAgYm9vbCBpbmNsdWRlTGVmdEVkZ2UgPSBib3ggPyBib3gtPmluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UoKSA6IHRydWU7CiAgICAgYm9vbCBpbmNsdWRlUmlnaHRFZGdlID0gYm94ID8gYm94LT5p bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSgpIDogdHJ1ZTsKLSAgICBpbnQgYkxlZnQgPSBpbmNsdWRl TGVmdEVkZ2UgPyBib3JkZXJMZWZ0KCkgOiAwOwotICAgIGludCBiUmlnaHQgPSBpbmNsdWRlUmln aHRFZGdlID8gYm9yZGVyUmlnaHQoKSA6IDA7Ci0gICAgaW50IHBMZWZ0ID0gaW5jbHVkZUxlZnRF ZGdlID8gcGFkZGluZ0xlZnQoKSA6IDA7Ci0gICAgaW50IHBSaWdodCA9IGluY2x1ZGVSaWdodEVk Z2UgPyBwYWRkaW5nUmlnaHQoKSA6IDA7CisKKyAgICBib29sIGhhc1JvdW5kZWRCb3JkZXIgPSBz dHlsZSgpLT5oYXNCb3JkZXJSYWRpdXMoKSAmJiAoaW5jbHVkZUxlZnRFZGdlIHx8IGluY2x1ZGVS aWdodEVkZ2UpOworICAgIGJvb2wgY2xpcHBlZFdpdGhMb2NhbFNjcm9sbGluZyA9IGhhc092ZXJm bG93Q2xpcCgpICYmIGJnTGF5ZXItPmF0dGFjaG1lbnQoKSA9PSBMb2NhbEJhY2tncm91bmRBdHRh Y2htZW50OworICAgIGJvb2wgaXNCb3JkZXJGaWxsID0gYmdMYXllci0+Y2xpcCgpID09IEJvcmRl ckZpbGxCb3g7CisgICAgYm9vbCBpc1Jvb3QgPSB0aGlzLT5pc1Jvb3QoKTsKKworICAgIENvbG9y IGJnQ29sb3IgPSBjb2xvcjsKKyAgICBTdHlsZUltYWdlKiBiZ0ltYWdlID0gYmdMYXllci0+aW1h Z2UoKTsKKyAgICBib29sIHNob3VsZFBhaW50QmFja2dyb3VuZEltYWdlID0gYmdJbWFnZSAmJiBi Z0ltYWdlLT5jYW5SZW5kZXIoc3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKTsKKyAgICAKKyAgICAv LyBXaGVuIHRoaXMgc3R5bGUgZmxhZyBpcyBzZXQsIGNoYW5nZSBleGlzdGluZyBiYWNrZ3JvdW5k IGNvbG9ycyBhbmQgaW1hZ2VzIHRvIGEgc29saWQgd2hpdGUgYmFja2dyb3VuZC4KKyAgICAvLyBJ ZiB0aGVyZSdzIG5vIGJnIGNvbG9yIG9yIGltYWdlLCBsZWF2ZSBpdCB1bnRvdWNoZWQgdG8gYXZv aWQgYWZmZWN0aW5nIHRyYW5zcGFyZW5jeS4KKyAgICAvLyBXZSBkb24ndCB0cnkgdG8gYXZvaWQg bG9hZGluZyB0aGUgYmFja2dyb3VuZCBpbWFnZXMsIGJlY2F1c2UgdGhpcyBzdHlsZSBmbGFnIGlz IG9ubHkgc2V0CisgICAgLy8gd2hlbiBwcmludGluZywgYW5kIGF0IHRoYXQgcG9pbnQgd2UndmUg YWxyZWFkeSBsb2FkZWQgdGhlIGJhY2tncm91bmQgaW1hZ2VzIGFueXdheS4gKFRvIGF2b2lkCisg ICAgLy8gbG9hZGluZyB0aGUgYmFja2dyb3VuZCBpbWFnZXMgd2UnZCBoYXZlIHRvIGRvIHRoaXMg Y2hlY2sgd2hlbiBhcHBseWluZyBzdHlsZXMgcmF0aGVyIHRoYW4KKyAgICAvLyB3aGlsZSByZW5k ZXJpbmcuKQorICAgIGlmIChzdHlsZSgpLT5mb3JjZUJhY2tncm91bmRzVG9XaGl0ZSgpKSB7Cisg ICAgICAgIC8vIE5vdGUgdGhhdCB3ZSBjYW4ndCByZXVzZSB0aGlzIHZhcmlhYmxlIGJlbG93IGJl Y2F1c2UgdGhlIGJnQ29sb3IgbWlnaHQgYmUgY2hhbmdlZAorICAgICAgICBib29sIHNob3VsZFBh aW50QmFja2dyb3VuZENvbG9yID0gIWJnTGF5ZXItPm5leHQoKSAmJiBiZ0NvbG9yLmlzVmFsaWQo KSAmJiBiZ0NvbG9yLmFscGhhKCkgPiAwOworICAgICAgICBpZiAoc2hvdWxkUGFpbnRCYWNrZ3Jv dW5kSW1hZ2UgfHwgc2hvdWxkUGFpbnRCYWNrZ3JvdW5kQ29sb3IpIHsKKyAgICAgICAgICAgIGJn Q29sb3IgPSBDb2xvcjo6d2hpdGU7CisgICAgICAgICAgICBzaG91bGRQYWludEJhY2tncm91bmRJ bWFnZSA9IGZhbHNlOworICAgICAgICB9CisgICAgfQorCisgICAgYm9vbCBjb2xvclZpc2libGUg PSBiZ0NvbG9yLmlzVmFsaWQoKSAmJiBiZ0NvbG9yLmFscGhhKCkgPiAwOworICAgIAorICAgIC8v IEZhc3QgcGF0aCBmb3IgZHJhd2luZyBzaW1wbGUgY29sb3IgYmFja2dyb3VuZHMuCisgICAgaWYg KCFpc1Jvb3QgJiYgIWNsaXBwZWRXaXRoTG9jYWxTY3JvbGxpbmcgJiYgIXNob3VsZFBhaW50QmFj a2dyb3VuZEltYWdlICYmIGlzQm9yZGVyRmlsbCkgeworICAgICAgICBpZiAoIWNvbG9yVmlzaWJs ZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBJbnRSZWN0IGJvcmRlclJlY3QodHgs IHR5LCB3LCBoKTsKKyAgICAgICAgaWYgKGJvcmRlclJlY3QuaXNFbXB0eSgpKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIGlmIChoYXNSb3VuZGVkQm9yZGVyKSB7CisgICAgICAgICAg ICBSb3VuZGVkSW50UmVjdCBib3JkZXIgPSBzdHlsZSgpLT5nZXRSb3VuZGVkQm9yZGVyRm9yKGJv cmRlclJlY3QpOworICAgICAgICAgICAgYm9yZGVyLmV4Y2x1ZGVMb2dpY2FsRWRnZXMoYm94ICYm IGJveC0+aXNIb3Jpem9udGFsKCksICFpbmNsdWRlTGVmdEVkZ2UsICFpbmNsdWRlUmlnaHRFZGdl KTsKKyAgICAgICAgICAgIGNvbnRleHQtPmZpbGxSb3VuZGVkUmVjdChib3JkZXIsIGJnQ29sb3Is IHN0eWxlKCktPmNvbG9yU3BhY2UoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgY29u dGV4dC0+ZmlsbFJlY3QoYm9yZGVyUmVjdCwgYmdDb2xvciwgc3R5bGUoKS0+Y29sb3JTcGFjZSgp KTsKKyAgICAgICAgCisgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBib29sIGNsaXBwZWRU b0JvcmRlclJhZGl1cyA9IGZhbHNlOwotICAgIGlmIChzdHlsZSgpLT5oYXNCb3JkZXJSYWRpdXMo KSAmJiAoaW5jbHVkZUxlZnRFZGdlIHx8IGluY2x1ZGVSaWdodEVkZ2UpKSB7CisgICAgaWYgKGhh c1JvdW5kZWRCb3JkZXIpIHsKICAgICAgICAgSW50UmVjdCBib3JkZXJSZWN0KHR4LCB0eSwgdywg aCk7CiAKICAgICAgICAgaWYgKGJvcmRlclJlY3QuaXNFbXB0eSgpKQpAQCAtNTg2LDggKzYyNywx MiBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEZpbGxMYXllckV4dGVuZGVkKGNv bnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwogICAgICAgICBjb250ZXh0LT5hZGRSb3VuZGVk UmVjdENsaXAoYm9yZGVyKTsKICAgICAgICAgY2xpcHBlZFRvQm9yZGVyUmFkaXVzID0gdHJ1ZTsK ICAgICB9CisgICAgCisgICAgaW50IGJMZWZ0ID0gaW5jbHVkZUxlZnRFZGdlID8gYm9yZGVyTGVm dCgpIDogMDsKKyAgICBpbnQgYlJpZ2h0ID0gaW5jbHVkZVJpZ2h0RWRnZSA/IGJvcmRlclJpZ2h0 KCkgOiAwOworICAgIGludCBwTGVmdCA9IGluY2x1ZGVMZWZ0RWRnZSA/IHBhZGRpbmdMZWZ0KCkg OiAwOworICAgIGludCBwUmlnaHQgPSBpbmNsdWRlUmlnaHRFZGdlID8gcGFkZGluZ1JpZ2h0KCkg OiAwOwogCi0gICAgYm9vbCBjbGlwcGVkV2l0aExvY2FsU2Nyb2xsaW5nID0gaGFzT3ZlcmZsb3dD bGlwKCkgJiYgYmdMYXllci0+YXR0YWNobWVudCgpID09IExvY2FsQmFja2dyb3VuZEF0dGFjaG1l bnQ7CiAgICAgaWYgKGNsaXBwZWRXaXRoTG9jYWxTY3JvbGxpbmcpIHsKICAgICAgICAgLy8gQ2xp cCB0byB0aGUgb3ZlcmZsb3cgYXJlYS4KICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwpAQCAtNjQy LDI3ICs2ODcsNiBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEZpbGxMYXllckV4 dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwogICAgICAgICBjb250ZXh0LT5j bGlwVG9JbWFnZUJ1ZmZlcihtYXNrSW1hZ2UuZ2V0KCksIG1hc2tSZWN0KTsKICAgICB9CiAgICAg Ci0gICAgU3R5bGVJbWFnZSogYmcgPSBiZ0xheWVyLT5pbWFnZSgpOwotICAgIGJvb2wgc2hvdWxk UGFpbnRCYWNrZ3JvdW5kSW1hZ2UgPSBiZyAmJiBiZy0+Y2FuUmVuZGVyKHN0eWxlKCktPmVmZmVj dGl2ZVpvb20oKSk7Ci0gICAgQ29sb3IgYmdDb2xvciA9IGM7Ci0KLSAgICAvLyBXaGVuIHRoaXMg c3R5bGUgZmxhZyBpcyBzZXQsIGNoYW5nZSBleGlzdGluZyBiYWNrZ3JvdW5kIGNvbG9ycyBhbmQg aW1hZ2VzIHRvIGEgc29saWQgd2hpdGUgYmFja2dyb3VuZC4KLSAgICAvLyBJZiB0aGVyZSdzIG5v IGJnIGNvbG9yIG9yIGltYWdlLCBsZWF2ZSBpdCB1bnRvdWNoZWQgdG8gYXZvaWQgYWZmZWN0aW5n IHRyYW5zcGFyZW5jeS4KLSAgICAvLyBXZSBkb24ndCB0cnkgdG8gYXZvaWQgbG9hZGluZyB0aGUg YmFja2dyb3VuZCBpbWFnZXMsIGJlY2F1c2UgdGhpcyBzdHlsZSBmbGFnIGlzIG9ubHkgc2V0Ci0g ICAgLy8gd2hlbiBwcmludGluZywgYW5kIGF0IHRoYXQgcG9pbnQgd2UndmUgYWxyZWFkeSBsb2Fk ZWQgdGhlIGJhY2tncm91bmQgaW1hZ2VzIGFueXdheS4gKFRvIGF2b2lkCi0gICAgLy8gbG9hZGlu ZyB0aGUgYmFja2dyb3VuZCBpbWFnZXMgd2UnZCBoYXZlIHRvIGRvIHRoaXMgY2hlY2sgd2hlbiBh cHBseWluZyBzdHlsZXMgcmF0aGVyIHRoYW4KLSAgICAvLyB3aGlsZSByZW5kZXJpbmcuKQotICAg IGlmIChzdHlsZSgpLT5mb3JjZUJhY2tncm91bmRzVG9XaGl0ZSgpKSB7Ci0gICAgICAgIC8vIE5v dGUgdGhhdCB3ZSBjYW4ndCByZXVzZSB0aGlzIHZhcmlhYmxlIGJlbG93IGJlY2F1c2UgdGhlIGJn Q29sb3IgbWlnaHQgYmUgY2hhbmdlZAotICAgICAgICBib29sIHNob3VsZFBhaW50QmFja2dyb3Vu ZENvbG9yID0gIWJnTGF5ZXItPm5leHQoKSAmJiBiZ0NvbG9yLmlzVmFsaWQoKSAmJiBiZ0NvbG9y LmFscGhhKCkgPiAwOwotICAgICAgICBpZiAoc2hvdWxkUGFpbnRCYWNrZ3JvdW5kSW1hZ2UgfHwg c2hvdWxkUGFpbnRCYWNrZ3JvdW5kQ29sb3IpIHsKLSAgICAgICAgICAgIGJnQ29sb3IgPSBDb2xv cjo6d2hpdGU7Ci0gICAgICAgICAgICBzaG91bGRQYWludEJhY2tncm91bmRJbWFnZSA9IGZhbHNl OwotICAgICAgICB9Ci0gICAgfQotCi0gICAgYm9vbCBpc1Jvb3QgPSB0aGlzLT5pc1Jvb3QoKTsK LQogICAgIC8vIE9ubHkgZmlsbCB3aXRoIGEgYmFzZSBjb2xvciAoZS5nLiwgd2hpdGUpIGlmIHdl J3JlIHRoZSByb290IGRvY3VtZW50LCBzaW5jZSBpZnJhbWVzL2ZyYW1lcyB3aXRoCiAgICAgLy8g bm8gYmFja2dyb3VuZCBpbiB0aGUgY2hpbGQgZG9jdW1lbnQgc2hvdWxkIHNob3cgdGhlIHBhcmVu dCdzIGJhY2tncm91bmQuCiAgICAgYm9vbCBpc09wYXF1ZVJvb3QgPSBmYWxzZTsKQEAgLTcyNywx OCArNzUxLDE2IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0 ZW5kZWQoY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvCiAgICAgICAgICAgICBwaGFzZSAr PSBkZXN0UmVjdC5sb2NhdGlvbigpIC0gZGVzdE9yaWdpbjsKICAgICAgICAgICAgIENvbXBvc2l0 ZU9wZXJhdG9yIGNvbXBvc2l0ZU9wID0gb3AgPT0gQ29tcG9zaXRlU291cmNlT3ZlciA/IGJnTGF5 ZXItPmNvbXBvc2l0ZSgpIDogb3A7CiAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIGNsaWVudEZv ckJhY2tncm91bmRJbWFnZSA9IGJhY2tncm91bmRPYmplY3QgPyBiYWNrZ3JvdW5kT2JqZWN0IDog dGhpczsKLSAgICAgICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBiZy0+aW1hZ2UoY2xpZW50 Rm9yQmFja2dyb3VuZEltYWdlLCB0aWxlU2l6ZSk7CisgICAgICAgICAgICBSZWZQdHI8SW1hZ2U+ IGltYWdlID0gYmdJbWFnZS0+aW1hZ2UoY2xpZW50Rm9yQmFja2dyb3VuZEltYWdlLCB0aWxlU2l6 ZSk7CiAgICAgICAgICAgICBib29sIHVzZUxvd1F1YWxpdHlTY2FsaW5nID0gc2hvdWxkUGFpbnRB dExvd1F1YWxpdHkoY29udGV4dCwgaW1hZ2UuZ2V0KCksIGJnTGF5ZXIsIHRpbGVTaXplKTsKICAg ICAgICAgICAgIGNvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBzdHlsZSgpLT5j b2xvclNwYWNlKCksIGRlc3RSZWN0LCBwaGFzZSwgdGlsZVNpemUsIGNvbXBvc2l0ZU9wLCB1c2VM b3dRdWFsaXR5U2NhbGluZyk7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoYmdMYXllci0+ Y2xpcCgpICE9IEJvcmRlckZpbGxCb3gpCi0gICAgICAgIC8vIFVuZG8gdGhlIGJhY2tncm91bmQg Y2xpcAorICAgIGlmICghaXNCb3JkZXJGaWxsKSAvLyBVbmRvIHRoZSBiYWNrZ3JvdW5kIGNsaXAK ICAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwogCi0gICAgaWYgKGNsaXBwZWRUb0JvcmRlclJh ZGl1cykKLSAgICAgICAgLy8gVW5kbyB0aGUgYm9yZGVyIHJhZGl1cyBjbGlwCisgICAgaWYgKGNs aXBwZWRUb0JvcmRlclJhZGl1cykgLy8gVW5kbyB0aGUgYm9yZGVyIHJhZGl1cyBjbGlwCiAgICAg ICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKICAgICAgICAgCiAgICAgaWYgKGNsaXBwZWRXaXRoTG9j YWxTY3JvbGxpbmcpIC8vIFVuZG8gdGhlIGNsaXAgZm9yIGxvY2FsIGJhY2tncm91bmQgYXR0YWNo bWVudHMuCg==