53742 2011-02-03 17:21:23 -0800 Paint non-composited contents in a layer 2011-02-03 17:29:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 345201 0 andersca 2011-02-03 17:21:23 -0800 Paint non-composited contents in a layer 345207 1 81154 andersca 2011-02-03 17:25:32 -0800 Created attachment 81154 Patch 345213 2 andersca 2011-02-03 17:29:55 -0800 Committed r77575: <http://trac.webkit.org/changeset/77575> 81154 2011-02-03 17:25:32 -0800 2011-02-03 17:29:24 -0800 Patch bug-53742-20110203172531.patch text/plain 8779 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NTcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTEtMDItMDMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQYWludCBub24tY29tcG9zaXRlZCBjb250ZW50cyBpbiBh IGxheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Mzc0MgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6c2V0TmVlZHNEaXNwbGF5KToKKyAg ICAgICAgQ2FsbCBMYXllclRyZWVIb3N0OjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlz cGxheUluUmVjdC4KKworICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUltcGw6OnNjcm9sbCk6 CisgICAgICAgIENhbGwgTGF5ZXJUcmVlSG9zdDo6c2Nyb2xsTm9uQ29tcG9zaXRlZENvbnRlbnRz LgorCisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6c2V0U2l6ZSk6CisgICAgICAg IENhbGwgTGF5ZXJUcmVlSG9zdDo6c2l6ZURpZENoYW5nZS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9MYXllclRyZWVIb3N0Lmg6CisgICAgICAgIEFkZCBuZXcgcHVyZSB2aXJ0dWFs IG1lbWJlciBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xh eWVyVHJlZUhvc3RNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RNYWM6Okxh eWVyVHJlZUhvc3RNYWMpOgorICAgICAgICBDcmVhdGUgdGhlIG5vbi1jb21wb3NpdGVkIGNvbnRl bnQgbGF5ZXIuCisKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6c2V0Tm9uQ29t cG9zaXRlZENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3QpOgorICAgICAgICBDYWxsIHNldE5lZWRz RGlzcGxheSBvbiB0aGUgR3JhcGhpY3NMYXllci4KKworICAgICAgICAoV2ViS2l0OjpMYXllclRy ZWVIb3N0TWFjOjpzY3JvbGxOb25Db21wb3NpdGVkQ29udGVudHMpOgorICAgICAgICBKdXN0IGNh bGwgc2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3QuCisKKyAgICAgICAg KFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6c2l6ZURpZENoYW5nZSk6CisgICAgICAgIFJlc2l6 ZSB0aGUgbGF5ZXJzIGFuZCBmbHVzaCBhbnkgY2hhbmdlcy4KKyAgICAgICAgCisgICAgICAgIChX ZWJLaXQ6OkxheWVyVHJlZUhvc3RNYWM6OnBhaW50Q29udGVudHMpOgorICAgICAgICBDYWxsIFdl YlBhZ2U6OmRyYXdSZWN0LgorCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RNYWM6OmZs dXNoUGVuZGluZ0xheWVyQ2hhbmdlc1J1bkxvb3BPYnNlcnZlckNhbGxiYWNrKToKKyAgICAgICAg TGF5IG91dCB0aGUgd2ViIHBhZ2UuCisKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1h Yzo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKToKKyAgICAgICAgQ2FsbCBzeW5jQ29tcG9zaXRp bmdTdGF0ZUZvclRoaXNMYXllck9ubHkgb24gdGhlIG5vbi1jb21wb3NpdGVkIGNvbnRlbnQgbGF5 ZXIuCisKIDIwMTEtMDItMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJKHJldmlz aW9uIDc3NTYxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdB cmVhSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDcgQEAgdm9pZCBEcmF3aW5n QXJlYUltcGw6OnNldE5lZWRzRGlzcGxheShjbwogICAgIGlmIChtX2xheWVyVHJlZUhvc3QpIHsK ICAgICAgICAgQVNTRVJUKG1fZGlydHlSZWdpb24uaXNFbXB0eSgpKTsKIAotICAgICAgICAvLyBG SVhNRTogQXNrIHRoZSBsYXllciB0cmVlIGhvc3QgdG8gcmVwYWludCBub24tY29tcG9zaXRlZCBj b250ZW50LgorICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldE5vbkNvbXBvc2l0ZWRDb250ZW50 c05lZWREaXNwbGF5SW5SZWN0KHJlY3QpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIApA QCAtOTAsNyArOTAsNyBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2Nyb2xsKGNvbnN0IEludFJl CiAgICAgICAgIEFTU0VSVChtX3Njcm9sbE9mZnNldC5pc0VtcHR5KCkpOwogICAgICAgICBBU1NF UlQobV9kaXJ0eVJlZ2lvbi5pc0VtcHR5KCkpOwogCi0gICAgICAgIC8vIEZJWE1FOiBBc2sgdGhl IGxheWVyIHRyZWUgaG9zdCB0byBkbyB0aGUgc2Nyb2xsLgorICAgICAgICBtX2xheWVyVHJlZUhv c3QtPnNjcm9sbE5vbkNvbXBvc2l0ZWRDb250ZW50cyhzY3JvbGxSZWN0LCBzY3JvbGxPZmZzZXQp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xODUsOCArMTg1LDEwIEBAIHZvaWQgRHJh d2luZ0FyZWFJbXBsOjpzZXRTaXplKGNvbnN0IEludFMKICAgICBVcGRhdGVJbmZvIHVwZGF0ZUlu Zm87CiAgICAgTGF5ZXJUcmVlQ29udGV4dCBsYXllclRyZWVDb250ZXh0OwogCi0gICAgaWYgKG1f bGF5ZXJUcmVlSG9zdCkKKyAgICBpZiAobV9sYXllclRyZWVIb3N0KSB7CisgICAgICAgIG1fbGF5 ZXJUcmVlSG9zdC0+c2l6ZURpZENoYW5nZShzaXplKTsKICAgICAgICAgbGF5ZXJUcmVlQ29udGV4 dCA9IG1fbGF5ZXJUcmVlSG9zdC0+bGF5ZXJUcmVlQ29udGV4dCgpOworICAgIH0KIAogICAgIGlm IChtX2lzUGFpbnRpbmdTdXNwZW5kZWQgfHwgbV9sYXllclRyZWVIb3N0KSB7CiAgICAgICAgIHVw ZGF0ZUluZm8udmlld1NpemUgPSBtX3dlYlBhZ2UtPnNpemUoKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAkocmV2aXNpb24g Nzc1MjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9z dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw2ICszMCw4IEBACiAjaW5jbHVkZSA8d3RmL1JlZkNv dW50ZWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIGNsYXNzIEludFJlY3Q7CisgICAg Y2xhc3MgSW50U2l6ZTsKICAgICBjbGFzcyBHcmFwaGljc0xheWVyOwogfQogCkBAIC00Nyw2ICs0 OSwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlTGF5ZXJGbHVzaCgpID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZSgpID0gMDsKIAorICAgIHZpcnR1YWwgdm9p ZCBzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheUluUmVjdChjb25zdCBXZWJDb3Jl OjpJbnRSZWN0JikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxOb25Db21wb3NpdGVkQ29u dGVudHMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgV2ViQ29yZTo6 SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNpemVEaWRDaGFu Z2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbmV3U2l6ZSkgPSAwOworICAgIAogcHJvdGVjdGVk OgogICAgIGV4cGxpY2l0IExheWVyVHJlZUhvc3QoV2ViUGFnZSopOwogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhv c3RNYWMuaAkocmV2aXNpb24gNzc1MjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDks MTAgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVMYXllckZsdXNoKCk7CiAg ICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGUoKTsKIAorICAgIHZpcnR1YWwgdm9pZCBzZXROb25D b21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheUluUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0 Jik7CisgICAgdmlydHVhbCB2b2lkIHNjcm9sbE5vbkNvbXBvc2l0ZWRDb250ZW50cyhjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3Jv bGxPZmZzZXQpOworICAgIHZpcnR1YWwgdm9pZCBzaXplRGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6 OkludFNpemUmIG5ld1NpemUpOworCiAgICAgLy8gR3JhcGhpY3NMYXllckNsaWVudAogICAgIHZp cnR1YWwgdm9pZCBub3RpZnlBbmltYXRpb25TdGFydGVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXIqLCBkb3VibGUgdGltZSk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVN5bmNSZXF1aXJl ZChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CkBAIC02OSw2ICs3Myw5IEBAIHByaXZh dGU6CiAgICAgLy8gVGhlIHJvb3QgbGF5ZXIuCiAgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXI+IG1fcm9vdExheWVyOwogCisgICAgLy8gVGhlIGxheWVyIHdoaWNoIGNvbnRhaW5zIGFs bCBub24tY29tcG9zaXRlZCBjb250ZW50LgorICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0xh eWVyPiBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXI7CisKICAgICBSZXRhaW5QdHI8V0tDQVJl bW90ZUxheWVyQ2xpZW50UmVmPiBtX3JlbW90ZUxheWVyQ2xpZW50OwogICAgIFJldGFpblB0cjxD RlJ1bkxvb3BPYnNlcnZlclJlZj4gbV9mbHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2Jz ZXJ2ZXI7CiB9OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9M YXllclRyZWVIb3N0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbQkocmV2aXNpb24gNzc1MzQpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTI4LDEyICsyOCwxNyBAQAogCiAjaW1wb3J0ICJXZWJQYWdlLmgi CiAjaW1wb3J0ICJXZWJQcm9jZXNzLmgiCisjaW1wb3J0IDxRdWFydHpDb3JlL0NBVHJhbnNhY3Rp b24uaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJhbWUuaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJhbWVW aWV3Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2V0dGlu Z3MuaD4KICNpbXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgogCitAaW50ZXJmYWNlIENB VHJhbnNhY3Rpb24gKERldGFpbHMpCisrICh2b2lkKXN5bmNocm9uaXplOworQGVuZAorCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC01OCw4ICs2Mywy MCBAQCBMYXllclRyZWVIb3N0TWFjOjpMYXllclRyZWVIb3N0TWFjKFdlYlBhCiAgICAgbV9yb290 TGF5ZXItPnNldERyYXdzQ29udGVudChmYWxzZSk7CiAgICAgbV9yb290TGF5ZXItPnNldFNpemUo d2ViUGFnZS0+c2l6ZSgpKTsKIAorICAgIFttX3Jvb3RMYXllci0+cGxhdGZvcm1MYXllcigpIHNl dEdlb21ldHJ5RmxpcHBlZDpZRVNdOworCisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVy ID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKHRoaXMpOworI2lmbmRlZiBOREVCVUcKKyAgICBtX25v bkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5hbWUoIkxheWVyVHJlZUhvc3Qgbm9uLWNvbXBv c2l0ZWQgY29udGVudCIpOworI2VuZGlmCisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVy LT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVy LT5zZXRDb250ZW50c09wYXF1ZShtX3dlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgpICYmICFtX3dl YlBhZ2UtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkpOworICAgIG1fbm9uQ29tcG9zaXRl ZENvbnRlbnRMYXllci0+c2V0U2l6ZSh3ZWJQYWdlLT5zaXplKCkpOworCisgICAgbV9yb290TGF5 ZXItPmFkZENoaWxkKG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci5nZXQoKSk7CisKICAgICAv LyBBZGQgdGhlIGFjY2VsZXJhdGVkIGxheWVyIHRyZWUgaGllcmFyY2h5LgotICAgIG1fcm9vdExh eWVyLT5hZGRDaGlsZChncmFwaGljc0xheWVyKTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50 TGF5ZXItPmFkZENoaWxkKGdyYXBoaWNzTGF5ZXIpOwogICAgIAogICAgIFdLQ0FSZW1vdGVMYXll ckNsaWVudFNldExheWVyKG1fcmVtb3RlTGF5ZXJDbGllbnQuZ2V0KCksIG1fcm9vdExheWVyLT5w bGF0Zm9ybUxheWVyKCkpOwogCkBAIC0xMTQsNiArMTMxLDI5IEBAIHZvaWQgTGF5ZXJUcmVlSG9z dE1hYzo6aW52YWxpZGF0ZSgpCiAgICAgbV9pc1ZhbGlkID0gZmFsc2U7CiB9CiAKK3ZvaWQgTGF5 ZXJUcmVlSG9zdE1hYzo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3Qo Y29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIt PnNldE5lZWRzRGlzcGxheUluUmVjdChyZWN0KTsKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsK K30KKwordm9pZCBMYXllclRyZWVIb3N0TWFjOjpzY3JvbGxOb25Db21wb3NpdGVkQ29udGVudHMo Y29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQor eworICAgIHNldE5vbkNvbXBvc2l0ZWRDb250ZW50c05lZWREaXNwbGF5SW5SZWN0KHNjcm9sbFJl Y3QpOworfQorCit2b2lkIExheWVyVHJlZUhvc3RNYWM6OnNpemVEaWRDaGFuZ2UoY29uc3QgSW50 U2l6ZSYgbmV3U2l6ZSkKK3sKKyAgICBtX3Jvb3RMYXllci0+c2V0U2l6ZShuZXdTaXplKTsKKyAg ICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldFNpemUobmV3U2l6ZSk7CisKKyAgICBz Y2hlZHVsZUxheWVyRmx1c2goKTsKKyAgICBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKTsKKwor ICAgIFtDQVRyYW5zYWN0aW9uIGZsdXNoXTsKKyAgICBbQ0FUcmFuc2FjdGlvbiBzeW5jaHJvbml6 ZV07Cit9CisKIHZvaWQgTGF5ZXJUcmVlSG9zdE1hYzo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZChj b25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgZG91YmxlIHRpbWUpCiB7CiB9CkBAIC0xMjQs NiArMTY0LDggQEAgdm9pZCBMYXllclRyZWVIb3N0TWFjOjpub3RpZnlTeW5jUmVxdWlyZQogCiB2 b2lkIExheWVyVHJlZUhvc3RNYWM6OnBhaW50Q29udGVudHMoY29uc3QgR3JhcGhpY3NMYXllciog Z3JhcGhpY3NMYXllciwgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIEdyYXBoaWNz TGF5ZXJQYWludGluZ1BoYXNlLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKIHsKKyAgICBBU1NF UlQoZ3JhcGhpY3NMYXllciA9PSBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIpOworICAgIG1f d2ViUGFnZS0+ZHJhd1JlY3QoZ3JhcGhpY3NDb250ZXh0LCBjbGlwUmVjdCk7CiB9CiAKIGJvb2wg TGF5ZXJUcmVlSG9zdE1hYzo6c2hvd0RlYnVnQm9yZGVycygpIGNvbnN0CkBAIC0xNDMsNiArMTg1 LDE0IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdE1hYzo6Zmx1c2hQZW5kaW5nTGF5ZXIKIAogdm9pZCBM YXllclRyZWVIb3N0TWFjOjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2JzZXJ2ZXJD YWxsYmFjaygpCiB7CisgICAgeworICAgICAgICBSZWZQdHI8TGF5ZXJUcmVlSG9zdE1hYz4gcHJv dGVjdCh0aGlzKTsKKyAgICAgICAgbV93ZWJQYWdlLT5sYXlvdXRJZk5lZWRlZCgpOworCisgICAg ICAgIGlmICghbV9pc1ZhbGlkKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlm ICghZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTU1 LDYgKzIwNSw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdE1hYzo6Zmx1c2hQZW5kaW5nTGF5ZXIKIGJv b2wgTGF5ZXJUcmVlSG9zdE1hYzo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkKIHsKICAgICBt X3Jvb3RMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCk7CisgICAg bV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNM YXllck9ubHkoKTsKIAogICAgIHJldHVybiBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFt ZSgpLT52aWV3KCktPnN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiB9 Cg==