64052 2011-07-06 20:05:53 -0700 [chromium] Reduce compositor texture memory by skipping layers and clipping surfaces 2011-07-07 14:07:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne enne jamesr vangelis oldest_to_newest 433185 0 enne 2011-07-06 20:05:53 -0700 [chromium] Reduce compositor texture memory by skipping layers and clipping surfaces 433189 1 99920 enne 2011-07-06 20:10:28 -0700 Created attachment 99920 Patch 433671 2 99920 jamesr 2011-07-07 13:26:11 -0700 Comment on attachment 99920 Patch R=me 433689 3 enne 2011-07-07 14:07:10 -0700 Committed r90589: <http://trac.webkit.org/changeset/90589> 99920 2011-07-06 20:10:28 -0700 2011-07-07 13:26:11 -0700 Patch bug-64052-20110706201026.patch text/plain 10991 enne U3VidmVyc2lvbiBSZXZpc2lvbjogOTA1MjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NTVlNjhhMWIzMGU4NjVl NGVkMWRlZTBkZGYzMjg0N2FlMDcxZDQwLi44NTU3YjI3MTU4NGY3MmE0ZGFiN2VhNjk5ZTllZmM2 MzMxMTM3M2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDctMDYgIEFkcmll bm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFJlZHVj ZSBjb21wb3NpdG9yIHRleHR1cmUgbWVtb3J5IGJ5IHNraXBwaW5nIGxheWVycyBhbmQgY2xpcHBp bmcgc3VyZmFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY0MDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTGF5ZXJzIGFuZCBzdXJmYWNlcyB0aGF0IGFyZSBlbnRpcmVseSB0cmFuc3BhcmVudCBhcmUg bm93IHNraXBwZWQuCisgICAgICAgIFBhcmVudCBzY2lzc29yIHJlY3RzIGFyZSBub3cgYXBwbGll ZCB0byB0aGUgY29udGVudCByZWN0IG9mIHN1cmZhY2VzCisgICAgICAgIHNvIHRoYXQgb2Zmc2Ny ZWVuIHN1cmZhY2VzIGNhbiBiZSBza2lwcGVkLgorCisgICAgICAgIExhbmRpbmcgdGhpcyBmb3Ig dmFuZ2VsaXNAY2hyb21pdW0ub3JnLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlVmlzaWJsZVJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlVmlzaWJsZUxheWVyUmVjdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnBhaW50TGF5ZXJDb250ZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVQcm9wZXJ0aWVzQW5kUmVu ZGVyU3VyZmFjZXMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjp1 cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVy ZXJDaHJvbWl1bTo6ZHJhd0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy U3VyZmFjZUNocm9taXVtOjpSZW5kZXJTdXJmYWNlQ2hyb21pdW0pOgorCiAyMDExLTA3LTA2ICBF bWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IGQ5 OTEyYTMwYTUxNmQ4MWE0ZDAyMTMyZDM0NWYzOGJjNjkwNDdkNDAuLjY3YTgyYzliMTZkYWM3YzBh MGMxNmI4YTVmNTA0N2UzNmUyNDU5MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9t aXVtLmNwcApAQCAtMzczLDE4ICszNzMsOCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6 dXBkYXRlTGF5ZXJzKExheWVyTGlzdCYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCkKICAgICB1cGRh dGVDb21wb3NpdG9yUmVzb3VyY2VzKHJlbmRlclN1cmZhY2VMYXllckxpc3QpOwogfQogCi1zdGF0 aWMgSW50UmVjdCBjYWxjdWxhdGVWaXNpYmxlTGF5ZXJSZWN0KGNvbnN0IEludFJlY3QmIHRhcmdl dFN1cmZhY2VSZWN0LCBjb25zdCBJbnRTaXplJiBib3VuZHMsIGNvbnN0IEludFNpemUmIGNvbnRl bnRCb3VuZHMsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0aWxpbmdUcmFuc2Zvcm0pCitz dGF0aWMgSW50UmVjdCBjYWxjdWxhdGVWaXNpYmxlUmVjdChjb25zdCBJbnRSZWN0JiB0YXJnZXRT dXJmYWNlUmVjdCwgY29uc3QgSW50UmVjdCYgbGF5ZXJCb3VuZFJlY3QsIGNvbnN0IFRyYW5zZm9y bWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0pCiB7Ci0gICAgaWYgKHRhcmdldFN1cmZhY2VSZWN0Lmlz RW1wdHkoKSB8fCBjb250ZW50Qm91bmRzLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHRhcmdl dFN1cmZhY2VSZWN0OwotCi0gICAgY29uc3QgSW50UmVjdCBsYXllckJvdW5kUmVjdCA9IEludFJl Y3QoSW50UG9pbnQoKSwgY29udGVudEJvdW5kcyk7Ci0gICAgVHJhbnNmb3JtYXRpb25NYXRyaXgg dHJhbnNmb3JtID0gdGlsaW5nVHJhbnNmb3JtOwotCi0gICAgdHJhbnNmb3JtLnNjYWxlTm9uVW5p Zm9ybShib3VuZHMud2lkdGgoKSAvIHN0YXRpY19jYXN0PGRvdWJsZT4oY29udGVudEJvdW5kcy53 aWR0aCgpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvdW5kcy5oZWlnaHQoKSAv IHN0YXRpY19jYXN0PGRvdWJsZT4oY29udGVudEJvdW5kcy5oZWlnaHQoKSkpOwotICAgIHRyYW5z Zm9ybS50cmFuc2xhdGUoLWNvbnRlbnRCb3VuZHMud2lkdGgoKSAvIDIuMCwgLWNvbnRlbnRCb3Vu ZHMuaGVpZ2h0KCkgLyAyLjApOwotCiAgICAgLy8gSXMgdGhpcyBsYXllciBmdWxseSBjb250YWlu ZWQgd2l0aGluIHRoZSB0YXJnZXQgc3VyZmFjZT8KICAgICBJbnRSZWN0IGxheWVySW5TdXJmYWNl U3BhY2UgPSB0cmFuc2Zvcm0ubWFwUmVjdChsYXllckJvdW5kUmVjdCk7CiAgICAgaWYgKHRhcmdl dFN1cmZhY2VSZWN0LmNvbnRhaW5zKGxheWVySW5TdXJmYWNlU3BhY2UpKQpAQCAtNDA2LDYgKzM5 NiwyMSBAQCBzdGF0aWMgSW50UmVjdCBjYWxjdWxhdGVWaXNpYmxlTGF5ZXJSZWN0KGNvbnN0IElu dFJlY3QmIHRhcmdldFN1cmZhY2VSZWN0LCBjb25zdAogICAgIHJldHVybiBsYXllclJlY3Q7CiB9 CiAKK3N0YXRpYyBJbnRSZWN0IGNhbGN1bGF0ZVZpc2libGVMYXllclJlY3QoY29uc3QgSW50UmVj dCYgdGFyZ2V0U3VyZmFjZVJlY3QsIGNvbnN0IEludFNpemUmIGJvdW5kcywgY29uc3QgSW50U2l6 ZSYgY29udGVudEJvdW5kcywgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHRpbGluZ1RyYW5z Zm9ybSkKK3sKKyAgICBpZiAodGFyZ2V0U3VyZmFjZVJlY3QuaXNFbXB0eSgpIHx8IGNvbnRlbnRC b3VuZHMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gdGFyZ2V0U3VyZmFjZVJlY3Q7CisKKyAg ICBjb25zdCBJbnRSZWN0IGxheWVyQm91bmRSZWN0ID0gSW50UmVjdChJbnRQb2ludCgpLCBjb250 ZW50Qm91bmRzKTsKKyAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0gPSB0aWxpbmdU cmFuc2Zvcm07CisKKyAgICB0cmFuc2Zvcm0uc2NhbGVOb25Vbmlmb3JtKGJvdW5kcy53aWR0aCgp IC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihjb250ZW50Qm91bmRzLndpZHRoKCkpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYm91bmRzLmhlaWdodCgpIC8gc3RhdGljX2Nhc3Q8ZG91Ymxl Pihjb250ZW50Qm91bmRzLmhlaWdodCgpKSk7CisgICAgdHJhbnNmb3JtLnRyYW5zbGF0ZSgtY29u dGVudEJvdW5kcy53aWR0aCgpIC8gMi4wLCAtY29udGVudEJvdW5kcy5oZWlnaHQoKSAvIDIuMCk7 CisKKyAgICByZXR1cm4gY2FsY3VsYXRlVmlzaWJsZVJlY3QodGFyZ2V0U3VyZmFjZVJlY3QsIGxh eWVyQm91bmRSZWN0LCB0cmFuc2Zvcm0pOworfQorCiBzdGF0aWMgdm9pZCBwYWludENvbnRlbnRz SWZEaXJ0eShMYXllckNocm9taXVtKiBsYXllciwgY29uc3QgSW50UmVjdCYgdmlzaWJsZUxheWVy UmVjdCkKIHsKICAgICBpZiAobGF5ZXItPmRyYXdzQ29udGVudCgpKSB7CkBAIC00MzEsNiArNDM2 LDkgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnBhaW50TGF5ZXJDb250ZW50cyhjb25z dCBMYXllckxpc3QmIHJlbmRlclN1cmZhY2VMYXkKICAgICAgICAgaWYgKCFyZW5kZXJTdXJmYWNl LT5tX2xheWVyTGlzdC5zaXplKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBp ZiAoIXJlbmRlclN1cmZhY2UtPm1fZHJhd09wYWNpdHkpCisgICAgICAgICAgICBjb250aW51ZTsK KwogICAgICAgICBMYXllckxpc3QmIGxheWVyTGlzdCA9IHJlbmRlclN1cmZhY2UtPm1fbGF5ZXJM aXN0OwogICAgICAgICBBU1NFUlQobGF5ZXJMaXN0LnNpemUoKSk7CiAgICAgICAgIGZvciAodW5z aWduZWQgbGF5ZXJJbmRleCA9IDA7IGxheWVySW5kZXggPCBsYXllckxpc3Quc2l6ZSgpOyArK2xh eWVySW5kZXgpIHsKQEAgLTQ0NSw2ICs0NTMsOSBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1 bTo6cGFpbnRMYXllckNvbnRlbnRzKGNvbnN0IExheWVyTGlzdCYgcmVuZGVyU3VyZmFjZUxheQog CiAgICAgICAgICAgICBsYXllci0+c2V0TGF5ZXJSZW5kZXJlcih0aGlzKTsKIAorICAgICAgICAg ICAgaWYgKCFsYXllci0+b3BhY2l0eSgpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAg ICAgICAgICAgICBpZiAobGF5ZXItPm1hc2tMYXllcigpKQogICAgICAgICAgICAgICAgIGxheWVy LT5tYXNrTGF5ZXIoKS0+c2V0TGF5ZXJSZW5kZXJlcih0aGlzKTsKICAgICAgICAgICAgIGlmIChs YXllci0+cmVwbGljYUxheWVyKCkpIHsKQEAgLTUyNCwxNCArNTM1LDIzIEBAIHZvaWQgTGF5ZXJS ZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IExheWVyTGlzdCYgcmVuZGVyU3VyZmFj ZUxheWVyTGlzdCkKICAgICAvLyBjb3JyZWN0IG9yZGVyLgogICAgIGZvciAoaW50IHN1cmZhY2VJ bmRleCA9IHJlbmRlclN1cmZhY2VMYXllckxpc3Quc2l6ZSgpIC0gMTsgc3VyZmFjZUluZGV4ID49 IDAgOyAtLXN1cmZhY2VJbmRleCkgewogICAgICAgICBDQ0xheWVySW1wbCogcmVuZGVyU3VyZmFj ZUxheWVyID0gcmVuZGVyU3VyZmFjZUxheWVyTGlzdFtzdXJmYWNlSW5kZXhdLmdldCgpOwotICAg ICAgICBBU1NFUlQocmVuZGVyU3VyZmFjZUxheWVyLT5yZW5kZXJTdXJmYWNlKCkpOworICAgICAg ICBSZW5kZXJTdXJmYWNlQ2hyb21pdW0qIHJlbmRlclN1cmZhY2UgPSByZW5kZXJTdXJmYWNlTGF5 ZXItPnJlbmRlclN1cmZhY2UoKTsKKyAgICAgICAgQVNTRVJUKHJlbmRlclN1cmZhY2UpOworCisg ICAgICAgIHJlbmRlclN1cmZhY2UtPm1fc2tpcHNEcmF3ID0gdHJ1ZTsKIAogICAgICAgICAvLyBS ZW5kZXIgc3VyZmFjZXMgd2hvc2UgZHJhd2FibGUgYXJlYSBoYXMgemVybyB3aWR0aCBvciBoZWln aHQKICAgICAgICAgLy8gd2lsbCBoYXZlIG5vIGxheWVycyBhc3NvY2lhdGVkIHdpdGggdGhlbSBh bmQgc2hvdWxkIGJlIHNraXBwZWQuCi0gICAgICAgIGlmICghcmVuZGVyU3VyZmFjZUxheWVyLT5y ZW5kZXJTdXJmYWNlKCktPm1fbGF5ZXJMaXN0LnNpemUoKSkKKyAgICAgICAgaWYgKCFyZW5kZXJT dXJmYWNlLT5tX2xheWVyTGlzdC5zaXplKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg ICAgICBpZiAodXNlUmVuZGVyU3VyZmFjZShyZW5kZXJTdXJmYWNlTGF5ZXItPnJlbmRlclN1cmZh Y2UoKSkpIHsKKyAgICAgICAgLy8gU2tpcCBjb21wbGV0ZWx5IHRyYW5zcGFyZW50IHJlbmRlciBz dXJmYWNlcy4KKyAgICAgICAgaWYgKCFyZW5kZXJTdXJmYWNlLT5tX2RyYXdPcGFjaXR5KQorICAg ICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgaWYgKHVzZVJlbmRlclN1cmZhY2UocmVuZGVy U3VyZmFjZSkpIHsKKyAgICAgICAgICAgIHJlbmRlclN1cmZhY2UtPm1fc2tpcHNEcmF3ID0gZmFs c2U7CisKICAgICAgICAgICAgIGlmIChyZW5kZXJTdXJmYWNlTGF5ZXIgIT0gcm9vdERyYXdMYXll cikgewogICAgICAgICAgICAgICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZGlz YWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7CiAgICAgICAgICAgICAgICAg R0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDAsIDApKTsK QEAgLTUzOSwxMCArNTU5LDkgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXll cnMoY29uc3QgTGF5ZXJMaXN0JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0KQogICAgICAgICAgICAg ICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4 dDNEOjpTQ0lTU09SX1RFU1QpKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgTGF5ZXJM aXN0JiBsYXllckxpc3QgPSByZW5kZXJTdXJmYWNlTGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+bV9s YXllckxpc3Q7Ci0gICAgICAgICAgICBBU1NFUlQobGF5ZXJMaXN0LnNpemUoKSk7CisgICAgICAg ICAgICBMYXllckxpc3QmIGxheWVyTGlzdCA9IHJlbmRlclN1cmZhY2UtPm1fbGF5ZXJMaXN0Owog ICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBsYXllckluZGV4ID0gMDsgbGF5ZXJJbmRleCA8IGxh eWVyTGlzdC5zaXplKCk7ICsrbGF5ZXJJbmRleCkKLSAgICAgICAgICAgICAgICBkcmF3TGF5ZXIo bGF5ZXJMaXN0W2xheWVySW5kZXhdLmdldCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPnJlbmRlclN1 cmZhY2UoKSk7CisgICAgICAgICAgICAgICAgZHJhd0xheWVyKGxheWVyTGlzdFtsYXllckluZGV4 XS5nZXQoKSwgcmVuZGVyU3VyZmFjZSk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTc5OCw5ICs4 MTcsMTIgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVByb3BlcnRpZXNBbmRS ZW5kZXJTdXJmYWNlcyhDQ0xheWVySW1wbCogbGF5ZXIKIAogICAgIC8vIGRyYXdhYmxlQ29udGVu dFJlY3QoKSBpcyBhbHdheXMgc3RvcmVkIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGUK ICAgICAvLyBSZW5kZXJTdXJmYWNlIHRoZSBsYXllciBkcmF3cyBpbnRvLgotICAgIGlmIChsYXll ci0+ZHJhd3NDb250ZW50KCkpCi0gICAgICAgIGxheWVyLT5zZXREcmF3YWJsZUNvbnRlbnRSZWN0 KHRyYW5zZm9ybWVkTGF5ZXJSZWN0KTsKLSAgICBlbHNlCisgICAgaWYgKGxheWVyLT5kcmF3c0Nv bnRlbnQoKSkgeworICAgICAgICBJbnRSZWN0IGRyYXdhYmxlQ29udGVudFJlY3QgPSB0cmFuc2Zv cm1lZExheWVyUmVjdDsKKyAgICAgICAgaWYgKGxheWVyLT51c2VzTGF5ZXJTY2lzc29yKCkpCisg ICAgICAgICAgICBkcmF3YWJsZUNvbnRlbnRSZWN0LmludGVyc2VjdChsYXllci0+c2Npc3NvclJl Y3QoKSk7CisgICAgICAgIGxheWVyLT5zZXREcmF3YWJsZUNvbnRlbnRSZWN0KGRyYXdhYmxlQ29u dGVudFJlY3QpOworICAgIH0gZWxzZQogICAgICAgICBsYXllci0+c2V0RHJhd2FibGVDb250ZW50 UmVjdChJbnRSZWN0KCkpOwogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggc3VibGF5ZXJNYXRy aXggPSBsYXllci0+ZHJhd1RyYW5zZm9ybSgpOwpAQCAtODYzLDggKzg4NSwxMCBAQCB2b2lkIExh eWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUHJvcGVydGllc0FuZFJlbmRlclN1cmZhY2VzKEND TGF5ZXJJbXBsKiBsYXllcgogICAgICAgICAvLyBEb24ndCBjbGlwIGlmIHRoZSBsYXllciBpcyBy ZWZsZWN0ZWQgYXMgdGhlIHJlZmxlY3Rpb24gc2hvdWxkbid0IGJlCiAgICAgICAgIC8vIGNsaXBw ZWQuCiAgICAgICAgIGlmICghbGF5ZXItPnJlcGxpY2FMYXllcigpKSB7Ci0gICAgICAgICAgICBp ZiAoIWxheWVyLT5zY2lzc29yUmVjdCgpLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICByZW5k ZXJTdXJmYWNlLT5tX2NvbnRlbnRSZWN0LmludGVyc2VjdChsYXllci0+c2Npc3NvclJlY3QoKSk7 CisgICAgICAgICAgICBpZiAoIXJlbmRlclN1cmZhY2UtPm1fc2Npc3NvclJlY3QuaXNFbXB0eSgp ICYmICFyZW5kZXJTdXJmYWNlLT5tX2NvbnRlbnRSZWN0LmlzRW1wdHkoKSkgeworICAgICAgICAg ICAgICAgIEludFJlY3Qgc3VyZmFjZVNjaXNzb3JSZWN0ID0gY2FsY3VsYXRlVmlzaWJsZVJlY3Qo cmVuZGVyU3VyZmFjZS0+bV9zY2lzc29yUmVjdCwgcmVuZGVyU3VyZmFjZS0+bV9jb250ZW50UmVj dCwgcmVuZGVyU3VyZmFjZS0+bV9vcmlnaW5UcmFuc2Zvcm0pOworICAgICAgICAgICAgICAgIHJl bmRlclN1cmZhY2UtPm1fY29udGVudFJlY3QuaW50ZXJzZWN0KHN1cmZhY2VTY2lzc29yUmVjdCk7 CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBGbG9hdFBvaW50IGNsaXBwZWRTdXJmYWNlQ2Vu dGVyID0gcmVuZGVyU3VyZmFjZS0+Y29udGVudFJlY3RDZW50ZXIoKTsKICAgICAgICAgICAgIGNl bnRlck9mZnNldER1ZVRvQ2xpcHBpbmcgPSBjbGlwcGVkU3VyZmFjZUNlbnRlciAtIHN1cmZhY2VD ZW50ZXI7CiAgICAgICAgIH0KQEAgLTkwOSw3ICs5MzMsNyBAQCB2b2lkIExheWVyUmVuZGVyZXJD aHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhjb25zdCBMYXllckxpc3QmIHJlbmRl clN1cgogICAgICAgICBSZW5kZXJTdXJmYWNlQ2hyb21pdW0qIHJlbmRlclN1cmZhY2UgPSByZW5k ZXJTdXJmYWNlTGF5ZXItPnJlbmRlclN1cmZhY2UoKTsKICAgICAgICAgQVNTRVJUKHJlbmRlclN1 cmZhY2UpOwogCi0gICAgICAgIGlmICghcmVuZGVyU3VyZmFjZS0+bV9sYXllckxpc3Quc2l6ZSgp KQorICAgICAgICBpZiAoIXJlbmRlclN1cmZhY2UtPm1fbGF5ZXJMaXN0LnNpemUoKSB8fCAhcmVu ZGVyU3VyZmFjZS0+bV9kcmF3T3BhY2l0eSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAg ICAgIExheWVyTGlzdCYgbGF5ZXJMaXN0ID0gcmVuZGVyU3VyZmFjZS0+bV9sYXllckxpc3Q7CkBA IC05MzEsNiArOTU1LDkgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUNvbXBv c2l0b3JSZXNvdXJjZXMoQ0NMYXllckltcGwqIGNjTGF5ZXJJbXBsKQogICAgIGlmIChsYXllci0+ Ym91bmRzKCkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoIWxheWVyLT5v cGFjaXR5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChsYXllci0+bWFza0xheWVyKCkp CiAgICAgICAgIHVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoY2NMYXllckltcGwtPm1hc2tMYXll cigpKTsKICAgICBpZiAobGF5ZXItPnJlcGxpY2FMYXllcigpKQpAQCAtMTAxNywxOSArMTA0NCwy MiBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVyKENDTGF5ZXJJbXBsKiBs YXllciwgUmVuZGVyU3VyZmFjZUNocm9taXVtKgogICAgIGlmICghbGF5ZXItPmRyYXdzQ29udGVu dCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoIWxheWVyLT5vcGFjaXR5KCkpCisgICAg ICAgIHJldHVybjsKKwogICAgIGlmIChsYXllci0+Ym91bmRzKCkuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAobGF5ZXItPnVzZXNMYXllclNjaXNzb3IoKSkKLSAgICAgICAg c2V0U2Npc3NvclRvUmVjdChsYXllci0+c2Npc3NvclJlY3QoKSk7Ci0gICAgZWxzZQotICAgICAg ICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0 M0Q6OlNDSVNTT1JfVEVTVCkpOwotICAgIAogICAgIEludFJlY3QgdGFyZ2V0U3VyZmFjZVJlY3Qg PSBsYXllci0+dGFyZ2V0UmVuZGVyU3VyZmFjZSgpID8gbGF5ZXItPnRhcmdldFJlbmRlclN1cmZh Y2UoKS0+Y29udGVudFJlY3QoKSA6IG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPmNvbnRlbnRSZWN0 KCk7CiAgICAgaWYgKGxheWVyLT51c2VzTGF5ZXJTY2lzc29yKCkpIHsKICAgICAgICAgSW50UmVj dCBzY2lzc29yUmVjdCA9IGxheWVyLT5zY2lzc29yUmVjdCgpOwogICAgICAgICB0YXJnZXRTdXJm YWNlUmVjdC5pbnRlcnNlY3Qoc2Npc3NvclJlY3QpOwotICAgIH0KKyAgICAgICAgaWYgKHRhcmdl dFN1cmZhY2VSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgc2V0 U2Npc3NvclRvUmVjdChzY2lzc29yUmVjdCk7CisgICAgfSBlbHNlCisgICAgICAgIEdMQyhtX2Nv bnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NP Ul9URVNUKSk7CisKIAogICAgIC8vIEZJWE1FOiBOZWVkIHRvIHRha2UgaW50byBhY2NvdW50IHRo ZSBjb21tdWxhdGl2ZSByZW5kZXIgc3VyZmFjZSB0cmFuc2Zvcm1zIGFsbCB0aGUgd2F5IGZyb20K ICAgICAvLyAgICAgICAgdGhlIGRlZmF1bHQgcmVuZGVyIHN1cmZhY2UgaW4gb3JkZXIgdG8gZGV0 ZXJtaW5lIHZpc2liaWxpdHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUmVuZGVyU3VyZmFjZUNocm9taXVtLmNwcApp bmRleCBiOTYxZTQ3ZTVjMmY1MTM1NDJkYzg4YmFlNWIwMGY4MWE5ZjA1Y2MxLi4yNzc2Y2M1MWJh MWM4NTQ3ZDMwNmI5ZjE4Y2EyNTRkMzE3YmFkYTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JlbmRlclN1cmZh Y2VDaHJvbWl1bS5jcHAKQEAgLTQzLDYgKzQzLDcgQEAgUmVuZGVyU3VyZmFjZUNocm9taXVtOjpS ZW5kZXJTdXJmYWNlQ2hyb21pdW0oQ0NMYXllckltcGwqIG93bmluZ0xheWVyKQogICAgIDogbV9v d25pbmdMYXllcihvd25pbmdMYXllcikKICAgICAsIG1fbWFza0xheWVyKDApCiAgICAgLCBtX3Nr aXBzRHJhdyhmYWxzZSkKKyAgICAsIG1fZHJhd09wYWNpdHkoMSkKIHsKIH0KIAo=