53724 2011-02-03 15:15:14 -0800 Change DidSetSize to take a LayerTreeContext parameter 2011-02-03 15:38:46 -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 345051 0 andersca 2011-02-03 15:15:14 -0800 Change DidSetSize to take a LayerTreeContext parameter 345053 1 81124 andersca 2011-02-03 15:19:56 -0800 Created attachment 81124 Patch 345063 2 81124 mitz 2011-02-03 15:34:52 -0800 Comment on attachment 81124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81124&action=review > Source/WebKit2/Shared/mac/LayerTreeContextMac.mm:63 > + return a.contextID == b.contextID; What guarantees that a contextID will not be reused for the lifetime of a LayerTreeContext that contains it? 345066 3 andersca 2011-02-03 15:38:46 -0800 Committed r77546: <http://trac.webkit.org/changeset/77546> 81124 2011-02-03 15:19:56 -0800 2011-02-03 15:34:52 -0800 Patch bug-53724-20110203151954.patch text/plain 10819 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NTM4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTEtMDItMDMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgRGlkU2V0U2l6ZSB0byB0YWtlIGEgTGF5ZXJU cmVlQ29udGV4dCBwYXJhbWV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUzNzI0CisKKyAgICAgICAgU2luY2UgU2V0U2l6ZSBjYW4gY2F1c2UgbGF5 b3V0IHRvIGhhcHBlbiwgd2UgbmVlZCB0byBwYXNzIGFsb25nIGEgbGF5ZXIgdHJlZSBjb250ZXh0 IHRvIAorICAgICAgICB0aGUgRGlkU2V0U2l6ZSBtZXNzYWdlIHNvIHRoZSBVSSBwcm9jZXNzIGNh biBlbnRlci9leGl0IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUgYXBwcm9wcmlhdGVseS4K KyAgICAgICAgCisgICAgICAgICogU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaDoKKyAgICAgICAg KiBTaGFyZWQvbWFjL0xheWVyVHJlZUNvbnRleHRNYWMubW06CisgICAgICAgIEFkZCBlcXVhbGl0 eSBvcGVyYXRvcnMgdG8gTGF5ZXJUcmVlQ29udGV4dC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk6OmRp ZFNldFNpemUpOgorICAgICAgICBUaGlzIG5vdyB0YWtlcyBhIExheWVyVHJlZUNvbnRleHQgcGFy YW1ldGVyLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5t ZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIExheWVyVHJlZUNvbnRleHQgcGFyYW1ldGVyLgorCisg ICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcDoKKyAgICAgICAgR2V0 IHJpZCBvZiBtX2lzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSBhbmQgdXNlIHRoZSBjdXJy ZW50IGxheWVyIGNvbnRleHQgaW5zdGVhZC4KKworICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl YVByb3h5SW1wbDo6cGFpbnQpOgorICAgICAgICBCYWlsIGlmIHRoZSBjYWxsIHRvIERpZFNldFNp emUgZW5kZWQgdXAgZW50ZXJpbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZS4KKworICAg ICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkU2V0U2l6ZSk6CisgICAgICAg IElmIHRoZSBuZXcgbGF5ZXIgdHJlZSBjb250ZXh0IGlzIGRpZmZlcmVudCwgZW50ZXIvZXhpdCBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZyBtb2RlIGFjY29yZGluZ2x5LgorCisgICAgICAgIChXZWJL aXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2Rl KToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIFVwZGF0ZSB0aGUgbGF5ZXIgdHJlZSBjb250ZXh0 LgorCisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmg6CisgICAgICAg IChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjppc0luQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUpOgorICAgICAgICBBZGQgc2ltcGxlIGdldHRlci4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5n QXJlYUltcGw6OnNldFNpemUpOgorICAgICAgICBQYXNzIGFsb25nIHRoZSBsYXllciB0cmVlIGNv bnRleHQuCisKIDIwMTEtMDItMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291cmNlL1dl YktpdDIvU2hhcmVkL0xheWVyVHJlZUNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCShyZXZpc2lvbiA3NzUzNCkKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUw LDYgKzUwLDEzIEBAIHB1YmxpYzoKICNlbmRpZgogfTsKIAorYm9vbCBvcGVyYXRvcj09KGNvbnN0 IExheWVyVHJlZUNvbnRleHQmLCBjb25zdCBMYXllclRyZWVDb250ZXh0Jik7CisKK2lubGluZSBi b29sIG9wZXJhdG9yIT0oY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgYSwgY29uc3QgTGF5ZXJUcmVl Q29udGV4dCYgYikKK3sKKyAgICByZXR1cm4gIShhID09IGIpOworfQorCiB9OwogCiAjZW5kaWYg Ly8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpJbmRleDogU291cmNlL1dlYktpdDIvU2hh cmVkL21hYy9MYXllclRyZWVDb250ZXh0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9tYWMvTGF5ZXJUcmVlQ29udGV4dE1hYy5tbQkocmV2aXNpb24gNzc1MzQpCisr KyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0xheWVyVHJlZUNvbnRleHRNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTU4LDQgKzU4LDkgQEAgYm9vbCBMYXllclRyZWVDb250ZXh0Ojppc0VtcHR5 KCkgY29uc3QKICAgICByZXR1cm4gIWNvbnRleHRJRDsKIH0KIAorYm9vbCBvcGVyYXRvcj09KGNv bnN0IExheWVyVHJlZUNvbnRleHQmIGEsIGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGIpCit7Cisg ICAgcmV0dXJuIGEuY29udGV4dElEID09IGIuY29udGV4dElEOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHkuaAkocmV2aXNpb24gNzc1MzMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2lu Z0FyZWFQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5Nyw3IEBAIHByaXZhdGU6CiAg ICAgLy8gQ29yZUlQQyBtZXNzYWdlIGhhbmRsZXJzLgogICAgIC8vIEZJWE1FOiBUaGVzZSBzaG91 bGQgYmUgcHVyZSB2aXJ0dWFsLgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUodWludDY0X3Qgc2Vx dWVuY2VOdW1iZXIsIGNvbnN0IFVwZGF0ZUluZm8mKSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlk U2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29uc3QgVXBkYXRlSW5mbyYpIHsgfQor ICAgIHZpcnR1YWwgdm9pZCBkaWRTZXRTaXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBjb25z dCBVcGRhdGVJbmZvJiwgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpIHsgfQogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICB2aXJ0dWFsIHZvaWQgZW50ZXJBY2NlbGVyYXRlZENv bXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29uc3QgTGF5ZXJUcmVlQ29u dGV4dCYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIpIHsgfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9u IDc3NTMzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkubWVz c2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIyLDcgKzIyLDcgQEAKIAogbWVzc2FnZXMgLT4g RHJhd2luZ0FyZWFQcm94eSB7CiAgICAgVXBkYXRlKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBX ZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRlSW5mbykKLSAgICBEaWRTZXRTaXplKHVpbnQ2NF90IHNl cXVlbmNlTnVtYmVyLCBXZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRlSW5mbykKKyAgICBEaWRTZXRT aXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBXZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRlSW5m bywgV2ViS2l0OjpMYXllclRyZWVDb250ZXh0IGNvbnRleHQpCiAKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAgICAgRW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50 NjRfdCBzZXF1ZW5jZU51bWJlciwgV2ViS2l0OjpMYXllclRyZWVDb250ZXh0IGNvbnRleHQpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1w bC5jcHAJKHJldmlzaW9uIDc3NTM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHlJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNiBAQCBQYXNz T3duUHRyPERyYXdpbmdBcmVhUHJveHlJbXBsPiBEcmF3aW5nCiBEcmF3aW5nQXJlYVByb3h5SW1w bDo6RHJhd2luZ0FyZWFQcm94eUltcGwoV2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiAgICAg OiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhSW5mbzo6SW1wbCwgd2ViUGFnZVByb3h5KQog ICAgICwgbV9pc1dhaXRpbmdGb3JEaWRTZXRTaXplKGZhbHNlKQotICAgICwgbV9pc0luQWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUoZmFsc2UpCiAgICAgLCBtX2xhc3REaWRTZXRTaXplU2VxdWVu Y2VOdW1iZXIoMCkKIHsKIH0KQEAgLTY2LDcgKzY1LDcgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5 SW1wbDo6cGFpbnQoQmFja2luZwogICAgIGlmICghbV9iYWNraW5nU3RvcmUpCiAgICAgICAgIHJl dHVybjsKIAotICAgIEFTU0VSVCghbV9pc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOwor ICAgIEFTU0VSVCghaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpOwogCiAgICAgaWYg KG1faXNXYWl0aW5nRm9yRGlkU2V0U2l6ZSkgewogICAgICAgICBpZiAoIW1fd2ViUGFnZVByb3h5 LT5pc1ZhbGlkKCkpCkBAIC03OSw2ICs3OCwxMCBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBs OjpwYWludChCYWNraW5nCiAgICAgICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPmNvbm5l Y3Rpb24oKS0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OkRyYXdpbmdB cmVhUHJveHk6OkRpZFNldFNpemU+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSwgZGlkU2V0U2l6 ZVRpbWVvdXQpOwogICAgIH0KIAorICAgIC8vIERpc3BhdGNoaW5nIERpZFNldFNpemUgY291bGQg Y2hhbmdlIHRoZSBjb21wb3NpdGluZyBtb2RlLCByZXR1cm4gaWYgdGhhdCBoYXBwZW5zLgorICAg IGlmIChpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSkKKyAgICAgICAgcmV0dXJuOwor CiAgICAgbV9iYWNraW5nU3RvcmUtPnBhaW50KGNvbnRleHQsIHJlY3QpOwogICAgIHVucGFpbnRl ZFJlZ2lvbi5zdWJ0cmFjdChJbnRSZWN0KEludFBvaW50KCksIG1fYmFja2luZ1N0b3JlLT5zaXpl KCkpKTsKIH0KQEAgLTE0MSw3ICsxNDQsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp1 cGRhdGUodWludDY0CiAgICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdl czo6RHJhd2luZ0FyZWE6OkRpZFVwZGF0ZSgpLCBtX3dlYlBhZ2VQcm94eS0+cGFnZUlEKCkpOwog fQogCi12b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpkaWRTZXRTaXplKHVpbnQ2NF90IHNlcXVl bmNlTnVtYmVyLCBjb25zdCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvKQordm9pZCBEcmF3aW5nQXJl YVByb3h5SW1wbDo6ZGlkU2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29uc3QgVXBk YXRlSW5mbyYgdXBkYXRlSW5mbywgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29u dGV4dCkKIHsKICAgICBBU1NFUlQoc2VxdWVuY2VOdW1iZXIgPiBtX2xhc3REaWRTZXRTaXplU2Vx dWVuY2VOdW1iZXIpOwogICAgIG1fbGFzdERpZFNldFNpemVTZXF1ZW5jZU51bWJlciA9IHNlcXVl bmNlTnVtYmVyOwpAQCAtMTUyLDcgKzE1NSwxOSBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBs OjpkaWRTZXRTaXplKHVpCiAgICAgaWYgKG1fc2l6ZSAhPSB1cGRhdGVJbmZvLnZpZXdTaXplKQog ICAgICAgICBzZW5kU2V0U2l6ZSgpOwogCi0gICAgaWYgKG1faXNJbkFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKSB7CisgICAgaWYgKGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRyZWVDb250 ZXh0KSB7CisgICAgICAgIGlmICghbV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgeworICAg ICAgICAgICAgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CisgICAgICAgICAgICBB U1NFUlQobV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSk7CisgICAgICAgIH0KKworICAgICAg ICBpZiAoIWxheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBlbnRlckFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGxheWVyVHJlZUNvbnRleHQpOworICAgICAgICAgICAg QVNTRVJUKGxheWVyVHJlZUNvbnRleHQgPT0gbV9sYXllclRyZWVDb250ZXh0KTsKKyAgICAgICAg fSAgICAgICAgICAgIAorICAgIH0KKworICAgIGlmIChpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUoKSkgewogICAgICAgICBBU1NFUlQoIW1fYmFja2luZ1N0b3JlKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTE3OSw3ICsxOTQsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBs OjpleGl0QWNjZWxlcmF0CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmluY29ycG9yYXRl VXBkYXRlKGNvbnN0IFVwZGF0ZUluZm8mIHVwZGF0ZUluZm8pCiB7Ci0gICAgQVNTRVJUKCFtX2lz SW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk7CisgICAgQVNTRVJUKCFpc0luQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoKSk7CiAKICAgICBpZiAodXBkYXRlSW5mby51cGRhdGVSZWN0Qm91 bmRzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjE1LDE4ICsyMzAsMTggQEAgdm9p ZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2VuZFNldFNpemUoKQogCiB2b2lkIERyYXdpbmdBcmVh UHJveHlJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJl ZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQpCiB7Ci0gICAgQVNTRVJUKCFtX2lzSW5BY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSk7Ci0gICAgbV9pc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUgPSB0cnVlOwotICAgIAorICAgIEFTU0VSVCghaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKCkpOworCiAgICAgbV9iYWNraW5nU3RvcmUgPSBudWxscHRyOworICAgIG1fbGF5ZXJUcmVl Q29udGV4dCA9IGxheWVyVHJlZUNvbnRleHQ7CiAgICAgbV93ZWJQYWdlUHJveHktPmVudGVyQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobGF5ZXJUcmVlQ29udGV4dCk7CiB9CiAKIHZvaWQgRHJh d2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpCiB7Ci0g ICAgQVNTRVJUKG1faXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKTsKLSAgICBtX2lzSW5B Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSA9IGZhbHNlOwotICAgIAorICAgIEFTU0VSVChpc0lu QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSk7CisKKyAgICBtX2xheWVyVHJlZUNvbnRleHQg PSBMYXllclRyZWVDb250ZXh0KCk7ICAgIAogICAgIG1fd2ViUGFnZVByb3h5LT5leGl0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgJKHJldmlzaW9uIDc3NTM0KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkJhY2tpbmdTdG9yZS5oIgogI2luY2x1 ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJMYXllclRyZWVDb250ZXh0LmgiCiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC01NSw3ICs1Niw3IEBAIHByaXZhdGU6CiAKICAgICAv LyBDb3JlSVBDIG1lc3NhZ2UgaGFuZGxlcnMKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlKHVpbnQ2 NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBVcGRhdGVJbmZvJik7Ci0gICAgdmlydHVhbCB2b2lk IGRpZFNldFNpemUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIsIGNvbnN0IFVwZGF0ZUluZm8mKTsK KyAgICB2aXJ0dWFsIHZvaWQgZGlkU2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29u c3QgVXBkYXRlSW5mbyYsIGNvbnN0IExheWVyVHJlZUNvbnRleHQmKTsKICAgICB2aXJ0dWFsIHZv aWQgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJl ciwgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOwogICAgIHZpcnR1YWwgdm9pZCBleGl0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIpOwogCkBAIC02NSwx MyArNjYsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOwogICAgIHZvaWQgZXhpdEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdNb2RlKCk7CiAKKyAgICBib29sIGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZSgpIGNvbnN0IHsgcmV0dXJuICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CisK KyAgICAvLyBUaGUgY3VycmVudCBsYXllciB0cmVlIGNvbnRleHQuCisgICAgTGF5ZXJUcmVlQ29u dGV4dCBtX2xheWVyVHJlZUNvbnRleHQ7CisgICAgCiAgICAgLy8gV2hldGhlciB3ZSd2ZSBzZW50 IGEgU2V0U2l6ZSBtZXNzYWdlIGFuZCBhcmUgbm93IHdhaXRpbmcgZm9yIGEgRGlkU2V0U2l6ZSBt ZXNzYWdlLgogICAgIC8vIFVzZWQgdG8gdGhyb3R0bGUgU2V0U2l6ZSBtZXNzYWdlcyBzbyB3ZSBk b24ndCBzZW5kIHRoZW0gZmFzdGVyIHRoYW4gdGhlIFdlYiBwcm9jZXNzIGNhbiBoYW5kbGUuCiAg ICAgYm9vbCBtX2lzV2FpdGluZ0ZvckRpZFNldFNpemU7CiAKLSAgICAvLyBXaGV0aGVyIHdlJ3Jl IGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUgb3Igbm90LgotICAgIGJvb2wgbV9pc0lu QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGU7Ci0KICAgICAvLyBUaGUgc2VxdWVuY2UgbnVtYmVy IG9mIHRoZSBsYXN0IERpZFNldFNpemUgbWVzc2FnZQogICAgIHVpbnQ2NF90IG1fbGFzdERpZFNl dFNpemVTZXF1ZW5jZU51bWJlcjsKIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJKHJldmlzaW9uIDc3NTMzKQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE4MywxMyArMTgzLDE3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBs OjpzZXRTaXplKGNvbnN0IEludFMKICAgICBtX3dlYlBhZ2UtPmxheW91dElmTmVlZGVkKCk7CiAK ICAgICBVcGRhdGVJbmZvIHVwZGF0ZUluZm87CisgICAgTGF5ZXJUcmVlQ29udGV4dCBsYXllclRy ZWVDb250ZXh0OworCisgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkKKyAgICAgICAgbGF5ZXJUcmVl Q29udGV4dCA9IG1fbGF5ZXJUcmVlSG9zdC0+bGF5ZXJUcmVlQ29udGV4dCgpOwogCiAgICAgaWYg KG1faXNQYWludGluZ1N1c3BlbmRlZCB8fCBtX2xheWVyVHJlZUhvc3QpIHsKICAgICAgICAgdXBk YXRlSW5mby52aWV3U2l6ZSA9IG1fd2ViUGFnZS0+c2l6ZSgpOwogICAgIH0gZWxzZQogICAgICAg ICBkaXNwbGF5KHVwZGF0ZUluZm8pOwogCi0gICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpE cmF3aW5nQXJlYVByb3h5OjpEaWRTZXRTaXplKGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKSwgdXBk YXRlSW5mbykpOworICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94 eTo6RGlkU2V0U2l6ZShnZW5lcmF0ZVNlcXVlbmNlTnVtYmVyKCksIHVwZGF0ZUluZm8sIGxheWVy VHJlZUNvbnRleHQpKTsKIAogICAgIG1faW5TZXRTaXplID0gZmFsc2U7CiB9Cg==