130541 2014-03-20 15:39:53 -0700 FrameView::paintContents() is not called for composited content 2014-03-20 16:15:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton oldest_to_newest 992768 0 simon.fraser 2014-03-20 15:39:53 -0700 Parts of FrameView::paintContents() aren't called for composited content 992780 1 227351 simon.fraser 2014-03-20 16:07:04 -0700 Created attachment 227351 Patch 992786 2 simon.fraser 2014-03-20 16:15:29 -0700 https://trac.webkit.org/r166015 227351 2014-03-20 16:07:04 -0700 2014-03-20 16:09:55 -0700 Patch bug-130541-20140320160637.patch text/plain 12280 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyZTFhNzgwNmYwNzdl ZjAzNjFhYmEwMjEyNDdhNDU4NWM4ZDA5OC4uOGFiNWRhZWUyYTc0MThhNzE0MDM3M2NjODlmYWYx M2UzNzc2NzI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTAzLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFBhcnRzIG9mIEZy YW1lVmlldzo6cGFpbnRDb250ZW50cygpIGFyZW4ndCBjYWxsZWQgZm9yIGNvbXBvc2l0ZWQgY29u dGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMw NTQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJh bWVWaWV3OjpwYWludENvbnRlbnRzKCkgaXMgbm90IGNhbGxlZCBmb3IgZnJhbWVzIHRoYXQgaGF2 ZQorICAgICAgICBjb21wb3NpdGVkIGNvbnRlbnRzLCB5ZXQgaXQgY29udGFpbnMgY29kZSB0aGF0 IGlzIGV4cGVjdGVkCisgICAgICAgIHRvIHJ1biBmb3IgYWxsIEZyYW1lcy4KKyAgICAgICAgCisg ICAgICAgIEZpeCBieSBmYWN0b3JpbmcgaW50byB3aWxsL2RpZFBhaW50Q29udGVudHMoKSwgYW5k IGNhbGxpbmcKKyAgICAgICAgdGhlIHdpbGwvZGlkIGZ1bmN0aW9ucyBmcm9tIFJlbmRlckxheWVy QmFja2luZzo6cGFpbnRJbnRvTGF5ZXIoKS4KKyAgICAgICAgCisgICAgICAgIEFsc28gYWRkIGEg U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGUgY2hlY2sgZm9yIGNvbXBvc2l0ZWQtbGF5ZXIK KyAgICAgICAgcGFpbnRpbmcuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZUNvbnRyb2xUaW50cyk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OndpbGxQYWludENvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6ZGlkUGFpbnRDb250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnBhaW50Q29udGVudHMpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OnBhaW50SW50b0xheWVyKToKKworMjAxNC0wMy0yMCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBGb2xsb3d1cCBidWls ZCBmaXg6IEFuaW1hdGlvbkJhc2UuaCBuZWVkcyB0byBiZSBwcml2YXRlIGJlY2F1c2UKICAgICAg ICAgaXQncyBpbmNsdWRlZCBieSBBbmltYXRpb25Db250cm9sbGVyLmguCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCAxN2VjZGE2ZTExYTYxYTljZmRmZDc1NjdiMGRiNjk0MjY1MDJj ZTZiLi5iN2RkNzU1NDZhNzE5NDY1MDJmMWM4M2MwNzI0ZTBiY2IxNDZhNzllIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0zNDYxLDQzICszNDYxLDE1IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRXYXNTY3JvbGxlZEJ5VXNlcihib29sIHdhc1Njcm9sbGVkQnlVc2VyKQogICAgIGFkanVz dFRpbGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CiAKLXZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRl bnRzKEdyYXBoaWNzQ29udGV4dCogcCwgY29uc3QgSW50UmVjdCYgcmVjdCkKK3ZvaWQgRnJhbWVW aWV3Ojp3aWxsUGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IElu dFJlY3QmIGRpcnR5UmVjdCwgUGFpbnRpbmdTdGF0ZSYgcGFpbnRpbmdTdGF0ZSkKIHsKICAgICBE b2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CiAKLSNpZm5kZWYgTkRFQlVH Ci0gICAgYm9vbCBmaWxsV2l0aFJlZDsKLSAgICBpZiAoZG9jdW1lbnQtPnByaW50aW5nKCkpCi0g ICAgICAgIGZpbGxXaXRoUmVkID0gZmFsc2U7IC8vIFByaW50aW5nLCBkb24ndCBmaWxsIHdpdGgg cmVkIChjYW4ndCByZW1lbWJlciB3aHkpLgotICAgIGVsc2UgaWYgKGZyYW1lKCkub3duZXJFbGVt ZW50KCkpCi0gICAgICAgIGZpbGxXaXRoUmVkID0gZmFsc2U7IC8vIFN1YmZyYW1lLCBkb24ndCBm aWxsIHdpdGggcmVkLgotICAgIGVsc2UgaWYgKGlzVHJhbnNwYXJlbnQoKSkKLSAgICAgICAgZmls bFdpdGhSZWQgPSBmYWxzZTsgLy8gVHJhbnNwYXJlbnQsIGRvbid0IGZpbGwgd2l0aCByZWQuCi0g ICAgZWxzZSBpZiAobV9wYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9ubHkp Ci0gICAgICAgIGZpbGxXaXRoUmVkID0gZmFsc2U7IC8vIFNlbGVjdGlvbnMgYXJlIHRyYW5zcGFy ZW50LCBkb24ndCBmaWxsIHdpdGggcmVkLgotICAgIGVsc2UgaWYgKG1fbm9kZVRvRHJhdykKLSAg ICAgICAgZmlsbFdpdGhSZWQgPSBmYWxzZTsgLy8gRWxlbWVudCBpbWFnZXMgYXJlIHRyYW5zcGFy ZW50LCBkb24ndCBmaWxsIHdpdGggcmVkLgotICAgIGVsc2UKLSAgICAgICAgZmlsbFdpdGhSZWQg PSB0cnVlOwotICAgIAotICAgIGlmIChmaWxsV2l0aFJlZCkKLSAgICAgICAgcC0+ZmlsbFJlY3Qo cmVjdCwgQ29sb3IoMHhGRiwgMCwgMCksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotI2VuZGlmCisg ICAgaWYgKCFjb250ZXh0LT5wYWludGluZ0Rpc2FibGVkKCkpCisgICAgICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6d2lsbFBhaW50KHJlbmRlclZpZXcoKSk7CiAKLSAgICBSZW5kZXJWaWV3 KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpOwotICAgIGlmICghcmVuZGVyVmlldykg ewotICAgICAgICBMT0dfRVJST1IoImNhbGxlZCBGcmFtZVZpZXc6OnBhaW50IHdpdGggbmlsIHJl bmRlcmVyIik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgcGFpbnRpbmdTdGF0ZS5pc1Rv cExldmVsUGFpbnRlciA9ICFzQ3VycmVudFBhaW50VGltZVN0YW1wOwogCi0gICAgQVNTRVJUKCFu ZWVkc0xheW91dCgpKTsKLSAgICBpZiAobmVlZHNMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgaWYgKCFwLT5wYWludGluZ0Rpc2FibGVkKCkpCi0gICAgICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6d2lsbFBhaW50KHJlbmRlclZpZXcpOwotCi0gICAgYm9vbCBpc1RvcExldmVs UGFpbnRlciA9ICFzQ3VycmVudFBhaW50VGltZVN0YW1wOwogI2lmIFBMQVRGT1JNKElPUykKICAg ICAvLyBGSVhNRTogUmVtb3ZlIFBMQVRGT1JNKElPUyktZ3VhcmQgb25jZSB3ZSB1cHN0cmVhbSB0 aGUgaU9TIGNoYW5nZXMgdG8gTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmguCiAgICAgaWYgKGlzVG9w TGV2ZWxQYWludGVyICYmIG1lbW9yeVByZXNzdXJlSGFuZGxlcigpLmhhc1JlY2VpdmVkTWVtb3J5 UHJlc3N1cmUoKSkgewpAQCAtMzUwOCwxNSArMzQ4MCwxMyBAQCB2b2lkIEZyYW1lVmlldzo6cGFp bnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIHAsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAg ICAgIG1lbW9yeUNhY2hlKCktPnBydW5lKCk7CiAgICAgfQogI2VuZGlmCi0gICAgaWYgKGlzVG9w TGV2ZWxQYWludGVyKQorICAgIGlmIChwYWludGluZ1N0YXRlLmlzVG9wTGV2ZWxQYWludGVyKQog ICAgICAgICBzQ3VycmVudFBhaW50VGltZVN0YW1wID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lKCk7CiAKLSAgICBGb250Q2FjaGVQdXJnZVByZXZlbnRlciBmb250Q2FjaGVQdXJnZVByZXZl bnRlcjsKLQotICAgIGlmICghcC0+cGFpbnRpbmdEaXNhYmxlZCgpICYmICFkb2N1bWVudC0+cHJp bnRpbmcoKSkKKyAgICBpZiAoIWNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSAmJiAhZG9jdW1l bnQtPnByaW50aW5nKCkpCiAgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFt ZSgmZnJhbWUoKSk7CiAKLSAgICBQYWludEJlaGF2aW9yIG9sZFBhaW50QmVoYXZpb3IgPSBtX3Bh aW50QmVoYXZpb3I7CisgICAgcGFpbnRpbmdTdGF0ZS5wYWludEJlaGF2aW9yID0gbV9wYWludEJl aGF2aW9yOwogICAgIAogICAgIGlmIChGcmFtZVZpZXcqIHBhcmVudFZpZXcgPSBwYXJlbnRGcmFt ZVZpZXcoKSkgewogICAgICAgICBpZiAocGFyZW50Vmlldy0+cGFpbnRCZWhhdmlvcigpICYgUGFp bnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVycykKQEAgLTM1MjQsMzggKzM0OTQsMjcg QEAgdm9pZCBGcmFtZVZpZXc6OnBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0KiBwLCBjb25z dCBJbnRSZWN0JiByZWN0KQogICAgIH0KICAgICAKICAgICBpZiAobV9wYWludEJlaGF2aW9yID09 IFBhaW50QmVoYXZpb3JOb3JtYWwpCi0gICAgICAgIGRvY3VtZW50LT5tYXJrZXJzKCkuaW52YWxp ZGF0ZVJlbmRlcmVkUmVjdHNGb3JNYXJrZXJzSW5SZWN0KHJlY3QpOworICAgICAgICBkb2N1bWVu dC0+bWFya2VycygpLmludmFsaWRhdGVSZW5kZXJlZFJlY3RzRm9yTWFya2Vyc0luUmVjdChkaXJ0 eVJlY3QpOwogCiAgICAgaWYgKGRvY3VtZW50LT5wcmludGluZygpKQogICAgICAgICBtX3BhaW50 QmVoYXZpb3IgfD0gUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVyczsKIAotICAg IGJvb2wgZmxhdHRlbmluZ1BhaW50ID0gbV9wYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvckZs YXR0ZW5Db21wb3NpdGluZ0xheWVyczsKLSAgICBib29sIGlzUm9vdEZyYW1lID0gIWZyYW1lKCku b3duZXJFbGVtZW50KCk7Ci0gICAgaWYgKGZsYXR0ZW5pbmdQYWludCAmJiBpc1Jvb3RGcmFtZSkK KyAgICBwYWludGluZ1N0YXRlLmlzRmxhdHRlbmluZ1BhaW50T2ZSb290RnJhbWUgPSAobV9wYWlu dEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVycykgJiYgIWZy YW1lKCkub3duZXJFbGVtZW50KCk7CisgICAgaWYgKHBhaW50aW5nU3RhdGUuaXNGbGF0dGVuaW5n UGFpbnRPZlJvb3RGcmFtZSkKICAgICAgICAgbm90aWZ5V2lkZ2V0c0luQWxsRnJhbWVzKFdpbGxQ YWludEZsYXR0ZW5lZCk7CiAKICAgICBBU1NFUlQoIW1faXNQYWludGluZyk7CiAgICAgbV9pc1Bh aW50aW5nID0gdHJ1ZTsKK30KIAotICAgIC8vIG1fbm9kZVRvRHJhdyBpcyB1c2VkIHRvIGRyYXcg b25seSBvbmUgZWxlbWVudCAoYW5kIGl0cyBkZXNjZW5kYW50cykKLSAgICBSZW5kZXJPYmplY3Qq IGVsdFJlbmRlcmVyID0gbV9ub2RlVG9EcmF3ID8gbV9ub2RlVG9EcmF3LT5yZW5kZXJlcigpIDog MDsKLSAgICBSZW5kZXJMYXllciogcm9vdExheWVyID0gcmVuZGVyVmlldy0+bGF5ZXIoKTsKLQot I2lmbmRlZiBOREVCVUcKLSAgICBSZW5kZXJFbGVtZW50OjpTZXRMYXlvdXROZWVkZWRGb3JiaWRk ZW5TY29wZSBmb3JiaWRTZXROZWVkc0xheW91dCgmcm9vdExheWVyLT5yZW5kZXJlcigpKTsKLSNl bmRpZgotCi0gICAgcm9vdExheWVyLT5wYWludChwLCByZWN0LCBtX3BhaW50QmVoYXZpb3IsIGVs dFJlbmRlcmVyKTsKLQotICAgIGlmIChyb290TGF5ZXItPmNvbnRhaW5zRGlydHlPdmVybGF5U2Ny b2xsYmFycygpKQotICAgICAgICByb290TGF5ZXItPnBhaW50T3ZlcmxheVNjcm9sbGJhcnMocCwg cmVjdCwgbV9wYWludEJlaGF2aW9yLCBlbHRSZW5kZXJlcik7Ci0KK3ZvaWQgRnJhbWVWaWV3Ojpk aWRQYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYg ZGlydHlSZWN0LCBQYWludGluZ1N0YXRlJiBwYWludGluZ1N0YXRlKQorewogICAgIG1faXNQYWlu dGluZyA9IGZhbHNlOwogCi0gICAgaWYgKGZsYXR0ZW5pbmdQYWludCAmJiBpc1Jvb3RGcmFtZSkK KyAgICBpZiAocGFpbnRpbmdTdGF0ZS5pc0ZsYXR0ZW5pbmdQYWludE9mUm9vdEZyYW1lKQogICAg ICAgICBub3RpZnlXaWRnZXRzSW5BbGxGcmFtZXMoRGlkUGFpbnRGbGF0dGVuZWQpOwogCi0gICAg bV9wYWludEJlaGF2aW9yID0gb2xkUGFpbnRCZWhhdmlvcjsKKyAgICBtX3BhaW50QmVoYXZpb3Ig PSBwYWludGluZ1N0YXRlLnBhaW50QmVoYXZpb3I7CiAgICAgbV9sYXN0UGFpbnRUaW1lID0gbW9u b3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CiAKICNpZiBQTEFURk9STShJT1MpCkBAIC0zNTY2 LDIyICszNTI1LDc2IEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ29u dGV4dCogcCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICAgICAgbWVtb3J5Q2FjaGUoKS0+cHJ1 bmVMaXZlUmVzb3VyY2VzKHRydWUpOwogI2VuZGlmCiAKKyAgICBEb2N1bWVudCogZG9jdW1lbnQg PSBmcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgLy8gUmVnaW9ucyBtYXkgaGF2ZSBjaGFuZ2VkIGFz IGEgcmVzdWx0IG9mIHRoZSB2aXNpYmlsaXR5L3otaW5kZXggb2YgZWxlbWVudCBjaGFuZ2luZy4K ICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgaWYgKGRvY3VtZW50LT5hbm5vdGF0 ZWRSZWdpb25zRGlydHkoKSkKICAgICAgICAgdXBkYXRlQW5ub3RhdGVkUmVnaW9ucygpOwogI2Vu ZGlmCiAKLSAgICBpZiAoaXNUb3BMZXZlbFBhaW50ZXIpCisgICAgaWYgKHBhaW50aW5nU3RhdGUu aXNUb3BMZXZlbFBhaW50ZXIpCiAgICAgICAgIHNDdXJyZW50UGFpbnRUaW1lU3RhbXAgPSAwOwog Ci0gICAgaWYgKCFwLT5wYWludGluZ0Rpc2FibGVkKCkpIHsKLSAgICAgICAgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkaWRQYWludChyZW5kZXJWaWV3LCBwLCByZWN0KTsKKyAgICBpZiAoIWNv bnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkgeworICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmRpZFBhaW50KHJlbmRlclZpZXcoKSwgY29udGV4dCwgZGlydHlSZWN0KTsKICAgICAg ICAgLy8gRklYTUU6IHNob3VsZCBwcm9iYWJseSBub3QgZmlyZSBtaWxlc3RvbmVzIGZvciBzbmFw c2hvdCBwYWludGluZy4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NzYyMwogICAgICAgICBmaXJlUGFpbnRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCk7CiAgICAg fQogfQogCit2b2lkIEZyYW1lVmlldzo6cGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNv bnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKK3sKKyAgICBEb2N1bWVudCogZG9jdW1l bnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CisKKyNpZm5kZWYgTkRFQlVHCisgICAgYm9vbCBmaWxs V2l0aFJlZDsKKyAgICBpZiAoZG9jdW1lbnQtPnByaW50aW5nKCkpCisgICAgICAgIGZpbGxXaXRo UmVkID0gZmFsc2U7IC8vIFByaW50aW5nLCBkb24ndCBmaWxsIHdpdGggcmVkIChjYW4ndCByZW1l bWJlciB3aHkpLgorICAgIGVsc2UgaWYgKGZyYW1lKCkub3duZXJFbGVtZW50KCkpCisgICAgICAg IGZpbGxXaXRoUmVkID0gZmFsc2U7IC8vIFN1YmZyYW1lLCBkb24ndCBmaWxsIHdpdGggcmVkLgor ICAgIGVsc2UgaWYgKGlzVHJhbnNwYXJlbnQoKSkKKyAgICAgICAgZmlsbFdpdGhSZWQgPSBmYWxz ZTsgLy8gVHJhbnNwYXJlbnQsIGRvbid0IGZpbGwgd2l0aCByZWQuCisgICAgZWxzZSBpZiAobV9w YWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9ubHkpCisgICAgICAgIGZpbGxX aXRoUmVkID0gZmFsc2U7IC8vIFNlbGVjdGlvbnMgYXJlIHRyYW5zcGFyZW50LCBkb24ndCBmaWxs IHdpdGggcmVkLgorICAgIGVsc2UgaWYgKG1fbm9kZVRvRHJhdykKKyAgICAgICAgZmlsbFdpdGhS ZWQgPSBmYWxzZTsgLy8gRWxlbWVudCBpbWFnZXMgYXJlIHRyYW5zcGFyZW50LCBkb24ndCBmaWxs IHdpdGggcmVkLgorICAgIGVsc2UKKyAgICAgICAgZmlsbFdpdGhSZWQgPSB0cnVlOworICAgIAor ICAgIGlmIChmaWxsV2l0aFJlZCkKKyAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QoZGlydHlSZWN0 LCBDb2xvcigweEZGLCAwLCAwKSwgQ29sb3JTcGFjZURldmljZVJHQik7CisjZW5kaWYKKworICAg IFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSB0aGlzLT5yZW5kZXJWaWV3KCk7CisgICAgaWYgKCFy ZW5kZXJWaWV3KSB7CisgICAgICAgIExPR19FUlJPUigiY2FsbGVkIEZyYW1lVmlldzo6cGFpbnQg d2l0aCBuaWwgcmVuZGVyZXIiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEFTU0VS VCghbmVlZHNMYXlvdXQoKSk7CisgICAgaWYgKG5lZWRzTGF5b3V0KCkpCisgICAgICAgIHJldHVy bjsKKworICAgIFBhaW50aW5nU3RhdGUgcGFpbnRpbmdTdGF0ZTsKKyAgICB3aWxsUGFpbnRDb250 ZW50cyhjb250ZXh0LCBkaXJ0eVJlY3QsIHBhaW50aW5nU3RhdGUpOworCisgICAgRm9udENhY2hl UHVyZ2VQcmV2ZW50ZXIgZm9udENhY2hlUHVyZ2VQcmV2ZW50ZXI7CisKKyAgICAvLyBtX25vZGVU b0RyYXcgaXMgdXNlZCB0byBkcmF3IG9ubHkgb25lIGVsZW1lbnQgKGFuZCBpdHMgZGVzY2VuZGFu dHMpCisgICAgUmVuZGVyT2JqZWN0KiBlbHRSZW5kZXJlciA9IG1fbm9kZVRvRHJhdyA/IG1fbm9k ZVRvRHJhdy0+cmVuZGVyZXIoKSA6IDA7CisgICAgUmVuZGVyTGF5ZXIqIHJvb3RMYXllciA9IHJl bmRlclZpZXctPmxheWVyKCk7CisKKyNpZm5kZWYgTkRFQlVHCisgICAgUmVuZGVyRWxlbWVudDo6 U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGUgZm9yYmlkU2V0TmVlZHNMYXlvdXQoJnJvb3RM YXllci0+cmVuZGVyZXIoKSk7CisjZW5kaWYKKworICAgIHJvb3RMYXllci0+cGFpbnQoY29udGV4 dCwgZGlydHlSZWN0LCBtX3BhaW50QmVoYXZpb3IsIGVsdFJlbmRlcmVyKTsKKyAgICBpZiAocm9v dExheWVyLT5jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMoKSkKKyAgICAgICAgcm9vdExh eWVyLT5wYWludE92ZXJsYXlTY3JvbGxiYXJzKGNvbnRleHQsIGRpcnR5UmVjdCwgbV9wYWludEJl aGF2aW9yLCBlbHRSZW5kZXJlcik7CisKKyAgICBkaWRQYWludENvbnRlbnRzKGNvbnRleHQsIGRp cnR5UmVjdCwgcGFpbnRpbmdTdGF0ZSk7Cit9CisKIHZvaWQgRnJhbWVWaWV3OjpzZXRQYWludEJl aGF2aW9yKFBhaW50QmVoYXZpb3IgYmVoYXZpb3IpCiB7CiAgICAgbV9wYWludEJlaGF2aW9yID0g YmVoYXZpb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA5NzA2NTdhYzU0NGFmMDhhMTc2 ODg0MTM1M2Y2YjA1ZWU3NTJmNDFjLi5iZjk4ZTI3NDNiYjRiZDY0ZGI3OTM2ZTQ3MGFiYzQyMmM4 YzRkNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTI5Nyw3ICsyOTcsMjMgQEAgcHVi bGljOgogICAgIHZvaWQgYWRkRW1iZWRkZWRPYmplY3RUb1VwZGF0ZShSZW5kZXJFbWJlZGRlZE9i amVjdCYpOwogICAgIHZvaWQgcmVtb3ZlRW1iZWRkZWRPYmplY3RUb1VwZGF0ZShSZW5kZXJFbWJl ZGRlZE9iamVjdCYpOwogCi0gICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVudHMoR3JhcGhpY3ND b250ZXh0KiwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkgb3ZlcnJpZGU7CisgICAgdmlydHVh bCB2b2lkIHBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYgZGly dHlSZWN0KSBvdmVycmlkZTsKKworICAgIHN0cnVjdCBQYWludGluZ1N0YXRlIHsKKyAgICAgICAg UGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yOworICAgICAgICBib29sIGlzVG9wTGV2ZWxQYWlu dGVyOworICAgICAgICBib29sIGlzRmxhdHRlbmluZ1BhaW50T2ZSb290RnJhbWU7CisgICAgICAg IFBhaW50aW5nU3RhdGUoKQorICAgICAgICAgICAgOiBwYWludEJlaGF2aW9yKCkKKyAgICAgICAg ICAgICwgaXNUb3BMZXZlbFBhaW50ZXIoZmFsc2UpCisgICAgICAgICAgICAsIGlzRmxhdHRlbmlu Z1BhaW50T2ZSb290RnJhbWUoZmFsc2UpCisgICAgICAgIHsKKyAgICAgICAgfQorICAgIH07CisK KyAgICB2b2lkIHdpbGxQYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJl Y3QmIGRpcnR5UmVjdCwgUGFpbnRpbmdTdGF0ZSYpOworICAgIHZvaWQgZGlkUGFpbnRDb250ZW50 cyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QsIFBhaW50aW5nU3Rh dGUmKTsKKwogICAgIHZvaWQgc2V0UGFpbnRCZWhhdmlvcihQYWludEJlaGF2aW9yKTsKICAgICBQ YWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IoKSBjb25zdDsKICAgICBib29sIGlzUGFpbnRpbmco KSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKaW5kZXggNjUyODU0ODFmNDk2NWNiMGEyMGUzZDE5NzE0Zjg4YTQ3MzYzOGUwYS4uMGRi M2Q2MjU0OGU0MmQ1ZWFiYWUyYzkzNGUzNGEwN2JmNjQzYzcxZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTIxNTcsNyArMjE1Nywx NSBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRJbnRvTGF5ZXIoY29uc3QgR3JhcGhp Y3NMYXllciogZ3JhcGhpY3NMYXllciwgR3JhcAogICAgICAgICBwYWludEZsYWdzIHw9IChSZW5k ZXJMYXllcjo6UGFpbnRMYXllclBhaW50aW5nUm9vdEJhY2tncm91bmRPbmx5IHwgUmVuZGVyTGF5 ZXI6OlBhaW50TGF5ZXJQYWludGluZ0NvbXBvc2l0aW5nRm9yZWdyb3VuZFBoYXNlKTsgLy8gTmVl ZCBQYWludExheWVyUGFpbnRpbmdDb21wb3NpdGluZ0ZvcmVncm91bmRQaGFzZSB0byB3YWxrIGNo aWxkIGxheWVycy4KICAgICBlbHNlIGlmIChjb21wb3NpdG9yKCkuZml4ZWRSb290QmFja2dyb3Vu ZExheWVyKCkpCiAgICAgICAgIHBhaW50RmxhZ3MgfD0gUmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJQ YWludGluZ1NraXBSb290QmFja2dyb3VuZDsKLSAgICAKKworI2lmbmRlZiBOREVCVUcKKyAgICBS ZW5kZXJFbGVtZW50OjpTZXRMYXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZSBmb3JiaWRTZXROZWVk c0xheW91dCgmbV9vd25pbmdMYXllci5yZW5kZXJlcigpKTsKKyNlbmRpZgorCisgICAgRnJhbWVW aWV3OjpQYWludGluZ1N0YXRlIHBhaW50aW5nU3RhdGU7CisgICAgaWYgKG1fb3duaW5nTGF5ZXIu aXNSb290TGF5ZXIoKSkKKyAgICAgICAgbV9vd25pbmdMYXllci5yZW5kZXJlcigpLnZpZXcoKS5m cmFtZVZpZXcoKS53aWxsUGFpbnRDb250ZW50cyhjb250ZXh0LCBwYWludERpcnR5UmVjdCwgcGFp bnRpbmdTdGF0ZSk7CisKICAgICAvLyBGSVhNRTogR3JhcGhpY3NMYXllcnMgbmVlZCBhIHdheSB0 byBzcGxpdCBmb3IgUmVuZGVyUmVnaW9ucy4KICAgICBSZW5kZXJMYXllcjo6TGF5ZXJQYWludGlu Z0luZm8gcGFpbnRpbmdJbmZvKCZtX293bmluZ0xheWVyLCBwYWludERpcnR5UmVjdCwgcGFpbnRC ZWhhdmlvciwgbV9kZXZpY2VQaXhlbEZyYWN0aW9uRnJvbVJlbmRlcmVyKTsKICAgICBtX293bmlu Z0xheWVyLnBhaW50TGF5ZXJDb250ZW50cyhjb250ZXh0LCBwYWludGluZ0luZm8sIHBhaW50Rmxh Z3MpOwpAQCAtMjE2NSw2ICsyMTczLDkgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50 SW50b0xheWVyKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXAKICAgICBp ZiAobV9vd25pbmdMYXllci5jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMoKSkKICAgICAg ICAgbV9vd25pbmdMYXllci5wYWludExheWVyQ29udGVudHMoY29udGV4dCwgcGFpbnRpbmdJbmZv LCBwYWludEZsYWdzIHwgUmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJQYWludGluZ092ZXJsYXlTY3Jv bGxiYXJzKTsKIAorICAgIGlmIChtX293bmluZ0xheWVyLmlzUm9vdExheWVyKCkpCisgICAgICAg IG1fb3duaW5nTGF5ZXIucmVuZGVyZXIoKS52aWV3KCkuZnJhbWVWaWV3KCkuZGlkUGFpbnRDb250 ZW50cyhjb250ZXh0LCBwYWludERpcnR5UmVjdCwgcGFpbnRpbmdTdGF0ZSk7CisKICAgICBjb21w b3NpdG9yKCkuZGlkUGFpbnRCYWNraW5nKHRoaXMpOwogCiAgICAgQVNTRVJUKCFtX293bmluZ0xh eWVyLm1fdXNlZFRyYW5zcGFyZW5jeSk7Cg==