128691 2014-02-12 14:21:49 -0800 Clean up code that registers scrolling layers for iOS 2014-02-12 14:29:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan sam simon.fraser thorton oldest_to_newest 980010 0 simon.fraser 2014-02-12 14:21:49 -0800 Clean up code that registers scrolling layers for iOS[A 980013 1 224007 simon.fraser 2014-02-12 14:25:51 -0800 Created attachment 224007 Patch 224007 2014-02-12 14:25:51 -0800 2014-02-12 14:29:44 -0800 Patch bug-128691-20140212142547.patch text/plain 9922 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzOTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzEzZGJiOTBjZWJiMzQ4 MTFlZjM4MTMwZDNiMWY0MjQ0ZGViZDRkZi4uNzI2M2YzMDIyMTgyMmI5MjFlYjczNjM2YzYyNGQ2 YWNlNmQwYjNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAyLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgdGhhdCByZWdpc3RlcnMgc2Nyb2xsaW5nIGxheWVycyBmb3IgaU9TG1tBCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg2OTEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYWtlIGEgY291cGxlIG9mIHNj cm9sbGluZy1sYXllciByZWdpc3RyYXRpb24gZnVuY3Rpb25zIG91dCBvZgorICAgICAgICBhICNp ZiBQTEFURk9STShJT1MpIHNlY3Rpb24sIGFuZCBoYXZlIHRoZW0gY2hlY2sgZm9yIGEgc2Nyb2xs aW5nCisgICAgICAgIGNvb3JkaW5hdG9yIGJlZm9yZSBmYWxsaW5nIGJhY2sgdG8gdGhlIG9sZGVy IGlPUyBjb2RlLgorICAgICAgICAKKyAgICAgICAgU2ltcGxpZnkgdGhlIGxvZ2ljIGluIFJlbmRl ckxheWVyQmFja2luZzo6dXBkYXRlU2Nyb2xsaW5nTGF5ZXJzKCksCisgICAgICAgIGFuZCB1bmlm eSB0aGUgY29kZSB0aGF0IHJlZ2lzdGVycyBzY3JvbGxpbmcgbGF5ZXJzIHdpdGggZWl0aGVyCisg ICAgICAgIHRoZSBjb21wb3NpdG9yIG9yIHRoZSBzY3JvbGxpbmcgY29vcmRpbmF0b3IuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KTogVGhl cmUncworICAgICAgICBubyBuZWVkIHRvIGNhbGwgc2Nyb2xsaW5nTGF5ZXJBZGRlZE9yVXBkYXRl ZCgpIGhlcmUuIFRoZXJlJ3MgYWxyZWFkeSBjb2RlCisgICAgICAgIHRoYXQgaGFuZGxlcyBzY3Jv bGxpbmcgbGF5ZXIgZ2VvbWV0cnkgY2hhbmdlcyBhZnRlciBmbHVzaGVzLgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVTY3JvbGxpbmdMYXllcnMpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp3aWxsUmVtb3ZlU2Nyb2xsaW5nTGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRBZGRTY3JvbGxpbmdMYXll cik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorCiAyMDE0 LTAyLTEwICBKZWZmcmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CiAKICAgICAgICAgQnJpbmcg dGhpcmQtcGFydHkgYXBwIGNhY2hlIGJsb2NraW5nIGJlaGF2aW9yIGluIGxpbmUgd2l0aCBwcml2 YXRlIGJyb3dzaW5nIGFwcCBjYWNoZSBibG9ja2luZyBiZWhhdmlvcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAwYmQ1ZGQ1NjA5YzYy YmY0ZWNiZDZiZGU2ODI0ZmQ4MWJiZTM1YTRlLi4yYTRlN2QzNmVjZWExNjkzMmQ0MThkNTE1Nzg1 MmEzMTlmZTU4ZWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcApAQCAtOTA4LDggKzkwOCw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5n Ojp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogICAgICAgICAvLyBTY3JvbGxpbmcgdGhl IGNvbnRlbnQgbGF5ZXIgZG9lcyBub3QgbmVlZCB0byB0cmlnZ2VyIGEgcmVwYWludC4gVGhlIG9m ZnNldCB3aWxsIGJlIGNvbXBlbnNhdGVkIGF3YXkgZHVyaW5nIHBhaW50aW5nLgogICAgICAgICAv LyBGSVhNRTogVGhlIHBhaW50IG9mZnNldCBhbmQgdGhlIHNjcm9sbCBvZmZzZXQgc2hvdWxkIHJl YWxseSBiZSBzZXBhcmF0ZSBjb25jZXB0cy4KICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xh eWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIocGFkZGluZ0JveC5sb2NhdGlvbigpIC0gSW50UG9p bnQoKSAtIHNjcm9sbE9mZnNldCwgR3JhcGhpY3NMYXllcjo6RG9udFNldE5lZWRzRGlzcGxheSk7 Ci0gICAgICAgIAotICAgICAgICBjb21wb3NpdG9yKCkuc2Nyb2xsaW5nTGF5ZXJBZGRlZE9yVXBk YXRlZCgmbV9vd25pbmdMYXllcik7CiAjZWxzZQogICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRz TGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoLXNjcm9sbE9mZnNldC53aWR0aCgpLCAtc2Ny b2xsT2Zmc2V0LmhlaWdodCgpKSk7CiAKQEAgLTEzNzksNTcgKzEzNzcsNDAgQEAgYm9vbCBSZW5k ZXJMYXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcihib29sIG5lZWRzTWFza0xheWVyKQogCiBi b29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlU2Nyb2xsaW5nTGF5ZXJzKGJvb2wgbmVlZHNT Y3JvbGxpbmdMYXllcnMpCiB7Ci0gICAgU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nv b3JkaW5hdG9yID0gc2Nyb2xsaW5nQ29vcmRpbmF0b3JGcm9tTGF5ZXIobV9vd25pbmdMYXllcik7 CisgICAgaWYgKG5lZWRzU2Nyb2xsaW5nTGF5ZXJzID09ICEhbV9zY3JvbGxpbmdMYXllcikKKyAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgYm9vbCBsYXllckNoYW5nZWQgPSBmYWxzZTsKLSAg ICBpZiAobmVlZHNTY3JvbGxpbmdMYXllcnMpIHsKLSAgICAgICAgaWYgKCFtX3Njcm9sbGluZ0xh eWVyKSB7Ci0gICAgICAgICAgICAvLyBPdXRlciBsYXllciB3aGljaCBjb3JyZXNwb25kcyB3aXRo IHRoZSBzY3JvbGwgdmlldy4KLSAgICAgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXIgPSBjcmVhdGVH cmFwaGljc0xheWVyKCJTY3JvbGxpbmcgY29udGFpbmVyIik7Ci0gICAgICAgICAgICBtX3Njcm9s bGluZ0xheWVyLT5zZXREcmF3c0NvbnRlbnQoZmFsc2UpOwotICAgICAgICAgICAgbV9zY3JvbGxp bmdMYXllci0+c2V0TWFza3NUb0JvdW5kcyh0cnVlKTsKLQotICAgICAgICAgICAgLy8gSW5uZXIg bGF5ZXIgd2hpY2ggcmVuZGVycyB0aGUgY29udGVudCB0aGF0IHNjcm9sbHMuCi0gICAgICAgICAg ICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXIgPSBjcmVhdGVHcmFwaGljc0xheWVyKCJTY3JvbGxl ZCBDb250ZW50cyIpOwotICAgICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXRE cmF3c0NvbnRlbnQodHJ1ZSk7Ci0gICAgICAgICAgICBHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFz ZSBwYWludFBoYXNlID0gR3JhcGhpY3NMYXllclBhaW50T3ZlcmZsb3dDb250ZW50cyB8IEdyYXBo aWNzTGF5ZXJQYWludENvbXBvc2l0ZWRTY3JvbGw7Ci0gICAgICAgICAgICBpZiAoIW1fZm9yZWdy b3VuZExheWVyKQotICAgICAgICAgICAgICAgIHBhaW50UGhhc2UgfD0gR3JhcGhpY3NMYXllclBh aW50Rm9yZWdyb3VuZDsKLSAgICAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0 UGFpbnRpbmdQaGFzZShwYWludFBoYXNlKTsKLSAgICAgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXIt PmFkZENoaWxkKG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKSk7CisgICAgaWYgKCFtX3Nj cm9sbGluZ0xheWVyKSB7CisgICAgICAgIC8vIE91dGVyIGxheWVyIHdoaWNoIGNvcnJlc3BvbmRz IHdpdGggdGhlIHNjcm9sbCB2aWV3LgorICAgICAgICBtX3Njcm9sbGluZ0xheWVyID0gY3JlYXRl R3JhcGhpY3NMYXllcigiU2Nyb2xsaW5nIGNvbnRhaW5lciIpOworICAgICAgICBtX3Njcm9sbGlu Z0xheWVyLT5zZXREcmF3c0NvbnRlbnQoZmFsc2UpOworICAgICAgICBtX3Njcm9sbGluZ0xheWVy LT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOworCisgICAgICAgIC8vIElubmVyIGxheWVyIHdoaWNo IHJlbmRlcnMgdGhlIGNvbnRlbnQgdGhhdCBzY3JvbGxzLgorICAgICAgICBtX3Njcm9sbGluZ0Nv bnRlbnRzTGF5ZXIgPSBjcmVhdGVHcmFwaGljc0xheWVyKCJTY3JvbGxlZCBDb250ZW50cyIpOwor ICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldERyYXdzQ29udGVudCh0cnVlKTsK KyAgICAgICAgR3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UgcGFpbnRQaGFzZSA9IEdyYXBoaWNz TGF5ZXJQYWludE92ZXJmbG93Q29udGVudHMgfCBHcmFwaGljc0xheWVyUGFpbnRDb21wb3NpdGVk U2Nyb2xsOworICAgICAgICBpZiAoIW1fZm9yZWdyb3VuZExheWVyKQorICAgICAgICAgICAgcGFp bnRQaGFzZSB8PSBHcmFwaGljc0xheWVyUGFpbnRGb3JlZ3JvdW5kOworICAgICAgICBtX3Njcm9s bGluZ0NvbnRlbnRzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UocGFpbnRQaGFzZSk7CisgICAgICAg IG1fc2Nyb2xsaW5nTGF5ZXItPmFkZENoaWxkKG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQo KSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgY29tcG9zaXRvcigpLndpbGxSZW1vdmVTY3JvbGxp bmdMYXllcihtX293bmluZ0xheWVyKTsKIAotICAgICAgICAgICAgbGF5ZXJDaGFuZ2VkID0gdHJ1 ZTsKLSAgICAgICAgICAgIGlmIChzY3JvbGxpbmdDb29yZGluYXRvcikKLSAgICAgICAgICAgICAg ICBzY3JvbGxpbmdDb29yZGluYXRvci0+c2Nyb2xsYWJsZUFyZWFTY3JvbGxMYXllckRpZENoYW5n ZSgmbV9vd25pbmdMYXllcik7Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgICAgICAgICAgaWYgKG1f b3duaW5nTGF5ZXIucGFyZW50KCkpCi0gICAgICAgICAgICAgICAgY29tcG9zaXRvcigpLnNjcm9s bGluZ0xheWVyQWRkZWRPclVwZGF0ZWQoJm1fb3duaW5nTGF5ZXIpOwotI2VuZGlmCi0gICAgICAg IH0KLSAgICB9IGVsc2UgaWYgKG1fc2Nyb2xsaW5nTGF5ZXIpIHsKLSNpZiBQTEFURk9STShJT1Mp Ci0gICAgICAgIGlmICghcmVuZGVyZXIoKS5kb2N1bWVudEJlaW5nRGVzdHJveWVkKCkpCi0gICAg ICAgICAgICBjb21wb3NpdG9yKCkuc2Nyb2xsaW5nTGF5ZXJSZW1vdmVkKCZtX293bmluZ0xheWVy LCBtX3Njcm9sbGluZ0xheWVyLT5wbGF0Zm9ybUxheWVyKCksIG1fc2Nyb2xsaW5nQ29udGVudHNM YXllci0+cGxhdGZvcm1MYXllcigpKTsKLSNlbmRpZgogICAgICAgICB3aWxsRGVzdHJveUxheWVy KG1fc2Nyb2xsaW5nTGF5ZXIuZ2V0KCkpOwogICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Ny b2xsaW5nQ29udGVudHNMYXllci5nZXQoKSk7CiAgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXIgPSBu dWxscHRyOwogICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXIgPSBudWxscHRyOwotICAg ICAgICBsYXllckNoYW5nZWQgPSB0cnVlOwotICAgICAgICBpZiAoc2Nyb2xsaW5nQ29vcmRpbmF0 b3IpCi0gICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+c2Nyb2xsYWJsZUFyZWFTY3Jv bGxMYXllckRpZENoYW5nZSgmbV9vd25pbmdMYXllcik7CiAgICAgfQogCi0gICAgaWYgKGxheWVy Q2hhbmdlZCkgewotICAgICAgICB1cGRhdGVJbnRlcm5hbEhpZXJhcmNoeSgpOwotICAgICAgICBt X2dyYXBoaWNzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UocGFpbnRpbmdQaGFzZUZvclByaW1hcnlM YXllcigpKTsKLSNpZiAhUExBVEZPUk0oSU9TKQotICAgICAgICBtX2dyYXBoaWNzTGF5ZXItPnNl dE5lZWRzRGlzcGxheSgpOwotICAgICAgICBjb21wb3NpdG9yKCkuc2Nyb2xsaW5nTGF5ZXJEaWRD aGFuZ2UobV9vd25pbmdMYXllcik7Ci0jZW5kaWYKLSAgICB9CisgICAgdXBkYXRlSW50ZXJuYWxI aWVyYXJjaHkoKTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UocGFpbnRp bmdQaGFzZUZvclByaW1hcnlMYXllcigpKTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE5lZWRz RGlzcGxheSgpOyAvLyBCZWNhdXNlIHBhaW50aW5nIHBoYXNlcyBjaGFuZ2VkLgogCi0gICAgcmV0 dXJuIGxheWVyQ2hhbmdlZDsKKyAgICBpZiAobV9zY3JvbGxpbmdMYXllcikKKyAgICAgICAgY29t cG9zaXRvcigpLmRpZEFkZFNjcm9sbGluZ0xheWVyKG1fb3duaW5nTGF5ZXIpOworICAgIAorICAg IHJldHVybiB0cnVlOwogfQogCiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6YXR0YWNoVG9TY3Jv bGxpbmdDb29yZGluYXRvcldpdGhQYXJlbnQoUmVuZGVyTGF5ZXJCYWNraW5nKiBwYXJlbnQpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CmluZGV4IDdjYTdjNzYzYjAxNDJmODUwNjg0NGM3ZmRlYzU5NGI4YmU0N2MzYjguLmRmMmU2MDFj NGE0YjVjOGM2MWIyM2E0ZGJiZjU0YTk3MzYyMTBjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0zNTc1LDI2ICszNTc1 LDQyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1bnJlZ2lzdGVyQWxsU2Nyb2xsaW5n TGF5ZXJzKCkKICAgICAgICAgY2xpZW50LT5yZW1vdmVTY3JvbGxpbmdMYXllcihsYXllci5yZW5k ZXJlcigpLmVsZW1lbnQoKSwgYmFja2luZy0+c2Nyb2xsaW5nTGF5ZXIoKS0+cGxhdGZvcm1MYXll cigpLCBiYWNraW5nLT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSk7 CiAgICAgfQogfQorI2VuZGlmCiAKLS8vIENhbGxlZCB3aGVuIHRoZSBzaXplIG9mIHRoZSBjb250 ZW50c0xheWVyIGNoYW5nZXMsIGFuZCB3aGVuIHRoZSBjb250ZW50c0xheWVyIGlzIHJlcGxhY2Vk IGJ5IGFub3RoZXIgbGF5ZXIuCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2Nyb2xsaW5n TGF5ZXJBZGRlZE9yVXBkYXRlZChSZW5kZXJMYXllciogbGF5ZXIpCit2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6d2lsbFJlbW92ZVNjcm9sbGluZ0xheWVyKFJlbmRlckxheWVyJiBsYXllcikK IHsKLSAgICBBU1NFUlQoIW1fcmVuZGVyVmlldy5kb2N1bWVudCgpLmluUGFnZUNhY2hlKCkpOwot ICAgIG1fc2Nyb2xsaW5nTGF5ZXJzLmFkZChsYXllcik7Ci19CisgICAgaWYgKFNjcm9sbGluZ0Nv b3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5h dG9yKCkpIHsKKyAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNjcm9sbGFibGVBcmVhU2Ny b2xsTGF5ZXJEaWRDaGFuZ2UoJmxheWVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNjcm9sbGluZ0xheWVyUmVtb3ZlZChSZW5kZXJMYXll ciogbGF5ZXIsIFBsYXRmb3JtTGF5ZXIqIHNjcm9sbGluZ0xheWVyLCBQbGF0Zm9ybUxheWVyKiBj b250ZW50c0xheWVyKQotewotICAgIG1fc2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0ZS5yZW1v dmUobGF5ZXIpOwotICAgIG1fc2Nyb2xsaW5nTGF5ZXJzLnJlbW92ZShsYXllcik7CisjaWYgUExB VEZPUk0oSU9TKQorICAgIG1fc2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0ZS5yZW1vdmUoJmxh eWVyKTsKKyAgICBtX3Njcm9sbGluZ0xheWVycy5yZW1vdmUoJmxheWVyKTsKIAogICAgIGlmICht X3JlbmRlclZpZXcuZG9jdW1lbnQoKS5pblBhZ2VDYWNoZSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoQ2hyb21lQ2xpZW50KiBjbGllbnQgPSB0aGlzLT5jaHJvbWVDbGllbnQoKSkKLSAg ICAgICAgY2xpZW50LT5yZW1vdmVTY3JvbGxpbmdMYXllcihsYXllci0+cmVuZGVyZXIoKS5lbGVt ZW50KCksIHNjcm9sbGluZ0xheWVyLCBjb250ZW50c0xheWVyKTsKKyAgICBpZiAoQ2hyb21lQ2xp ZW50KiBjbGllbnQgPSB0aGlzLT5jaHJvbWVDbGllbnQoKSkgeworICAgICAgICBQbGF0Zm9ybUxh eWVyKiBzY3JvbGxpbmdMYXllciA9IGxheWVyLmJhY2tpbmcoKS0+c2Nyb2xsaW5nTGF5ZXIoKS0+ cGxhdGZvcm1MYXllcigpOworICAgICAgICBQbGF0Zm9ybUxheWVyKiBjb250ZW50c0xheWVyID0g bGF5ZXIuYmFja2luZygpLT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIo KTsKKyAgICAgICAgY2xpZW50LT5yZW1vdmVTY3JvbGxpbmdMYXllcihsYXllci5yZW5kZXJlcigp LmVsZW1lbnQoKSwgc2Nyb2xsaW5nTGF5ZXIsIGNvbnRlbnRzTGF5ZXIpOworICAgIH0KKyNlbmRp ZgogfQorCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkQWRkU2Nyb2xsaW5nTGF5ZXIo UmVuZGVyTGF5ZXImIGxheWVyKQoreworICAgIGlmIChTY3JvbGxpbmdDb29yZGluYXRvciogc2Ny b2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGluYXRvcigpKSB7CisgICAg ICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zY3JvbGxhYmxlQXJlYVNjcm9sbExheWVyRGlkQ2hh bmdlKCZsYXllcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyNpZiBQTEFURk9STShJT1Mp CisgICAgQVNTRVJUKCFtX3JlbmRlclZpZXcuZG9jdW1lbnQoKS5pblBhZ2VDYWNoZSgpKTsKKyAg ICBtX3Njcm9sbGluZ0xheWVycy5hZGQoJmxheWVyKTsKICNlbmRpZgorfQogCiB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6d2luZG93U2NyZWVuRGlkQ2hhbmdlKFBsYXRmb3JtRGlzcGxheUlE IGRpc3BsYXlJRCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaAppbmRleCA2YjA0M2Y4OGQ0MDUxZDgzMjJhZmM5M2VhN2U1ODQ5YWZjNmU2 MmFmLi41YTEwYzBhMjk4ZDY3N2RjZThmMjZlZGNhYmQwOTMwMWUyZjU2OTQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0yNzMs MTYgKzI3MywxNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRT dGF0dXMoUmVuZGVyTGF5ZXImKTsKICAgICB2b2lkIHJlbW92ZVZpZXdwb3J0Q29uc3RyYWluZWRM YXllcihSZW5kZXJMYXllciYpOwogCisgICAgdm9pZCB3aWxsUmVtb3ZlU2Nyb2xsaW5nTGF5ZXIo UmVuZGVyTGF5ZXImKTsKKyAgICB2b2lkIGRpZEFkZFNjcm9sbGluZ0xheWVyKFJlbmRlckxheWVy Jik7CisKICNpZiBQTEFURk9STShJT1MpCiAgICAgdm9pZCByZWdpc3RlckFsbFZpZXdwb3J0Q29u c3RyYWluZWRMYXllcnMoKTsKICAgICB2b2lkIHVucmVnaXN0ZXJBbGxWaWV3cG9ydENvbnN0cmFp bmVkTGF5ZXJzKCk7CiAKLSAgICB2b2lkIHNjcm9sbGluZ0xheWVyQWRkZWRPclVwZGF0ZWQoUmVu ZGVyTGF5ZXIqKTsKLSAgICB2b2lkIHNjcm9sbGluZ0xheWVyUmVtb3ZlZChSZW5kZXJMYXllcios IFBsYXRmb3JtTGF5ZXIqIHNjcm9sbGluZ0xheWVyLCBQbGF0Zm9ybUxheWVyKiBjb250ZW50c0xh eWVyKTsKLQogICAgIHZvaWQgcmVnaXN0ZXJBbGxTY3JvbGxpbmdMYXllcnMoKTsKICAgICB2b2lk IHVucmVnaXN0ZXJBbGxTY3JvbGxpbmdMYXllcnMoKTsKICNlbmRpZgorCiAgICAgdm9pZCByZXNl dFRyYWNrZWRSZXBhaW50UmVjdHMoKTsKICAgICB2b2lkIHNldFRyYWNrc1JlcGFpbnRzKGJvb2wp OwogCg==