86259 2012-05-11 15:29:33 -0700 [chromium] Use WebGraphicsContext3D in rate limiting logic inside compositor 2012-06-11 16:12:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86273 1 jamesr jamesr abarth cc-bugs enne junov webkit.review.bot oldest_to_newest 622023 0 jamesr 2012-05-11 15:29:33 -0700 [chromium] Use WebGraphicsContext3D in rate limiting logic inside compositor 622033 1 141511 jamesr 2012-05-11 15:32:25 -0700 Created attachment 141511 Patch 622118 2 jamesr 2012-05-11 16:52:27 -0700 FYI https://bugs.webkit.org/show_bug.cgi?id=86273 is the next step in the progression. I'll do the same thing for canvas 2d once https://bugs.webkit.org/show_bug.cgi?id=86050 lands. At that point there won't be anything using TextureLayerChromium directly except for the implementation of WebExternalTextureLayer. 644066 3 146416 jamesr 2012-06-07 16:48:09 -0700 Created attachment 146416 Patch 644067 4 jamesr 2012-06-07 16:48:31 -0700 Rebased to ToT. 646315 5 146416 enne 2012-06-11 15:16:09 -0700 Comment on attachment 146416 Patch R=me. 646383 6 jamesr 2012-06-11 16:12:39 -0700 Committed r120016: <http://trac.webkit.org/changeset/120016> 141511 2012-05-11 15:32:25 -0700 2012-06-07 16:48:05 -0700 Patch bug-86259-20120511153224.patch text/plain 12394 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBhMjJlYWM3ZGE5OTUy NTg5NjBiMWE3MTg3YWIxNGFjOTA2MDEyOC4uODdkYWRkYmFjYTA2ZTEyNDExZDRkZjVmN2RmYTUz ZTIyZDk4NjVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEyLTA1LTExICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBV c2UgV2ViR3JhcGhpY3NDb250ZXh0M0QgaW4gcmF0ZSBsaW1pdGluZyBsb2dpYyBpbnNpZGUgY29t cG9zaXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODYyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHJlZmFjdG9ycyB0aGUgY29tcG9zaXRvcidzIHJhdGUgbGltaXRpbmcgaW1wbGVtZW50YXRp b24gdG8gdXNlIHRoZSBQbGF0Zm9ybSBBUEkncyBXZWJHcmFwaGljc0NvbnRleHQzRAorICAgICAg ICBkaXJlY3RseSBpbnN0ZWFkIG9mIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEIHRvIGN1dCBk b3duIG9uIHRoZSBudW1iZXIgb2Ygc3B1cmlvdXMgV2ViQ29yZSBkZXBlbmRlbmNpZXMgaW4gdGhl CisgICAgICAgIGNvbXBvc2l0b3IuICBUaGUgb25lIGNoYW5nZSBpbiBjb250cmFjdCBpcyB0aGF0 IHRoZSBjYWxsZXIgdG8gQ0NMYXllclRyZWVIb3N0OjpzdGFydFJhdGVMaW1pdCgpIG5vdyBoYXMg dG8gY2FsbAorICAgICAgICBDQ0xheWVyVHJlZUhvc3Q6OnN0b3BSYXRlTGltaXQoKSBiZWZvcmUg YWxsb3dpbmcgdGhlIHJlZmVyZW5jZWQgY29udGV4dCB0byBnbyBhd2F5IHNpbmNlIENDTGF5ZXJU cmVlSG9zdCBubworICAgICAgICBsb25nZXIgcmV0YWlucyBhIHJlZmVyZW5jZSwgYnV0IHRoaXMg d2FzIGFsd2F5cyBoYXBwZW5pbmcgYWxyZWFkeS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYW52YXMyRExheWVyQ2hyb21pdW06On5DYW52YXMyRExheWVyQ2hyb21pdW0pOgorICAgICAg ICAoV2ViQ29yZTo6Q2FudmFzMkRMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SYXRlTGltaXRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXRlTGltaXRlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJhdGVMaW1pdGVyOjpSYXRlTGltaXRlcik6CisgICAgICAgIChXZWJDb3JlOjpSYXRlTGltaXRl cjo6c3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UmF0ZUxpbWl0ZXI6OnJhdGVMaW1pdENvbnRl eHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JhdGVMaW1pdGVyLmg6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoUmF0ZUxpbWl0ZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1cmVMYXllckNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVMYXllckNocm9taXVtOjp+VGV4dHVyZUxheWVyQ2hyb21pdW0p OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZUxheWVyQ2hyb21pdW06OnNldFJhdGVMaW1pdENv bnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZUxheWVyQ2hyb21pdW06OnNldE5lZWRz RGlzcGxheVJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6OnN0 YXJ0UmF0ZUxpbWl0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpzdG9w UmF0ZUxpbWl0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpyYXRlTGlt aXQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Lmg6CisgICAgICAgIChDQ0xheWVyVHJlZUhvc3QpOgor CisyMDEyLTA1LTExICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgW2Nocm9taXVtXSBNb3ZlIGltcGxlbWVudGF0aW9uIG9mIFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEIGFuZCByZWxhdGVkIGZyb20gV2ViS2l0L2Nocm9taXVtL3NyYyB0byBXZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg2MjU3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21p dW0uY3BwCmluZGV4IGE0NzkyOTdiN2I2YjkyNTA4OTY5NTk5NjhlYTMzNGM3YTA0OTc4ZDIuLjAx ZGEwZGVkNGQ0OTFhZjQ3ZGIzOGUzNzczNmUxNDA1MjNmZGE0ODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1 bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2Fu dmFzMkRMYXllckNocm9taXVtLmNwcApAQCAtMzYsNiArMzYsNyBAQAogCiAjaW5jbHVkZSAiRXh0 ZW5zaW9uczNEQ2hyb21pdW0uaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgorI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5oIgogI2luY2x1ZGUgIkxheWVyUmVuZGVy ZXJDaHJvbWl1bS5oIiAvLyBGb3IgdGhlIEdMQygpIG1hY3JvCiAjaW5jbHVkZSAiVGV4dHVyZUNv cGllci5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJUcmVlSG9zdC5oIgpAQCAtNzUsNyArNzYsNyBA QCBDYW52YXMyRExheWVyQ2hyb21pdW06On5DYW52YXMyRExheWVyQ2hyb21pdW0oKQogewogICAg IHNldFRleHR1cmVJZCgwKTsKICAgICBpZiAobV9jb250ZXh0ICYmIG1fdXNlUmF0ZUxpbWl0ZXIg JiYgbGF5ZXJUcmVlSG9zdCgpKQotICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BSYXRlTGlt aXRlcihtX2NvbnRleHQuZ2V0KCkpOworICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BSYXRl TGltaXRlcihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFwaGljc0NvbnRl eHQzRChtX2NvbnRleHQuZ2V0KCkpKTsKIH0KIAogYm9vbCBDYW52YXMyRExheWVyQ2hyb21pdW06 OmRyYXdpbmdJbnRvSW1wbFRocmVhZFRleHR1cmUoKSBjb25zdApAQCAtMTA0LDcgKzEwNSw3IEBA IHZvaWQgQ2FudmFzMkRMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KGNvbnN0IEZs b2F0UmVjdCYgZGlydHlSZWN0KQogICAgIExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlzcGxheVJl Y3QoZGlydHlSZWN0KTsKIAogICAgIGlmIChtX3VzZVJhdGVMaW1pdGVyICYmIGxheWVyVHJlZUhv c3QoKSkKLSAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5zdGFydFJhdGVMaW1pdGVyKG1fY29udGV4 dC5nZXQoKSk7CisgICAgICAgIGxheWVyVHJlZUhvc3QoKS0+c3RhcnRSYXRlTGltaXRlcihHcmFw aGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFwaGljc0NvbnRleHQzRChtX2NvbnRl eHQuZ2V0KCkpKTsKIH0KIAogYm9vbCBDYW52YXMyRExheWVyQ2hyb21pdW06OmRyYXdzQ29udGVu dCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9SYXRlTGltaXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9SYXRlTGltaXRlci5jcHAKaW5kZXggZmRhZGY5M2I0M2JkNDBlNmY5NGEzYzdm YTAwMDEwYzdmYmIyNThmOS4uMjMyZjA0NzE5ODExYzZkYjEyZDgxZjUyN2RlOGQwNTI1MmJkM2Qy YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v UmF0ZUxpbWl0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1JhdGVMaW1pdGVyLmNwcApAQCAtMjgsMjYgKzI4LDIyIEBACiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogCiAjaW5jbHVkZSAiUmF0ZUxpbWl0ZXIuaCIKLQotI2luY2x1 ZGUgIkV4dGVuc2lvbnMzRENocm9taXVtLmgiCi0jaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0Qu aCIKICNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCisjaW5jbHVkZSA8cHVibGljL1dlYkdyYXBoaWNz Q29udGV4dDNELmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc1JlZlB0cjxSYXRlTGlt aXRlcj4gUmF0ZUxpbWl0ZXI6OmNyZWF0ZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgUmF0 ZUxpbWl0ZXJDbGllbnQgKmNsaWVudCkKK1Bhc3NSZWZQdHI8UmF0ZUxpbWl0ZXI+IFJhdGVMaW1p dGVyOjpjcmVhdGUoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgUmF0ZUxp bWl0ZXJDbGllbnQgKmNsaWVudCkKIHsKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFJhdGVMaW1p dGVyKGNvbnRleHQsIGNsaWVudCkpOwogfQogCi1SYXRlTGltaXRlcjo6UmF0ZUxpbWl0ZXIoR3Jh cGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIFJhdGVMaW1pdGVyQ2xpZW50ICpjbGllbnQpCitSYXRl TGltaXRlcjo6UmF0ZUxpbWl0ZXIoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRCogY29udGV4 dCwgUmF0ZUxpbWl0ZXJDbGllbnQgKmNsaWVudCkKICAgICA6IG1fY29udGV4dChjb250ZXh0KQog ICAgICwgbV90aW1lcih0aGlzLCAmUmF0ZUxpbWl0ZXI6OnJhdGVMaW1pdENvbnRleHQpCiAgICAg LCBtX2NsaWVudChjbGllbnQpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAgIEFTU0VSVChj b250ZXh0LT5nZXRFeHRlbnNpb25zKCkpOwotICAgIG1fY29udGV4dFN1cHBvcnRzUmF0ZUxpbWl0 aW5nRXh0ZW5zaW9uID0gY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5zdXBwb3J0cygiR0xfQ0hS T01JVU1fcmF0ZV9saW1pdF9vZmZzY3JlZW5fY29udGV4dCIpOwogfQogCiBSYXRlTGltaXRlcjo6 flJhdGVMaW1pdGVyKCkKQEAgLTU2LDcgKzUyLDcgQEAgUmF0ZUxpbWl0ZXI6On5SYXRlTGltaXRl cigpCiAKIHZvaWQgUmF0ZUxpbWl0ZXI6OnN0YXJ0KCkKIHsKLSAgICBpZiAobV9jb250ZXh0U3Vw cG9ydHNSYXRlTGltaXRpbmdFeHRlbnNpb24gJiYgIW1fdGltZXIuaXNBY3RpdmUoKSkKKyAgICBp ZiAoIW1fdGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV90aW1lci5zdGFydE9uZVNob3QoMCk7 CiB9CiAKQEAgLTY3LDEyICs2MywxMCBAQCB2b2lkIFJhdGVMaW1pdGVyOjpzdG9wKCkKIAogdm9p ZCBSYXRlTGltaXRlcjo6cmF0ZUxpbWl0Q29udGV4dChUaW1lcjxSYXRlTGltaXRlcj4qKQogewot ICAgIFRSQUNFX0VWRU5UKCJSYXRlTGltaXRlcjo6cmF0ZUxpbWl0Q29udGV4dCIsIHRoaXMsIDAp OwotCi0gICAgRXh0ZW5zaW9uczNEQ2hyb21pdW0qIGV4dGVuc2lvbnMgPSBzdGF0aWNfY2FzdDxF eHRlbnNpb25zM0RDaHJvbWl1bSo+KG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpKTsKKyAgICBU UkFDRV9FVkVOVDAoImNjIiwgIlJhdGVMaW1pdGVyOjpyYXRlTGltaXRDb250ZXh0Iik7CiAKICAg ICBtX2NsaWVudC0+cmF0ZUxpbWl0KCk7Ci0gICAgZXh0ZW5zaW9ucy0+cmF0ZUxpbWl0T2Zmc2Ny ZWVuQ29udGV4dENIUk9NSVVNKCk7CisgICAgbV9jb250ZXh0LT5yYXRlTGltaXRPZmZzY3JlZW5D b250ZXh0Q0hST01JVU0oKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUmF0ZUxpbWl0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JhdGVMaW1pdGVyLmgKaW5kZXggNjhlMDQ0NTVlNjk0 ZDliYTc2ZmUwMzA5NTE5ODA3YWRjNGYxM2Q3Yi4uYjc4NmI5MGQ0OTAwNzk3ZWVmOWFlZWUwNGUw YWE3ZTM1Y2MyMmZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vUmF0ZUxpbWl0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9SYXRlTGltaXRlci5oCkBAIC0zMiw5ICszMiwxMSBAQAogI2luY2x1 ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCi1uYW1lc3Bh Y2UgV2ViQ29yZSB7CituYW1lc3BhY2UgV2ViS2l0IHsKK2NsYXNzIFdlYkdyYXBoaWNzQ29udGV4 dDNEOworfQogCi1jbGFzcyBHcmFwaGljc0NvbnRleHQzRDsKK25hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgUmF0ZUxpbWl0ZXJDbGllbnQgewogcHVibGljOgpAQCAtNDQsMTYgKzQ2LDE2IEBA IHB1YmxpYzoKIC8vIEEgY2xhc3MgY29udGFpbmluZyBhIHRpbWVyLCB3aGljaCBjYWxscyByYXRl TGltaXRDSFJPTUlVTSBvbiBleHBpcnkKIGNsYXNzIFJhdGVMaW1pdGVyIDogcHVibGljIFJlZkNv dW50ZWQ8UmF0ZUxpbWl0ZXI+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxSYXRl TGltaXRlcj4gY3JlYXRlKEdyYXBoaWNzQ29udGV4dDNEKiwgUmF0ZUxpbWl0ZXJDbGllbnQqKTsK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxSYXRlTGltaXRlcj4gY3JlYXRlKFdlYktpdDo6V2ViR3Jh cGhpY3NDb250ZXh0M0QqLCBSYXRlTGltaXRlckNsaWVudCopOwogICAgIH5SYXRlTGltaXRlcigp OwogCiAgICAgdm9pZCBzdGFydCgpOwogICAgIHZvaWQgc3RvcCgpOwogCiBwcml2YXRlOgotICAg IFJhdGVMaW1pdGVyKEdyYXBoaWNzQ29udGV4dDNEKiwgUmF0ZUxpbWl0ZXJDbGllbnQqKTsKLSAg ICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDsKLSAgICBib29sIG1fY29udGV4 dFN1cHBvcnRzUmF0ZUxpbWl0aW5nRXh0ZW5zaW9uOworICAgIFJhdGVMaW1pdGVyKFdlYktpdDo6 V2ViR3JhcGhpY3NDb250ZXh0M0QqLCBSYXRlTGltaXRlckNsaWVudCopOworCisgICAgV2ViS2l0 OjpXZWJHcmFwaGljc0NvbnRleHQzRCogbV9jb250ZXh0OwogICAgIFRpbWVyPFJhdGVMaW1pdGVy PiBtX3RpbWVyOwogICAgIHZvaWQgcmF0ZUxpbWl0Q29udGV4dChUaW1lcjxSYXRlTGltaXRlcj4q KTsKICAgICBSYXRlTGltaXRlckNsaWVudCAqbV9jbGllbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UZXh0dXJlTGF5ZXJDaHJvbWl1bS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UZXh0dXJlTGF5 ZXJDaHJvbWl1bS5jcHAKaW5kZXggNzM4NDQ5MjY0MTdjY2NmMTZjNjFjNTUwZTQyOTkxYmUxYmZl YTRmOS4uZWNlNDI4ZDhiN2I3ODczYzRkYTliMWUyZGRhZmFlNGIzNDIxNTU0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4dHVyZUxheWVy Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1RleHR1cmVMYXllckNocm9taXVtLmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUg IlRleHR1cmVMYXllckNocm9taXVtLmgiCiAKICNpbmNsdWRlICJFeHRlbnNpb25zM0QuaCIKKyNp bmNsdWRlICJHcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaCIKICNpbmNsdWRlICJjYy9DQ0xheWVy VHJlZUhvc3QuaCIKICNpbmNsdWRlICJjYy9DQ1RleHR1cmVMYXllckltcGwuaCIKIApAQCAtNTgs NyArNTksNyBAQCBUZXh0dXJlTGF5ZXJDaHJvbWl1bTo6flRleHR1cmVMYXllckNocm9taXVtKCkK ICAgICAgICAgaWYgKG1fdGV4dHVyZUlkKQogICAgICAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5h Y3F1aXJlTGF5ZXJUZXh0dXJlcygpOwogICAgICAgICBpZiAobV9yYXRlTGltaXRDb250ZXh0ICYm IG1fY2xpZW50KQotICAgICAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIo bV9jbGllbnQtPmNvbnRleHQoKSk7CisgICAgICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BS YXRlTGltaXRlcihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFwaGljc0Nv bnRleHQzRChtX2NsaWVudC0+Y29udGV4dCgpKSk7CiAgICAgfQogfQogCkBAIC04OCw3ICs4OSw3 IEBAIHZvaWQgVGV4dHVyZUxheWVyQ2hyb21pdW06OnNldFByZW11bHRpcGxpZWRBbHBoYShib29s IHByZW11bHRpcGxpZWRBbHBoYSkKIHZvaWQgVGV4dHVyZUxheWVyQ2hyb21pdW06OnNldFJhdGVM aW1pdENvbnRleHQoYm9vbCByYXRlTGltaXQpCiB7CiAgICAgaWYgKCFyYXRlTGltaXQgJiYgbV9y YXRlTGltaXRDb250ZXh0ICYmIG1fY2xpZW50ICYmIGxheWVyVHJlZUhvc3QoKSkKLSAgICAgICAg bGF5ZXJUcmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIobV9jbGllbnQtPmNvbnRleHQoKSk7Cisg ICAgICAgIGxheWVyVHJlZUhvc3QoKS0+c3RvcFJhdGVMaW1pdGVyKEdyYXBoaWNzQ29udGV4dDNE UHJpdmF0ZTo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKG1fY2xpZW50LT5jb250ZXh0KCkp KTsKIAogICAgIG1fcmF0ZUxpbWl0Q29udGV4dCA9IHJhdGVMaW1pdDsKIH0KQEAgLTEwOCw3ICsx MDksNyBAQCB2b2lkIFRleHR1cmVMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KGNv bnN0IEZsb2F0UmVjdCYgZGlydHlSZWN0KQogICAgIExheWVyQ2hyb21pdW06OnNldE5lZWRzRGlz cGxheVJlY3QoZGlydHlSZWN0KTsKIAogICAgIGlmIChtX3JhdGVMaW1pdENvbnRleHQgJiYgbV9j bGllbnQgJiYgbGF5ZXJUcmVlSG9zdCgpKQotICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0YXJ0 UmF0ZUxpbWl0ZXIobV9jbGllbnQtPmNvbnRleHQoKSk7CisgICAgICAgIGxheWVyVHJlZUhvc3Qo KS0+c3RhcnRSYXRlTGltaXRlcihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJH cmFwaGljc0NvbnRleHQzRChtX2NsaWVudC0+Y29udGV4dCgpKSk7CiB9CiAKIHZvaWQgVGV4dHVy ZUxheWVyQ2hyb21pdW06OnNldExheWVyVHJlZUhvc3QoQ0NMYXllclRyZWVIb3N0KiBob3N0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggOWU1NzZhYzM3OTZiNjhhNDMyODc5 MzViNTMyNjcxNTNhNGNhODI2OS4uZGExMWQyNGRmZDI4ODc2OGZkMGNiODhjZWMzMjU5NDdmNjg3 MGUyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC02MDAsMTAgKzYwMCwx MSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6YXBwbHlTY3JvbGxBbmRTY2FsZShjb25zdCBDQ1Nj cm9sbEFuZFNjYWxlU2V0JiBpbmZvKQogICAgIG1fY2xpZW50LT5hcHBseVNjcm9sbEFuZFNjYWxl KHNjcm9sbERlbHRhLCBpbmZvLnBhZ2VTY2FsZURlbHRhKTsKIH0KIAotdm9pZCBDQ0xheWVyVHJl ZUhvc3Q6OnN0YXJ0UmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCit2b2lk IENDTGF5ZXJUcmVlSG9zdDo6c3RhcnRSYXRlTGltaXRlcihXZWJLaXQ6OldlYkdyYXBoaWNzQ29u dGV4dDNEKiBjb250ZXh0KQogewogICAgIGlmIChtX2FuaW1hdGluZykKICAgICAgICAgcmV0dXJu OworCiAgICAgQVNTRVJUKGNvbnRleHQpOwogICAgIFJhdGVMaW1pdGVyTWFwOjppdGVyYXRvciBp dCA9IG1fcmF0ZUxpbWl0ZXJzLmZpbmQoY29udGV4dCk7CiAgICAgaWYgKGl0ICE9IG1fcmF0ZUxp bWl0ZXJzLmVuZCgpKQpAQCAtNjE1LDE0ICs2MTYsNyBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6 c3RhcnRSYXRlTGltaXRlcihHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkKICAgICB9CiB9CiAK LXZvaWQgQ0NMYXllclRyZWVIb3N0OjpyYXRlTGltaXQoKQotewotICAgIC8vIEZvcmNlIGEgbm8t b3AgY29tbWFuZCBvbiB0aGUgY29tcG9zaXRvciBjb250ZXh0LCBzbyB0aGF0IGFueSByYXRlbGlt aXRpbmcgY29tbWFuZHMgd2lsbCB3YWl0IGZvciB0aGUgY29tcG9zaXRpbmcKLSAgICAvLyBjb250 ZXh0LCBhbmQgdGhlcmVmb3JlIGZvciB0aGUgU3dhcEJ1ZmZlcnMuCi0gICAgbV9wcm94eS0+Zm9y Y2VTZXJpYWxpemVPblN3YXBCdWZmZXJzKCk7Ci19Ci0KLXZvaWQgQ0NMYXllclRyZWVIb3N0Ojpz dG9wUmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCit2b2lkIENDTGF5ZXJU cmVlSG9zdDo6c3RvcFJhdGVMaW1pdGVyKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQpCiB7CiAgICAgUmF0ZUxpbWl0ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9yYXRlTGltaXRl cnMuZmluZChjb250ZXh0KTsKICAgICBpZiAoaXQgIT0gbV9yYXRlTGltaXRlcnMuZW5kKCkpIHsK QEAgLTYzMSw2ICs2MjUsMTMgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnN0b3BSYXRlTGltaXRl cihHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkKICAgICB9CiB9CiAKK3ZvaWQgQ0NMYXllclRy ZWVIb3N0OjpyYXRlTGltaXQoKQoreworICAgIC8vIEZvcmNlIGEgbm8tb3AgY29tbWFuZCBvbiB0 aGUgY29tcG9zaXRvciBjb250ZXh0LCBzbyB0aGF0IGFueSByYXRlbGltaXRpbmcgY29tbWFuZHMg d2lsbCB3YWl0IGZvciB0aGUgY29tcG9zaXRpbmcKKyAgICAvLyBjb250ZXh0LCBhbmQgdGhlcmVm b3JlIGZvciB0aGUgU3dhcEJ1ZmZlcnMuCisgICAgbV9wcm94eS0+Zm9yY2VTZXJpYWxpemVPblN3 YXBCdWZmZXJzKCk7Cit9CisKIGJvb2wgQ0NMYXllclRyZWVIb3N0OjpidWZmZXJlZFVwZGF0ZXMo KQogewogICAgIHJldHVybiBtX3NldHRpbmdzLm1heFBhcnRpYWxUZXh0dXJlVXBkYXRlcyAhPSBu dW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgK aW5kZXggOGVkYWM3ODFiMzEyNzdkYjk0YzkzMTA1YjQyOTJmZDVhNmEyZDRlMi4uNjExYzU3NjQw OTc4YWRiYzRmNzBlM2I1Mzc1M2E3YjFmZTgwZWQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmgKQEAgLTIyMiw4ICsyMjIsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydFBhZ2VTY2Fs ZUFuaW1hdGlvbihjb25zdCBJbnRTaXplJiB0YXJnZXRQb3NpdGlvbiwgYm9vbCB1c2VBbmNob3Is IGZsb2F0IHNjYWxlLCBkb3VibGUgZHVyYXRpb25TZWMpOwogCiAgICAgdm9pZCBhcHBseVNjcm9s bEFuZFNjYWxlKGNvbnN0IENDU2Nyb2xsQW5kU2NhbGVTZXQmKTsKLSAgICB2b2lkIHN0YXJ0UmF0 ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqKTsKLSAgICB2b2lkIHN0b3BSYXRlTGltaXRlcihH cmFwaGljc0NvbnRleHQzRCopOworCisgICAgdm9pZCBzdGFydFJhdGVMaW1pdGVyKFdlYktpdDo6 V2ViR3JhcGhpY3NDb250ZXh0M0QqKTsKKyAgICB2b2lkIHN0b3BSYXRlTGltaXRlcihXZWJLaXQ6 OldlYkdyYXBoaWNzQ29udGV4dDNEKik7CiAKICAgICAvLyBSYXRlTGltaXRDbGllbnQgaW1wbGVt ZW50YXRpb24KICAgICB2aXJ0dWFsIHZvaWQgcmF0ZUxpbWl0KCkgT1ZFUlJJREU7CkBAIC0yNzcs NyArMjc4LDcgQEAgcHJpdmF0ZToKIAogICAgIEludFNpemUgbV92aWV3cG9ydFNpemU7CiAgICAg Ym9vbCBtX3Zpc2libGU7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPEdyYXBoaWNzQ29udGV4dDNEKiwg UmVmUHRyPFJhdGVMaW1pdGVyPiA+IFJhdGVMaW1pdGVyTWFwOworICAgIHR5cGVkZWYgSGFzaE1h cDxXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEKiwgUmVmUHRyPFJhdGVMaW1pdGVyPiA+IFJh dGVMaW1pdGVyTWFwOwogICAgIFJhdGVMaW1pdGVyTWFwIG1fcmF0ZUxpbWl0ZXJzOwogCiAgICAg ZmxvYXQgbV9wYWdlU2NhbGVGYWN0b3I7Cg== 146416 2012-06-07 16:48:09 -0700 2012-06-11 15:16:09 -0700 Patch bug-86259-20120607164809.patch text/plain 10834 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0NGJhZGUwOTgzMzM5 NTU5MmUxMDllNGNkYzBmOTA5YjBlYjBiYy4uN2RjYTc3Njg1NmQzMGU5NWI3NGY0ZGRjNmM1ZDkz MTk2M2NlYjJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA1LTExICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBV c2UgV2ViR3JhcGhpY3NDb250ZXh0M0QgaW4gcmF0ZSBsaW1pdGluZyBsb2dpYyBpbnNpZGUgY29t cG9zaXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODYyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHJlZmFjdG9ycyB0aGUgY29tcG9zaXRvcidzIHJhdGUgbGltaXRpbmcgaW1wbGVtZW50YXRp b24gdG8gdXNlIHRoZSBQbGF0Zm9ybSBBUEkncyBXZWJHcmFwaGljc0NvbnRleHQzRAorICAgICAg ICBkaXJlY3RseSBpbnN0ZWFkIG9mIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEIHRvIGN1dCBk b3duIG9uIHRoZSBudW1iZXIgb2Ygc3B1cmlvdXMgV2ViQ29yZSBkZXBlbmRlbmNpZXMgaW4gdGhl CisgICAgICAgIGNvbXBvc2l0b3IuICBUaGUgb25lIGNoYW5nZSBpbiBjb250cmFjdCBpcyB0aGF0 IHRoZSBjYWxsZXIgdG8gQ0NMYXllclRyZWVIb3N0OjpzdGFydFJhdGVMaW1pdCgpIG5vdyBoYXMg dG8gY2FsbAorICAgICAgICBDQ0xheWVyVHJlZUhvc3Q6OnN0b3BSYXRlTGltaXQoKSBiZWZvcmUg YWxsb3dpbmcgdGhlIHJlZmVyZW5jZWQgY29udGV4dCB0byBnbyBhd2F5IHNpbmNlIENDTGF5ZXJU cmVlSG9zdCBubworICAgICAgICBsb25nZXIgcmV0YWlucyBhIHJlZmVyZW5jZSwgYnV0IHRoaXMg d2FzIGFsd2F5cyBoYXBwZW5pbmcgYWxyZWFkeS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYW52YXMyRExheWVyQ2hyb21pdW06On5DYW52YXMyRExheWVyQ2hyb21pdW0pOgorICAgICAg ICAoV2ViQ29yZTo6Q2FudmFzMkRMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SYXRlTGltaXRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXRlTGltaXRlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJhdGVMaW1pdGVyOjpSYXRlTGltaXRlcik6CisgICAgICAgIChXZWJDb3JlOjpSYXRlTGltaXRl cjo6c3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UmF0ZUxpbWl0ZXI6OnJhdGVMaW1pdENvbnRl eHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JhdGVMaW1pdGVyLmg6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoUmF0ZUxpbWl0ZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1cmVMYXllckNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVMYXllckNocm9taXVtOjp+VGV4dHVyZUxheWVyQ2hyb21pdW0p OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZUxheWVyQ2hyb21pdW06OnNldFJhdGVMaW1pdENv bnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZUxheWVyQ2hyb21pdW06OnNldE5lZWRz RGlzcGxheVJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6OnN0 YXJ0UmF0ZUxpbWl0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpzdG9w UmF0ZUxpbWl0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpyYXRlTGlt aXQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Lmg6CisgICAgICAgIChDQ0xheWVyVHJlZUhvc3QpOgor CiAyMDEyLTA2LTA1ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW2Nocm9taXVtXSBNb3ZlIGRlZmVycmFsLXJlbGF0ZWQgbG9naWMgb3V0IG9mIENhbnZh czJETGF5ZXJDaHJvbWl1bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vUmF0ZUxpbWl0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vUmF0ZUxpbWl0ZXIuY3BwCmluZGV4IGZkYWRmOTNiNDNiZDQwZTZm OTRhM2M3ZmEwMDAxMGM3ZmJiMjU4ZjkuLjIzMmYwNDcxOTgxMWM2ZGIxMmQ4MWY1MjdkZThkMDUy NTJiZDNkMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1JhdGVMaW1pdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9SYXRlTGltaXRlci5jcHAKQEAgLTI4LDI2ICsyOCwyMiBAQAogI2lmIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKIAogI2luY2x1ZGUgIlJhdGVMaW1pdGVyLmgiCi0K LSNpbmNsdWRlICJFeHRlbnNpb25zM0RDaHJvbWl1bS5oIgotI2luY2x1ZGUgIkdyYXBoaWNzQ29u dGV4dDNELmgiCiAjaW5jbHVkZSAiVHJhY2VFdmVudC5oIgorI2luY2x1ZGUgPHB1YmxpYy9XZWJH cmFwaGljc0NvbnRleHQzRC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NSZWZQdHI8 UmF0ZUxpbWl0ZXI+IFJhdGVMaW1pdGVyOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRl eHQsIFJhdGVMaW1pdGVyQ2xpZW50ICpjbGllbnQpCitQYXNzUmVmUHRyPFJhdGVMaW1pdGVyPiBS YXRlTGltaXRlcjo6Y3JlYXRlKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs IFJhdGVMaW1pdGVyQ2xpZW50ICpjbGllbnQpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBS YXRlTGltaXRlcihjb250ZXh0LCBjbGllbnQpKTsKIH0KIAotUmF0ZUxpbWl0ZXI6OlJhdGVMaW1p dGVyKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBSYXRlTGltaXRlckNsaWVudCAqY2xpZW50 KQorUmF0ZUxpbWl0ZXI6OlJhdGVMaW1pdGVyKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Qq IGNvbnRleHQsIFJhdGVMaW1pdGVyQ2xpZW50ICpjbGllbnQpCiAgICAgOiBtX2NvbnRleHQoY29u dGV4dCkKICAgICAsIG1fdGltZXIodGhpcywgJlJhdGVMaW1pdGVyOjpyYXRlTGltaXRDb250ZXh0 KQogICAgICwgbV9jbGllbnQoY2xpZW50KQogewogICAgIEFTU0VSVChjb250ZXh0KTsKLSAgICBB U1NFUlQoY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpKTsKLSAgICBtX2NvbnRleHRTdXBwb3J0c1Jh dGVMaW1pdGluZ0V4dGVuc2lvbiA9IGNvbnRleHQtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9ydHMo IkdMX0NIUk9NSVVNX3JhdGVfbGltaXRfb2Zmc2NyZWVuX2NvbnRleHQiKTsKIH0KIAogUmF0ZUxp bWl0ZXI6On5SYXRlTGltaXRlcigpCkBAIC01Niw3ICs1Miw3IEBAIFJhdGVMaW1pdGVyOjp+UmF0 ZUxpbWl0ZXIoKQogCiB2b2lkIFJhdGVMaW1pdGVyOjpzdGFydCgpCiB7Ci0gICAgaWYgKG1fY29u dGV4dFN1cHBvcnRzUmF0ZUxpbWl0aW5nRXh0ZW5zaW9uICYmICFtX3RpbWVyLmlzQWN0aXZlKCkp CisgICAgaWYgKCFtX3RpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fdGltZXIuc3RhcnRPbmVT aG90KDApOwogfQogCkBAIC02NywxMiArNjMsMTAgQEAgdm9pZCBSYXRlTGltaXRlcjo6c3RvcCgp CiAKIHZvaWQgUmF0ZUxpbWl0ZXI6OnJhdGVMaW1pdENvbnRleHQoVGltZXI8UmF0ZUxpbWl0ZXI+ KikKIHsKLSAgICBUUkFDRV9FVkVOVCgiUmF0ZUxpbWl0ZXI6OnJhdGVMaW1pdENvbnRleHQiLCB0 aGlzLCAwKTsKLQotICAgIEV4dGVuc2lvbnMzRENocm9taXVtKiBleHRlbnNpb25zID0gc3RhdGlj X2Nhc3Q8RXh0ZW5zaW9uczNEQ2hyb21pdW0qPihtX2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKSk7 CisgICAgVFJBQ0VfRVZFTlQwKCJjYyIsICJSYXRlTGltaXRlcjo6cmF0ZUxpbWl0Q29udGV4dCIp OwogCiAgICAgbV9jbGllbnQtPnJhdGVMaW1pdCgpOwotICAgIGV4dGVuc2lvbnMtPnJhdGVMaW1p dE9mZnNjcmVlbkNvbnRleHRDSFJPTUlVTSgpOworICAgIG1fY29udGV4dC0+cmF0ZUxpbWl0T2Zm c2NyZWVuQ29udGV4dENIUk9NSVVNKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JhdGVMaW1pdGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SYXRlTGltaXRlci5oCmluZGV4IDY4ZTA0 NDU1ZTY5NGQ5YmE3NmZlMDMwOTUxOTgwN2FkYzRmMTNkN2IuLmI3ODZiOTBkNDkwMDc5N2VlZjlh ZWVlMDRlMGFhN2UzNWNjMjJmZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1JhdGVMaW1pdGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUmF0ZUxpbWl0ZXIuaApAQCAtMzIsOSArMzIsMTEgQEAK ICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAot bmFtZXNwYWNlIFdlYkNvcmUgeworbmFtZXNwYWNlIFdlYktpdCB7CitjbGFzcyBXZWJHcmFwaGlj c0NvbnRleHQzRDsKK30KIAotY2xhc3MgR3JhcGhpY3NDb250ZXh0M0Q7CituYW1lc3BhY2UgV2Vi Q29yZSB7CiAKIGNsYXNzIFJhdGVMaW1pdGVyQ2xpZW50IHsKIHB1YmxpYzoKQEAgLTQ0LDE2ICs0 NiwxNiBAQCBwdWJsaWM6CiAvLyBBIGNsYXNzIGNvbnRhaW5pbmcgYSB0aW1lciwgd2hpY2ggY2Fs bHMgcmF0ZUxpbWl0Q0hST01JVU0gb24gZXhwaXJ5CiBjbGFzcyBSYXRlTGltaXRlciA6IHB1Ymxp YyBSZWZDb3VudGVkPFJhdGVMaW1pdGVyPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQ dHI8UmF0ZUxpbWl0ZXI+IGNyZWF0ZShHcmFwaGljc0NvbnRleHQzRCosIFJhdGVMaW1pdGVyQ2xp ZW50Kik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8UmF0ZUxpbWl0ZXI+IGNyZWF0ZShXZWJLaXQ6 OldlYkdyYXBoaWNzQ29udGV4dDNEKiwgUmF0ZUxpbWl0ZXJDbGllbnQqKTsKICAgICB+UmF0ZUxp bWl0ZXIoKTsKIAogICAgIHZvaWQgc3RhcnQoKTsKICAgICB2b2lkIHN0b3AoKTsKIAogcHJpdmF0 ZToKLSAgICBSYXRlTGltaXRlcihHcmFwaGljc0NvbnRleHQzRCosIFJhdGVMaW1pdGVyQ2xpZW50 Kik7Ci0gICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBtX2NvbnRleHQ7Ci0gICAgYm9vbCBt X2NvbnRleHRTdXBwb3J0c1JhdGVMaW1pdGluZ0V4dGVuc2lvbjsKKyAgICBSYXRlTGltaXRlcihX ZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEKiwgUmF0ZUxpbWl0ZXJDbGllbnQqKTsKKworICAg IFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0QqIG1fY29udGV4dDsKICAgICBUaW1lcjxSYXRl TGltaXRlcj4gbV90aW1lcjsKICAgICB2b2lkIHJhdGVMaW1pdENvbnRleHQoVGltZXI8UmF0ZUxp bWl0ZXI+Kik7CiAgICAgUmF0ZUxpbWl0ZXJDbGllbnQgKm1fY2xpZW50OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4dHVyZUxheWVyQ2hy b21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4 dHVyZUxheWVyQ2hyb21pdW0uY3BwCmluZGV4IDYzZWQyNDRiMDNhMjM4Zjk4MzdlMTA2Y2VlZmE4 OWI3OGFkYjQ5Y2EuLjNiMTI4NzBhMmQwN2I4NDZiNGY0MWE5Y2E5ZDVmMzY3MzMyNTRhMzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1 cmVMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9UZXh0dXJlTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNp bmNsdWRlICJUZXh0dXJlTGF5ZXJDaHJvbWl1bS5oIgogCiAjaW5jbHVkZSAiRXh0ZW5zaW9uczNE LmgiCisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgiCiAjaW5jbHVkZSAiY2Mv Q0NMYXllclRyZWVIb3N0LmgiCiAjaW5jbHVkZSAiY2MvQ0NUZXh0dXJlTGF5ZXJJbXBsLmgiCiAK QEAgLTU4LDcgKzU5LDcgQEAgVGV4dHVyZUxheWVyQ2hyb21pdW06On5UZXh0dXJlTGF5ZXJDaHJv bWl1bSgpCiAgICAgICAgIGlmIChtX3RleHR1cmVJZCkKICAgICAgICAgICAgIGxheWVyVHJlZUhv c3QoKS0+YWNxdWlyZUxheWVyVGV4dHVyZXMoKTsKICAgICAgICAgaWYgKG1fcmF0ZUxpbWl0Q29u dGV4dCAmJiBtX2NsaWVudCkKLSAgICAgICAgICAgIGxheWVyVHJlZUhvc3QoKS0+c3RvcFJhdGVM aW1pdGVyKG1fY2xpZW50LT5jb250ZXh0KCkpOworICAgICAgICAgICAgbGF5ZXJUcmVlSG9zdCgp LT5zdG9wUmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpleHRyYWN0V2ViR3Jh cGhpY3NDb250ZXh0M0QobV9jbGllbnQtPmNvbnRleHQoKSkpOwogICAgIH0KIH0KIApAQCAtODgs NyArODksNyBAQCB2b2lkIFRleHR1cmVMYXllckNocm9taXVtOjpzZXRQcmVtdWx0aXBsaWVkQWxw aGEoYm9vbCBwcmVtdWx0aXBsaWVkQWxwaGEpCiB2b2lkIFRleHR1cmVMYXllckNocm9taXVtOjpz ZXRSYXRlTGltaXRDb250ZXh0KGJvb2wgcmF0ZUxpbWl0KQogewogICAgIGlmICghcmF0ZUxpbWl0 ICYmIG1fcmF0ZUxpbWl0Q29udGV4dCAmJiBtX2NsaWVudCAmJiBsYXllclRyZWVIb3N0KCkpCi0g ICAgICAgIGxheWVyVHJlZUhvc3QoKS0+c3RvcFJhdGVMaW1pdGVyKG1fY2xpZW50LT5jb250ZXh0 KCkpOworICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BSYXRlTGltaXRlcihHcmFwaGljc0Nv bnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFwaGljc0NvbnRleHQzRChtX2NsaWVudC0+Y29u dGV4dCgpKSk7CiAKICAgICBtX3JhdGVMaW1pdENvbnRleHQgPSByYXRlTGltaXQ7CiB9CkBAIC0x MTQsNyArMTE1LDcgQEAgdm9pZCBUZXh0dXJlTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNEaXNwbGF5 UmVjdChjb25zdCBGbG9hdFJlY3QmIGRpcnR5UmVjdCkKICAgICBMYXllckNocm9taXVtOjpzZXRO ZWVkc0Rpc3BsYXlSZWN0KGRpcnR5UmVjdCk7CiAKICAgICBpZiAobV9yYXRlTGltaXRDb250ZXh0 ICYmIG1fY2xpZW50ICYmIGxheWVyVHJlZUhvc3QoKSkKLSAgICAgICAgbGF5ZXJUcmVlSG9zdCgp LT5zdGFydFJhdGVMaW1pdGVyKG1fY2xpZW50LT5jb250ZXh0KCkpOworICAgICAgICBsYXllclRy ZWVIb3N0KCktPnN0YXJ0UmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpleHRy YWN0V2ViR3JhcGhpY3NDb250ZXh0M0QobV9jbGllbnQtPmNvbnRleHQoKSkpOwogfQogCiB2b2lk IFRleHR1cmVMYXllckNocm9taXVtOjpzZXRMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdCog aG9zdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCmluZGV4IGZhMGViNjRjMzY1YjE4 ZGUwZDk2OWZjODNlOWI0ODM1YTM4NjkzNGEuLjlhMWQzZmIwOGRjNzIyODIwMTlhYmRkMWZjOWM1 ZGQ1MGI0NTgzOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcApAQCAtNjMxLDEw ICs2MzEsMTEgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OmFwcGx5U2Nyb2xsQW5kU2NhbGUoY29u c3QgQ0NTY3JvbGxBbmRTY2FsZVNldCYgaW5mbykKICAgICBtX2NsaWVudC0+YXBwbHlTY3JvbGxB bmRTY2FsZShzY3JvbGxEZWx0YSwgaW5mby5wYWdlU2NhbGVEZWx0YSk7CiB9CiAKLXZvaWQgQ0NM YXllclRyZWVIb3N0OjpzdGFydFJhdGVMaW1pdGVyKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0 KQordm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnN0YXJ0UmF0ZUxpbWl0ZXIoV2ViS2l0OjpXZWJHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCkKIHsKICAgICBpZiAobV9hbmltYXRpbmcpCiAgICAgICAg IHJldHVybjsKKwogICAgIEFTU0VSVChjb250ZXh0KTsKICAgICBSYXRlTGltaXRlck1hcDo6aXRl cmF0b3IgaXQgPSBtX3JhdGVMaW1pdGVycy5maW5kKGNvbnRleHQpOwogICAgIGlmIChpdCAhPSBt X3JhdGVMaW1pdGVycy5lbmQoKSkKQEAgLTY0NiwxNCArNjQ3LDcgQEAgdm9pZCBDQ0xheWVyVHJl ZUhvc3Q6OnN0YXJ0UmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAg fQogfQogCi12b2lkIENDTGF5ZXJUcmVlSG9zdDo6cmF0ZUxpbWl0KCkKLXsKLSAgICAvLyBGb3Jj ZSBhIG5vLW9wIGNvbW1hbmQgb24gdGhlIGNvbXBvc2l0b3IgY29udGV4dCwgc28gdGhhdCBhbnkg cmF0ZWxpbWl0aW5nIGNvbW1hbmRzIHdpbGwgd2FpdCBmb3IgdGhlIGNvbXBvc2l0aW5nCi0gICAg Ly8gY29udGV4dCwgYW5kIHRoZXJlZm9yZSBmb3IgdGhlIFN3YXBCdWZmZXJzLgotICAgIG1fcHJv eHktPmZvcmNlU2VyaWFsaXplT25Td2FwQnVmZmVycygpOwotfQotCi12b2lkIENDTGF5ZXJUcmVl SG9zdDo6c3RvcFJhdGVMaW1pdGVyKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQordm9pZCBD Q0xheWVyVHJlZUhvc3Q6OnN0b3BSYXRlTGltaXRlcihXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4 dDNEKiBjb250ZXh0KQogewogICAgIFJhdGVMaW1pdGVyTWFwOjppdGVyYXRvciBpdCA9IG1fcmF0 ZUxpbWl0ZXJzLmZpbmQoY29udGV4dCk7CiAgICAgaWYgKGl0ICE9IG1fcmF0ZUxpbWl0ZXJzLmVu ZCgpKSB7CkBAIC02NjIsNiArNjU2LDEzIEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0OjpzdG9wUmF0 ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgfQogfQogCit2b2lkIEND TGF5ZXJUcmVlSG9zdDo6cmF0ZUxpbWl0KCkKK3sKKyAgICAvLyBGb3JjZSBhIG5vLW9wIGNvbW1h bmQgb24gdGhlIGNvbXBvc2l0b3IgY29udGV4dCwgc28gdGhhdCBhbnkgcmF0ZWxpbWl0aW5nIGNv bW1hbmRzIHdpbGwgd2FpdCBmb3IgdGhlIGNvbXBvc2l0aW5nCisgICAgLy8gY29udGV4dCwgYW5k IHRoZXJlZm9yZSBmb3IgdGhlIFN3YXBCdWZmZXJzLgorICAgIG1fcHJveHktPmZvcmNlU2VyaWFs aXplT25Td2FwQnVmZmVycygpOworfQorCiBib29sIENDTGF5ZXJUcmVlSG9zdDo6YnVmZmVyZWRV cGRhdGVzKCkKIHsKICAgICByZXR1cm4gbV9zZXR0aW5ncy5tYXhQYXJ0aWFsVGV4dHVyZVVwZGF0 ZXMgIT0gbnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6bWF4KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVl SG9zdC5oCmluZGV4IDQzNGFlYzI3NDIyMDFjNWY2ZDViNDljYzUzN2UxODAzOWMyYzg2NGQuLmIw ZjUyNjYxMWFhYmEzYTMxYjBhOWU5N2Q5NDJiMGVhNmYzNDdjNmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5oCkBAIC0yNDAsOCArMjQwLDkgQEAgcHVibGljOgogICAgIHZvaWQgc3RhcnRQ YWdlU2NhbGVBbmltYXRpb24oY29uc3QgSW50U2l6ZSYgdGFyZ2V0UG9zaXRpb24sIGJvb2wgdXNl QW5jaG9yLCBmbG9hdCBzY2FsZSwgZG91YmxlIGR1cmF0aW9uU2VjKTsKIAogICAgIHZvaWQgYXBw bHlTY3JvbGxBbmRTY2FsZShjb25zdCBDQ1Njcm9sbEFuZFNjYWxlU2V0Jik7Ci0gICAgdm9pZCBz dGFydFJhdGVMaW1pdGVyKEdyYXBoaWNzQ29udGV4dDNEKik7Ci0gICAgdm9pZCBzdG9wUmF0ZUxp bWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqKTsKKworICAgIHZvaWQgc3RhcnRSYXRlTGltaXRlcihX ZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEKik7CisgICAgdm9pZCBzdG9wUmF0ZUxpbWl0ZXIo V2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRCopOwogCiAgICAgLy8gUmF0ZUxpbWl0Q2xpZW50 IGltcGxlbWVudGF0aW9uCiAgICAgdmlydHVhbCB2b2lkIHJhdGVMaW1pdCgpIE9WRVJSSURFOwpA QCAtMzAyLDcgKzMwMyw3IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fbWVtb3J5QWxsb2NhdGlv bkJ5dGVzOwogICAgIGJvb2wgbV9tZW1vcnlBbGxvY2F0aW9uSXNGb3JEaXNwbGF5OwogCi0gICAg dHlwZWRlZiBIYXNoTWFwPEdyYXBoaWNzQ29udGV4dDNEKiwgUmVmUHRyPFJhdGVMaW1pdGVyPiA+ IFJhdGVMaW1pdGVyTWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJLaXQ6OldlYkdyYXBoaWNz Q29udGV4dDNEKiwgUmVmUHRyPFJhdGVMaW1pdGVyPiA+IFJhdGVMaW1pdGVyTWFwOwogICAgIFJh dGVMaW1pdGVyTWFwIG1fcmF0ZUxpbWl0ZXJzOwogCiAgICAgZmxvYXQgbV9wYWdlU2NhbGVGYWN0 b3I7Cg==