80843 2012-03-12 08:34:28 -0700 [TexMap] Reuse textures following the same rules as they do internally. 2012-03-16 03:22:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte noam oldest_to_newest 576142 0 jturcotte 2012-03-12 08:34:28 -0700 [TexMap] Remove the texture pool. 576145 1 131328 jturcotte 2012-03-12 08:35:55 -0700 Created attachment 131328 Patch 579432 2 131328 noam 2012-03-15 09:17:24 -0700 Comment on attachment 131328 Patch When drawing the same scene over and over again, you'd have intermediate surfaces with the same size. Thus, the texture-pool can be really helpful. Not sure about the benefit of this patch. 579671 3 jturcotte 2012-03-15 13:21:11 -0700 I assumed that creating textures or is negligible but it's different for surfaces as they can get recreated for every rendered frames, along with their FBO. I'm uploading a patch that fixes the logic for texture reuse instead and keep the behavior. 579675 4 132109 jturcotte 2012-03-15 13:25:06 -0700 Created attachment 132109 Patch 580330 5 jturcotte 2012-03-16 03:22:13 -0700 Committed r110979: <http://trac.webkit.org/changeset/110979> 131328 2012-03-12 08:35:55 -0700 2012-03-15 13:24:51 -0700 Patch bug-80843-20120312163500.patch text/plain 6018 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI0ZDlmM2MxZjY1MGE2 MTgyMzczM2NiNDU0ZjAxNDkzZWYwMGE4NS4uZjNmYjcxYTNjZjU1NzE3OGRjM2IxMDhhNWM2MjUx MWU1YTExZTYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAzLTEyICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1Rl eE1hcF0gUmVtb3ZlIHRoZSB0ZXh0dXJlIHBvb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSB0ZXh0dXJlIHBvb2wgaXMgY3VycmVudGx5IG9ubHkg dXNlZCBmb3IgaW50ZXJtZWRpYXRlIHN1cmZhY2VzCisgICAgICAgIGFuZCB3aWxsIHJlbHkgb24g aGF2aW5nIHRoZSBzYW1lIHRleHR1cmUgc2l6ZSBmb3IgdGhlaXIgZGVzdGluYXRpb24KKyAgICAg ICAgZm9yIGl0IHRvIGhhdmUgYW55IGJlbmVmaWNpYWwgZWZmZWN0LgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpC aXRtYXBUZXh0dXJlOjpyZXNldCk6CisgICAgICAgIChUZXh0dXJlTWFwcGVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmFwcGx5RmlsdGVycyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFw cGVyTGF5ZXI6OnBhaW50UmVjdXJzaXZlKToKKwogMjAxMi0wMy0xMiAgSWx5YSBUaWtob25vdnNr eSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmUtYXBwbHkgdGhlIHBhdGNoIGFm dGVyIHY4IHJvbGwgdG8gcjExMDAwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwCmluZGV4IDU4ZTRmNTk0YzFl N2M1ZGZmMDFlNTdhNDU3ODVmZmUwMDgwMmQyMjkuLjU0MTdkNmY1MzEwYzlkMDFmODkyZjVhMjcy ZjkxZTZhMTQ5ZmI2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5jcHAKQEAgLTI2LDUzICsyNiw2IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBUZXh0dXJl TWFwcGVyOjphY3F1aXJlVGV4dHVyZUZyb21Qb29sKGNvbnN0IEludFNpemUmIHNpemUpCi17Ci0g ICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IHNlbGVjdGVkVGV4dHVyZTsKLQotICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgbV90ZXh0dXJlUG9vbC5zaXplKCk7ICsraSkgewotICAgICAgICBSZWZQ dHI8Qml0bWFwVGV4dHVyZT4mIHRleHR1cmUgPSBtX3RleHR1cmVQb29sW2ldOwotCi0gICAgICAg IC8vIElmIHRoZSBzdXJmYWNlIGhhcyBvbmx5IG9uZSByZWZlcmVuY2UgKHRoZSBvbmUgaW4gbV90 ZXh0dXJlUG9vbCksIHdlIGNhbiBzYWZlbHkgcmV1c2UgaXQuCi0gICAgICAgIGlmICh0ZXh0dXJl LT5yZWZDb3VudCgpID4gMSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIC8vIFdl IGRlZmF1bHQgdG8gdGhlIGZpcnN0IGF2YWlsYWJsZSB0ZXh0dXJlLgotICAgICAgICBpZiAoIXNl bGVjdGVkVGV4dHVyZSkgewotICAgICAgICAgICAgc2VsZWN0ZWRUZXh0dXJlID0gdGV4dHVyZTsK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgSW50U2l6ZSB0ZXh0 dXJlU2l6ZSA9IHRleHR1cmUtPnNpemUoKTsKLSAgICAgICAgSW50U2l6ZSBzZWxlY3RlZFRleHR1 cmVTaXplID0gc2VsZWN0ZWRUZXh0dXJlLT5zaXplKCk7Ci0KLSAgICAgICAgLy8gV2UgcHJlZmVy IHRvIHBpY2sgYSB0ZXh0dXJlIHRoYXQncyBlcXVhbCBvciBsYXJnZXIgdGhhbiB0aGUgcmVxdWVz dGVkIHNpemUuCi0gICAgICAgIGlmICh0ZXh0dXJlU2l6ZS53aWR0aCgpIDwgc2l6ZS53aWR0aCgp IHx8IHRleHR1cmVTaXplLmhlaWdodCgpIDwgc2l6ZS5oZWlnaHQoKSkKLSAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgIC8vIFdlIHNlbGVjdCB0aGUgbmV3IHRleHR1cmUgaWYgdGhlIGN1 cnJlbnRseSBzZWxlY3RlZCB0ZXh0dXJlIGlzIHNtYWxsZXIgdGhhbiB0aGUKLSAgICAgICAgLy8g cmVxdWlyZWQgc2l6ZSwgYW5kIHRoZSBuZXcgdGV4dHVyZSBoYXMgYSBzbWFsbGVyIGFyZWEuCi0g ICAgICAgIGludCB0ZXh0dXJlQXJlYSA9IHRleHR1cmVTaXplLndpZHRoKCkgKiB0ZXh0dXJlU2l6 ZS5oZWlnaHQoKTsKLSAgICAgICAgaW50IHNlbGVjdGVkVGV4dHVyZUFyZWEgPSBzZWxlY3RlZFRl eHR1cmVTaXplLndpZHRoKCkgKiBzZWxlY3RlZFRleHR1cmVTaXplLmhlaWdodCgpOwotICAgICAg ICBib29sIHNlbGVjdGVkVGV4dHVyZUZpdHNTaXplID0KLSAgICAgICAgICAgICAgICBzZWxlY3Rl ZFRleHR1cmVTaXplLndpZHRoKCkgPj0gc2l6ZS53aWR0aCgpCi0gICAgICAgICAgICAgICAgJiYg c2VsZWN0ZWRUZXh0dXJlU2l6ZS5oZWlnaHQoKSA+PSBzaXplLmhlaWdodCgpOwotCi0gICAgICAg IGlmIChzZWxlY3RlZFRleHR1cmVGaXRzU2l6ZSAmJiBzZWxlY3RlZFRleHR1cmVBcmVhIDw9IHRl eHR1cmVBcmVhKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgc2VsZWN0ZWRUZXh0 dXJlID0gdGV4dHVyZTsKLSAgICB9Ci0KLSAgICBpZiAoIXNlbGVjdGVkVGV4dHVyZSkgewotICAg ICAgICBzZWxlY3RlZFRleHR1cmUgPSBjcmVhdGVUZXh0dXJlKCk7Ci0gICAgICAgIG1fdGV4dHVy ZVBvb2wuYXBwZW5kKHNlbGVjdGVkVGV4dHVyZSk7Ci0gICAgfQotCi0gICAgc2VsZWN0ZWRUZXh0 dXJlLT5yZXNldChzaXplLCBmYWxzZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dHVyZTsKLX0K LQogUGFzc093blB0cjxUZXh0dXJlTWFwcGVyPiBUZXh0dXJlTWFwcGVyOjpjcmVhdGUoQWNjZWxl cmF0aW9uTW9kZSBtb2RlKQogewogICAgIGlmIChtb2RlID09IFNvZnR3YXJlTW9kZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlci5oCmluZGV4IDRjMDdjYWI2MzI3MjVkZTliZmFhYzRmZWQ0YThhOGMyMzdhMjM0MzIuLmVk ZDhhZGJjMDM0OTQ1M2I1YjY2YWFlZjc4ZTNmZjFiZjJjZWE0OGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaApA QCAtNzQsNyArNzQsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGludCBicHAoKSBjb25zdCB7 IHJldHVybiAzMjsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRSZXNldCgpIHsgfQotICAgIHZvaWQg cmVzZXQoY29uc3QgSW50U2l6ZSYgc2l6ZSwgRmxhZ3MgZmxhZ3MpCisgICAgdm9pZCByZXNldChj b25zdCBJbnRTaXplJiBzaXplLCBGbGFncyBmbGFncyA9IDApCiAgICAgewogICAgICAgICBtX2Zs YWdzID0gZmxhZ3M7CiAgICAgICAgIG1fY29udGVudFNpemUgPSBzaXplOwpAQCAtMTI4LDkgKzEy OCw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgSW50U2l6ZSBtYXhUZXh0dXJlU2l6ZSgpIGNv bnN0IHsgcmV0dXJuIEludFNpemUoSU5UX01BWCwgSU5UX01BWCk7IH0KIAotICAgIC8vIEEgc3Vy ZmFjZSBpcyByZWxlYXNlZCBpbXBsaWNpdGx5IHdoZW4gZGVyZWZlcmVuY2VkLgotICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBhY3F1aXJlVGV4dHVyZUZyb21Qb29sKGNvbnN0 IEludFNpemUmKTsKLQogcHJvdGVjdGVkOgogICAgIFRleHR1cmVNYXBwZXIoKQogICAgICAgICA6 IG1faW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkRlZmF1bHQpCkBAIC0xNDgsNyAr MTQ1LDYgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIEludGVycG9sYXRpb25RdWFsaXR5IG1faW50 ZXJwb2xhdGlvblF1YWxpdHk7CiAgICAgVGV4dERyYXdpbmdNb2RlRmxhZ3MgbV90ZXh0RHJhd2lu Z01vZGU7Ci0gICAgVmVjdG9yPFJlZlB0cjxCaXRtYXBUZXh0dXJlPiA+IG1fdGV4dHVyZVBvb2w7 CiAgICAgR3JhcGhpY3NDb250ZXh0KiBtX2NvbnRleHQ7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy TGF5ZXIuY3BwCmluZGV4IGRhMGI0MGUzNmEzMjQ4M2VmYzU2ZjdmNmYzZDYzZjdhNWE0ZjIwYzAu LmMzYTZkMDA4ZGZkYjZkOWQ1N2YwODFmZWUzNjcwYThmOTU0YjVjODAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyTGF5ZXIuY3BwCkBAIC0yODMsNyArMjgzLDggQEAgc3RhdGljIFBhc3NSZWZQdHI8Qml0 bWFwVGV4dHVyZT4gYXBwbHlGaWx0ZXJzKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMs IFQKICAgICAgICAgdGFyZ2V0UmVjdC5tb3ZlKHN0ZDo6bWF4KDAsIC1sZWZ0T3V0c2V0KSwgc3Rk OjptYXgoMCwgLXRvcE91dHNldCkpOwogICAgICAgICB0YXJnZXRSZWN0LmV4cGFuZChsZWZ0T3V0 c2V0ICsgcmlnaHRPdXRzZXQsIHRvcE91dHNldCArIGJvdHRvbU91dHNldCk7CiAgICAgICAgIHRh cmdldFJlY3QudW5pdGUodW5maWx0ZXJlZFRhcmdldFJlY3QpOwotICAgICAgICBmaWx0ZXJTdXJm YWNlID0gdGV4dHVyZU1hcHBlci0+YWNxdWlyZVRleHR1cmVGcm9tUG9vbCh0YXJnZXRSZWN0LnNp emUoKSk7CisgICAgICAgIGZpbHRlclN1cmZhY2UgPSB0ZXh0dXJlTWFwcGVyLT5jcmVhdGVUZXh0 dXJlKCk7CisgICAgICAgIGZpbHRlclN1cmZhY2UtPnJlc2V0KHRhcmdldFJlY3Quc2l6ZSgpKTsK ICAgICB9CiAKICAgICBmaWx0ZXJTdXJmYWNlLT5hcHBseUZpbHRlcnMoKnNvdXJjZSwgZmlsdGVy cyk7CkBAIC0zMTQsNyArMzE1LDggQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50UmVj dXJzaXZlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMKICAgICAvLyBQ cmVwYXJlIGEgc3VyZmFjZSB0byBwYWludCBpbnRvLgogICAgIC8vIFdlIHBhaW50IGludG8gdGhl IHN1cmZhY2UgaWdub3JpbmcgdGhlIG9wYWNpdHkvdHJhbnNmb3JtIG9mIHRoZSBjdXJyZW50IGxh eWVyLgogICAgIHN1cmZhY2VSZWN0ID0gaW50ZXJtZWRpYXRlU3VyZmFjZVJlY3QoKTsKLSAgICBz dXJmYWNlID0gb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5hY3F1aXJlVGV4dHVyZUZyb21Qb29sKHN1 cmZhY2VSZWN0LnNpemUoKSk7CisgICAgc3VyZmFjZSA9IG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ Y3JlYXRlVGV4dHVyZSgpOworICAgIHN1cmZhY2UtPnJlc2V0KHN1cmZhY2VSZWN0LnNpemUoKSk7 CiAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5iaW5kU3VyZmFjZShzdXJmYWNlLmdldCgpKTsK ICAgICBwYWludE9wdGlvbnMub3BhY2l0eSA9IDE7CiAK 132109 2012-03-15 13:25:06 -0700 2012-03-15 13:30:09 -0700 Patch bug-80843-20120315212358.patch text/plain 5783 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDNiNDRlYzdiYTY5 NmMyM2ExZTZmNGY0ODA3ZWM5ZDM4MjgzYi4uYjU4ZTZiMjY1ZmRjOTMwODdmZjMxNDZiZGVhNGRk ZDg4OTI1OTkxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAzLTE1ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1Rl eE1hcF0gUmV1c2UgdGV4dHVyZXMgZm9sbG93aW5nIHRoZSBzYW1lIHJ1bGVzIGFzIHRoZXkgZG8g aW50ZXJuYWxseS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgwODQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQml0bWFwVGV4dHVyZXMgd2VyZSByZWNlbnRseSBjaGFuZ2VkIHRvIGJlIHRoZSBzYW1lIHNp emUgYXMgdGhlaXIgY29udGVudHMuCisgICAgICAgIFRoaXMgd291bGQgb2Jzb2xldGUgdGhlIGxv Z2ljIGluIGFjcXVpcmVUZXh0dXJlRnJvbVBvb2wgd2hpY2ggd291bGQKKyAgICAgICAgYXNzdW1l IHRoYXQgYSBCaXRtYXBUZXh0dXJlIGhhcyBnb29kIGNoYW5jZXMgb2YgYmVpbmcgcmV1c2VkIGlm IGl0cworICAgICAgICBzaXplIGlzIGJpZ2dlciBvciBlcXVhbCB0byB0aGUgbmV3IHNpemUuCisK KyAgICAgICAgVGhpcyBhc2tzIHRoZSB0ZXh0dXJlIGluc3RlYWQgaWYgaXQgY2FuIGJlIHJldXNl ZCB3aGljaCBub3cgc2ltcGx5CisgICAgICAgIGNoZWNrIGZvciBhbiBleGFjdCBzaXplIG1hdGNo LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1cmVGcm9tUG9v bCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmU6OmNhblJldXNlV2l0aCk6CisgICAgICAg IChXZWJDb3JlOjpCaXRtYXBUZXh0dXJlOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpCaXRt YXBUZXh0dXJlOjpkaWRSZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBUZXh0dXJlR0w6 OmNhblJldXNlV2l0aCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmg6CisgICAgICAgIChCaXRtYXBUZXh0dXJl R0wpOgorCiAyMDEyLTAzLTE1ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CiAKICAgICAgICAg Rml4IGNhc3QtYWxpZ24gR0NDIHdhcm5pbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5jcHAKaW5kZXggNThlNGY1 OTRjMWU3YzVkZmYwMWU1N2E0NTc4NWZmZTAwODAyZDIyOS4uMThmYjA4NjUwYWVmYTJkZWRhZWQz ODdlZTQ3YzhjM2VhMmIwN2Q5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmNwcApAQCAtMzcsMzEgKzM3LDEw IEBAIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4gVGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1 cmVGcm9tUG9vbChjb25zdCBJbnRTaXplJiBzCiAgICAgICAgIGlmICh0ZXh0dXJlLT5yZWZDb3Vu dCgpID4gMSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIC8vIFdlIGRlZmF1bHQg dG8gdGhlIGZpcnN0IGF2YWlsYWJsZSB0ZXh0dXJlLgotICAgICAgICBpZiAoIXNlbGVjdGVkVGV4 dHVyZSkgeworICAgICAgICBpZiAodGV4dHVyZS0+Y2FuUmV1c2VXaXRoKHNpemUpKSB7CiAgICAg ICAgICAgICBzZWxlY3RlZFRleHR1cmUgPSB0ZXh0dXJlOwotICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotCi0gICAgICAgIEludFNpemUgdGV4dHVy ZVNpemUgPSB0ZXh0dXJlLT5zaXplKCk7Ci0gICAgICAgIEludFNpemUgc2VsZWN0ZWRUZXh0dXJl U2l6ZSA9IHNlbGVjdGVkVGV4dHVyZS0+c2l6ZSgpOwotCi0gICAgICAgIC8vIFdlIHByZWZlciB0 byBwaWNrIGEgdGV4dHVyZSB0aGF0J3MgZXF1YWwgb3IgbGFyZ2VyIHRoYW4gdGhlIHJlcXVlc3Rl ZCBzaXplLgotICAgICAgICBpZiAodGV4dHVyZVNpemUud2lkdGgoKSA8IHNpemUud2lkdGgoKSB8 fCB0ZXh0dXJlU2l6ZS5oZWlnaHQoKSA8IHNpemUuaGVpZ2h0KCkpCi0gICAgICAgICAgICBjb250 aW51ZTsKLQotICAgICAgICAvLyBXZSBzZWxlY3QgdGhlIG5ldyB0ZXh0dXJlIGlmIHRoZSBjdXJy ZW50bHkgc2VsZWN0ZWQgdGV4dHVyZSBpcyBzbWFsbGVyIHRoYW4gdGhlCi0gICAgICAgIC8vIHJl cXVpcmVkIHNpemUsIGFuZCB0aGUgbmV3IHRleHR1cmUgaGFzIGEgc21hbGxlciBhcmVhLgotICAg ICAgICBpbnQgdGV4dHVyZUFyZWEgPSB0ZXh0dXJlU2l6ZS53aWR0aCgpICogdGV4dHVyZVNpemUu aGVpZ2h0KCk7Ci0gICAgICAgIGludCBzZWxlY3RlZFRleHR1cmVBcmVhID0gc2VsZWN0ZWRUZXh0 dXJlU2l6ZS53aWR0aCgpICogc2VsZWN0ZWRUZXh0dXJlU2l6ZS5oZWlnaHQoKTsKLSAgICAgICAg Ym9vbCBzZWxlY3RlZFRleHR1cmVGaXRzU2l6ZSA9Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWRU ZXh0dXJlU2l6ZS53aWR0aCgpID49IHNpemUud2lkdGgoKQotICAgICAgICAgICAgICAgICYmIHNl bGVjdGVkVGV4dHVyZVNpemUuaGVpZ2h0KCkgPj0gc2l6ZS5oZWlnaHQoKTsKLQotICAgICAgICBp ZiAoc2VsZWN0ZWRUZXh0dXJlRml0c1NpemUgJiYgc2VsZWN0ZWRUZXh0dXJlQXJlYSA8PSB0ZXh0 dXJlQXJlYSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIHNlbGVjdGVkVGV4dHVy ZSA9IHRleHR1cmU7CiAgICAgfQogCiAgICAgaWYgKCFzZWxlY3RlZFRleHR1cmUpIHsKQEAgLTY5 LDcgKzQ4LDcgQEAgUGFzc1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBUZXh0dXJlTWFwcGVyOjphY3F1 aXJlVGV4dHVyZUZyb21Qb29sKGNvbnN0IEludFNpemUmIHMKICAgICAgICAgbV90ZXh0dXJlUG9v bC5hcHBlbmQoc2VsZWN0ZWRUZXh0dXJlKTsKICAgICB9CiAKLSAgICBzZWxlY3RlZFRleHR1cmUt PnJlc2V0KHNpemUsIGZhbHNlKTsKKyAgICBzZWxlY3RlZFRleHR1cmUtPnJlc2V0KHNpemUpOwog ICAgIHJldHVybiBzZWxlY3RlZFRleHR1cmU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCmluZGV4IDlmMjYy YzAzNTkzZTJjYmYwYWMyMzNhNGJhNTgzYzc5ZTJlMzAwYjAuLjZjYjViNzdkNmRkZmRkOGIzNTI5 YWVjYjY5MjRiNjJmMTk5NzkxYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaApAQCAtNzMsMTMgKzczLDE0IEBA IHB1YmxpYzoKICAgICBpbmxpbmUgRmxhZ3MgZmxhZ3MoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdz OyB9CiAKICAgICB2aXJ0dWFsIGludCBicHAoKSBjb25zdCB7IHJldHVybiAzMjsgfQotICAgIHZp cnR1YWwgdm9pZCBkaWRSZXNldCgpIHsgfQotICAgIHZvaWQgcmVzZXQoY29uc3QgSW50U2l6ZSYg c2l6ZSwgRmxhZ3MgZmxhZ3MpCisgICAgdmlydHVhbCBib29sIGNhblJldXNlV2l0aChjb25zdCBJ bnRTaXplJiBjb250ZW50c1NpemUsIEZsYWdzIGZsYWdzID0gMCkgeyByZXR1cm4gZmFsc2U7IH0K KyAgICB2b2lkIHJlc2V0KGNvbnN0IEludFNpemUmIHNpemUsIEZsYWdzIGZsYWdzID0gMCkKICAg ICB7CiAgICAgICAgIG1fZmxhZ3MgPSBmbGFnczsKICAgICAgICAgbV9jb250ZW50U2l6ZSA9IHNp emU7CiAgICAgICAgIGRpZFJlc2V0KCk7CiAgICAgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRSZXNl dCgpIHsgfQogCiAgICAgaW5saW5lIEludFNpemUgY29udGVudFNpemUoKSBjb25zdCB7IHJldHVy biBtX2NvbnRlbnRTaXplOyB9CiAgICAgaW5saW5lIGludCBudW1iZXJPZkJ5dGVzKCkgY29uc3Qg eyByZXR1cm4gc2l6ZSgpLndpZHRoKCkgKiBzaXplKCkuaGVpZ2h0KCkgKiBicHAoKSA+PiAzOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDYyNGQ5OTRkYTM5ZDMzZjE0ODMwNDljZmIxNzRh NTAyODM0Nzc1MmUuLmIzYmYzZGFhODdjMWRmZTFkYzRjNzQxNjdhNTY0NTAzNzE1NTJjNGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0zOTAsNiArMzkwLDExIEBAIGNvbnN0IGNoYXIqIFRl eHR1cmVNYXBwZXJHTDo6dHlwZSgpIGNvbnN0CiAgICAgcmV0dXJuICJPcGVuR0wiOwogfQogCiti b29sIEJpdG1hcFRleHR1cmVHTDo6Y2FuUmV1c2VXaXRoKGNvbnN0IEludFNpemUmIGNvbnRlbnRz U2l6ZSwgRmxhZ3MpCit7CisgICAgcmV0dXJuIGNvbnRlbnRzU2l6ZSA9PSBtX3RleHR1cmVTaXpl OworfQorCiB2b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlkUmVzZXQoKQogewogICAgIGlmICghbV9p ZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyR0wuaAppbmRleCBlZjJiMjU4YmZhYmIwYTIxMGI2NmZhMjI2MmYyYWRl ODZiOWVjNzFiLi41NDdmZTJmOGIxNzc2ZTY3NzBlY2M3NjYyZWFmZjBhYjQwMjI5ZGQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJHTC5oCkBAIC03Nyw2ICs3Nyw3IEBAIGNsYXNzIEJpdG1hcFRleHR1cmVHTCA6 IHB1YmxpYyBCaXRtYXBUZXh0dXJlIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFNpemUgc2l6 ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc1ZhbGlkKCkgY29uc3Q7CisgICAgdmlydHVh bCBib29sIGNhblJldXNlV2l0aChjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUsIEZsYWdzID0g MCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlc2V0KCk7CiAgICAgdm9pZCBiaW5kKCk7CiAgICAg dm9pZCBpbml0aWFsaXplU3RlbmNpbCgpOwo=