133030 2014-05-17 12:58:43 -0700 Rename some RenderLayerBacking member functions 2014-05-19 08:54:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue eric.carlson esprehn+autocc glenn jer.noble kondapallykalyan philipj sergio simon.fraser oldest_to_newest 1009983 0 simon.fraser 2014-05-17 12:58:43 -0700 Rename some RenderLayerBacking member functions 1009984 1 231635 simon.fraser 2014-05-17 13:05:55 -0700 Created attachment 231635 Patch 1010194 2 simon.fraser 2014-05-19 08:54:25 -0700 http://trac.webkit.org/changeset/169045 231635 2014-05-17 13:05:55 -0700 2014-05-17 13:07:09 -0700 Patch bug-133030-20140517130532.patch text/plain 12662 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTYwNTgzN2Q3MzZiZTRi MDZmOTkwODVkM2ViZTBmOGFlNjUxNmMxYy4uMzQ0YzMwMWNiODcwMWI2NjlkNDIyNTE1Y2NkZTY5 MjIyMmZlZjJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE0LTA1LTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBzb21l IFJlbmRlckxheWVyQmFja2luZyBtZW1iZXIgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwMzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgIkdyYXBoaWNzTGF5ZXIiIGZyb20g c29tZSBtZW1iZXIgZnVuY3Rpb24gbmFtZXMgb24gUmVuZGVyTGF5ZXJCYWNraW5nLgorICAgICAg ICAKKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkFWRldyYXBwZXI6OmNyZWF0ZUFWQ0ZWaWRlb0xheWVyKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQu bW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6Y3JlYXRlUVRN b3ZpZUxheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQmFja2luZzo6Y29udGVudENoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRDb250ZW50c05lZWREaXNwbGF5SW5SZWN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZp Z3VyYXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5n Ojp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv cjo6dXBkYXRlTGF5ZXJDb21wb3NpdGluZ1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6cmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJUcmVlR2VvbWV0cnkp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3Np dGluZ0Rlc2NlbmRhbnRHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNv bXBvc2l0b3I6OmF0dGFjaFJvb3RMYXllcik6CisKIDIwMTQtMDUtMTcgIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNjY0MjIpOiBBbGwg UmVuZGVyQm94IG9iamVjdHMgZ3JldyAxMDQgYnl0ZXMgZnJvbSBhZGRpbmcgcmVwYWludCB0aW1l cnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGLmNwcAppbmRleCA3ZGE2NzVkNjc1NTUwMTY3ZGZhMDc0YzQxZDE1OGIz NmE1ZjAxZDkwLi41MzQ3YjRmNGJjZDNkMzYxYWQwYTM0ZjI1M2IzYmQ1OTc4MGQ4MGZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2Yv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25DRi5jcHAKQEAgLTE2OTAsNyArMTY5MCw3IEBAIHZvaWQgQVZGV3JhcHBlcjo6Y3Jl YXRlQVZDRlZpZGVvTGF5ZXIoKQogICAgIGlmICghYXZQbGF5ZXIoKSB8fCBtX2F2Q0ZWaWRlb0xh eWVyKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBUaGUgbGF5ZXIgd2lsbCBnZXQgaG9va2Vk IHVwIHZpYSBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJDb25maWd1cmF0 aW9uKCkuCisgICAgLy8gVGhlIGxheWVyIHdpbGwgZ2V0IGhvb2tlZCB1cCB2aWEgUmVuZGVyTGF5 ZXJCYWNraW5nOjp1cGRhdGVDb25maWd1cmF0aW9uKCkuCiAgICAgbV9hdkNGVmlkZW9MYXllciA9 IGFkb3B0Q0YoQVZDRlBsYXllckxheWVyQ3JlYXRlV2l0aEFWQ0ZQbGF5ZXIoa0NGQWxsb2NhdG9y RGVmYXVsdCwgYXZQbGF5ZXIoKSwgbV9ub3RpZmljYXRpb25RdWV1ZSkpOwogICAgIExPRyhNZWRp YSwgIkFWRldyYXBwZXI6OmNyZWF0ZUFWQ0ZWaWRlb0xheWVyKCVwKSAtIHJldHVybmluZyAlcCIs IHRoaXMsIHZpZGVvTGF5ZXIoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0KaW5k ZXggNDUyZGI0YTE5YzA4OTllMDJmNTBiOTAyYmEyMzI0ZWIwZjI4ZmE3ZC4uYjgzODRjNjZmNGNl MmMxZjI5NzY2ZjdiNjAzYjBiZmVhMzU2NjI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtp dC5tbQpAQCAtNTE3LDcgKzUxNyw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNy ZWF0ZVFUTW92aWVMYXllcigpCiAjaWZuZGVmIE5ERUJVRwogICAgICAgICBbKENBTGF5ZXIgKilt X3F0VmlkZW9MYXllci5nZXQoKSBzZXROYW1lOkAiVmlkZW8gbGF5ZXIiXTsKICNlbmRpZgotICAg ICAgICAvLyBUaGUgbGF5ZXIgd2lsbCBnZXQgaG9va2VkIHVwIHZpYSBSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJDb25maWd1cmF0aW9uKCkuCisgICAgICAgIC8vIFRoZSBs YXllciB3aWxsIGdldCBob29rZWQgdXAgdmlhIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29u ZmlndXJhdGlvbigpLgogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggMGNiNDY4NTM1YTRhNTEzMDliYWIwYjRiOWIxOWJmNDAyNTA4OTQxNi4u YTczMjQ3ZWQwNGZkZTdhOWI0OGIyZDViOGMyZjcyYWJhMjQ0ODNjMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC02NDU1LDcgKzY0NTUsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpzdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRl clN0eWxlKiBvbGRTdHlsZQogICAgICAgICB8fCBuZWVkc0NvbXBvc2l0aW5nTGF5ZXJzUmVidWls dEZvck92ZXJmbG93KG9sZFN0eWxlLCAmbmV3U3R5bGUpKQogICAgICAgICBjb21wb3NpdG9yKCku c2V0Q29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCgpOwogICAgIGVsc2UgaWYgKGlzQ29tcG9z aXRlZCgpKQotICAgICAgICBiYWNraW5nKCktPnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgp OworICAgICAgICBiYWNraW5nKCktPnVwZGF0ZUdlb21ldHJ5KCk7CiAKICAgICBpZiAob2xkU3R5 bGUpIHsKICAgICAgICAgLy8gQ29tcG9zaXRpbmcgbGF5ZXJzIGtlZXAgdHJhY2sgb2Ygd2hldGhl ciB0aGV5IGFyZSBjbGlwcGVkIGJ5IGFueSBvZiB0aGUgYW5jZXN0b3JzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCA4YjI3ZDEyNjk4 YWEzOTI0NTJlMjE0MDIwOGI0NzBlMDZlMGMwNTUyLi4xNmRjOTczOGQwNDQ3ZmQzNTcxZjhjOTkz ZjVmMTU0MzVlNzhhMDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcApAQCAtNDk1LDcgKzQ5NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVBZnRlcldpZGdldFJlc2l6ZSgpCiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlQWZ0ZXJMYXlvdXQoVXBkYXRlQWZ0ZXJMYXlvdXRGbGFncyBmbGFncykKIHsKICAgICBp ZiAoIWNvbXBvc2l0b3IoKS5jb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKCkpIHsKLSAgICAg ICAgLy8gQ2FsbGluZyB1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKSBoZXJlIGdpdmVzIGlu Y29ycmVjdCByZXN1bHRzLCBiZWNhdXNlIHRoZQorICAgICAgICAvLyBDYWxsaW5nIHVwZGF0ZUdl b21ldHJ5KCkgaGVyZSBnaXZlcyBpbmNvcnJlY3QgcmVzdWx0cywgYmVjYXVzZSB0aGUKICAgICAg ICAgLy8gcG9zaXRpb24gb2YgdGhpcyBsYXllcidzIEdyYXBoaWNzTGF5ZXIgZGVwZW5kcyBvbiB0 aGUgcG9zaXRpb24gb2Ygb3VyIGNvbXBvc2l0aW5nCiAgICAgICAgIC8vIGFuY2VzdG9yJ3MgR3Jh cGhpY3NMYXllci4gVGhhdCBjYW5ub3QgYmUgZGV0ZXJtaW5lZCB1bnRpbCBhbGwgdGhlIGRlc2Nl bmRhbnQgCiAgICAgICAgIC8vIFJlbmRlckxheWVycyBvZiB0aGF0IGFuY2VzdG9yIGhhdmUgYmVl biBwcm9jZXNzZWQgdmlhIHVwZGF0ZUxheWVyUG9zaXRpb25zKCkuCkBAIC01MDYsNyArNTA2LDcg QEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyTGF5b3V0KFVwZGF0ZUFmdGVy TGF5b3V0RmxhZ3MgZmxhZ3MpCiAgICAgICAgIGNvbXBvc2l0b3IoKS51cGRhdGVDb21wb3NpdGlu Z0Rlc2NlbmRhbnRHZW9tZXRyeShtX293bmluZ0xheWVyLCBtX293bmluZ0xheWVyLCBmbGFncyAm IENvbXBvc2l0aW5nQ2hpbGRyZW5Pbmx5KTsKICAgICAgICAgCiAgICAgICAgIGlmIChmbGFncyAm IElzVXBkYXRlUm9vdCkgewotICAgICAgICAgICAgdXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5 KCk7CisgICAgICAgICAgICB1cGRhdGVHZW9tZXRyeSgpOwogICAgICAgICAgICAgY29tcG9zaXRv cigpLnVwZGF0ZVJvb3RMYXllclBvc2l0aW9uKCk7CiAgICAgICAgICAgICBSZW5kZXJMYXllciog c3RhY2tpbmdDb250YWluZXIgPSBtX293bmluZ0xheWVyLmVuY2xvc2luZ1N0YWNraW5nQ29udGFp bmVyKCk7CiAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0b3IoKS5jb21wb3NpdGluZ0xheWVyc05l ZWRSZWJ1aWxkKCkgJiYgc3RhY2tpbmdDb250YWluZXIgJiYgKHN0YWNraW5nQ29udGFpbmVyICE9 ICZtX293bmluZ0xheWVyKSkKQEAgLTUxOCw3ICs1MTgsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlQWZ0ZXJMYXlvdXQoVXBkYXRlQWZ0ZXJMYXlvdXRGbGFncyBmbGFncykKICAg ICAgICAgc2V0Q29udGVudHNOZWVkRGlzcGxheSgpOwogfQogCi1ib29sIFJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRpb24oKQorYm9vbCBSZW5kZXJMYXll ckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24oKQogewogICAgIG1fb3duaW5nTGF5ZXIudXBk YXRlRGVzY2VuZGFudERlcGVuZGVudEZsYWdzKCk7CiAgICAgbV9vd25pbmdMYXllci51cGRhdGVa T3JkZXJMaXN0cygpOwpAQCAtNjQ3LDcgKzY0Nyw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURl dmljZVBpeGVsT2Zmc2V0RnJvbVJlbmRlcmVyKGNvbnN0IExheW91dFNpemUmIHJlbmRlcmVyT2Zm CiAgICAgZGV2aWNlUGl4ZWxPZmZzZXRGcm9tUmVuZGVyZXIgPSByZW5kZXJlck9mZnNldEZyb21H cmFwaGljc0xheWVyIC0gZGV2aWNlUGl4ZWxGcmFjdGlvbkZyb21SZW5kZXJlcjsKIH0KIAotdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCit2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkoKQogewogICAgIC8vIElmIHdlIGhh dmVuJ3QgYnVpbHQgei1vcmRlciBsaXN0cyB5ZXQsIHdhaXQgdW50aWwgbGF0ZXIuCiAgICAgaWYg KG1fb3duaW5nTGF5ZXIuaXNTdGFja2luZ0NvbnRhaW5lcigpICYmIG1fb3duaW5nTGF5ZXIubV96 T3JkZXJMaXN0c0RpcnR5KQpAQCAtODk4LDcgKzg5OCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKQogCiAgICAgaWYgKG1fb3duaW5nTGF5 ZXIucmVmbGVjdGlvbkxheWVyKCkgJiYgbV9vd25pbmdMYXllci5yZWZsZWN0aW9uTGF5ZXIoKS0+ aXNDb21wb3NpdGVkKCkpIHsKICAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiByZWZsZWN0aW9u QmFja2luZyA9IG1fb3duaW5nTGF5ZXIucmVmbGVjdGlvbkxheWVyKCktPmJhY2tpbmcoKTsKLSAg ICAgICAgcmVmbGVjdGlvbkJhY2tpbmctPnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpOwor ICAgICAgICByZWZsZWN0aW9uQmFja2luZy0+dXBkYXRlR2VvbWV0cnkoKTsKICAgICAgICAgCiAg ICAgICAgIC8vIFRoZSByZWZsZWN0aW9uIGxheWVyIGhhcyB0aGUgYm91bmRzIG9mIG1fb3duaW5n TGF5ZXIucmVmbGVjdGlvbkxheWVyKCksCiAgICAgICAgIC8vIGJ1dCB0aGUgcmVmbGVjdGVkIGxh eWVyIGlzIHRoZSBib3VuZHMgb2YgdGhpcyBsYXllciwgc28gd2UgbmVlZCB0byBwb3NpdGlvbiBp dCBhcHByb3ByaWF0ZWx5LgpAQCAtMTg2MSw3ICsxODYxLDcgQEAgdm9pZCBSZW5kZXJMYXllckJh Y2tpbmc6OmNvbnRlbnRDaGFuZ2VkKENvbnRlbnRDaGFuZ2VUeXBlIGNoYW5nZVR5cGUpCiAgICAg fQogCiAgICAgaWYgKChjaGFuZ2VUeXBlID09IEJhY2tncm91bmRJbWFnZUNoYW5nZWQpICYmIGNh bkNyZWF0ZVRpbGVkSW1hZ2UoJnJlbmRlcmVyKCkuc3R5bGUoKSkpCi0gICAgICAgIHVwZGF0ZUdy YXBoaWNzTGF5ZXJHZW9tZXRyeSgpOworICAgICAgICB1cGRhdGVHZW9tZXRyeSgpOwogCiAgICAg aWYgKChjaGFuZ2VUeXBlID09IE1hc2tJbWFnZUNoYW5nZWQpICYmIG1fbWFza0xheWVyKSB7CiAg ICAgICAgIC8vIFRoZSBjb21wb3NpdGVkIGxheWVyIGJvdW5kcyByZWxpZXMgb24gYm94LT5tYXNr Q2xpcFJlY3QoKSwgd2hpY2ggY2hhbmdlcwpAQCAtMjEwNiw3ICsyMTA2LDcgQEAgdm9pZCBSZW5k ZXJMYXllckJhY2tpbmc6OnNldENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3QoY29uc3QgTGF5b3V0 UmVjdCYgciwgR3JhcGgKICAgICAgICAgRmxvYXRSZWN0IGxheWVyRGlydHlSZWN0ID0gcGl4ZWxT bmFwcGVkUmVjdEZvclBhaW50aW5nOwogICAgICAgICBsYXllckRpcnR5UmVjdC5tb3ZlKC1tX3Nj cm9sbGluZ0NvbnRlbnRzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpICsgbV9kZXZpY2VQaXhl bEZyYWN0aW9uRnJvbVJlbmRlcmVyKTsKICNpZiBQTEFURk9STShJT1MpCi0gICAgICAgIC8vIEFj Y291bnQgZm9yIHRoZSBmYWN0IHRoYXQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGlj c0xheWVyR2VvbWV0cnkoKSBiYWtlcyBzY3JvbGxPZmZzZXQgaW50byBvZmZzZXRGcm9tUmVuZGVy ZXIgb24gaU9TLgorICAgICAgICAvLyBBY2NvdW50IGZvciB0aGUgZmFjdCB0aGF0IFJlbmRlckxh eWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkoKSBiYWtlcyBzY3JvbGxPZmZzZXQgaW50byBvZmZz ZXRGcm9tUmVuZGVyZXIgb24gaU9TLgogICAgICAgICBsYXllckRpcnR5UmVjdC5tb3ZlKC1tX293 bmluZ0xheWVyLnNjcm9sbE9mZnNldCgpICsgbV9kZXZpY2VQaXhlbEZyYWN0aW9uRnJvbVJlbmRl cmVyKTsKICNlbmRpZgogICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldE5lZWRz RGlzcGxheUluUmVjdChsYXllckRpcnR5UmVjdCwgc2hvdWxkQ2xpcCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKaW5kZXggYTg1ZThlODQzNDE4YzU4 ZjI1NWE1NDYxMzlmNmZjYjA5MDZmZDdkMC4uMzUyMGFhMTdiNmM1MGZjNWVhYmZhY2Q2MzhkMTY3 YmRmYmViNWI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaApAQCAtNzQsOSArNzQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVBZnRlckxh eW91dChVcGRhdGVBZnRlckxheW91dEZsYWdzKTsKICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgbGF5ZXIgY29uZmlndXJhdGlvbiBjaGFuZ2VkLgotICAgIGJvb2wgdXBkYXRlR3JhcGhpY3NM YXllckNvbmZpZ3VyYXRpb24oKTsKKyAgICBib29sIHVwZGF0ZUNvbmZpZ3VyYXRpb24oKTsKICAg ICAvLyBVcGRhdGUgZ3JhcGhpY3MgbGF5ZXIgcG9zaXRpb24gYW5kIGJvdW5kcy4KLSAgICB2b2lk IHVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpOyAvLyBtYWtlIHByaXZhdGUKKyAgICB2b2lk IHVwZGF0ZUdlb21ldHJ5KCk7IC8vIG1ha2UgcHJpdmF0ZQogICAgIC8vIFVwZGF0ZSBjb250ZW50 cyBhbmQgY2xpcHBpbmcgc3RydWN0dXJlLgogICAgIHZvaWQgdXBkYXRlRHJhd3NDb250ZW50KCk7 CiAgICAgCkBAIC0yOTEsNyArMjkxLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgcGFpbnRJbnRv TGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllciosIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJl Y3QmIHBhaW50RGlydHlSZWN0LCBQYWludEJlaGF2aW9yLCBHcmFwaGljc0xheWVyUGFpbnRpbmdQ aGFzZSk7CiAKLSAgICAvLyBIZWxwZXIgZnVuY3Rpb24gZm9yIHVwZGF0ZUdyYXBoaWNzTGF5ZXJH ZW9tZXRyeS4KKyAgICAvLyBIZWxwZXIgZnVuY3Rpb24gZm9yIHVwZGF0ZUdlb21ldHJ5LgogICAg IHZvaWQgYWRqdXN0QW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kc0ZvckZsb3dUaHJlYWQoTGF5b3V0 UmVjdCYgYW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kcywgY29uc3QgUmVuZGVyTGF5ZXIqIGNvbXBv c2l0aW5nQW5jZXN0b3IpIGNvbnN0OwogCiAgICAgc3RhdGljIENTU1Byb3BlcnR5SUQgZ3JhcGhp Y3NMYXllclRvQ1NTUHJvcGVydHkoQW5pbWF0ZWRQcm9wZXJ0eUlEKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggYmE4YTUy NGM4YmRlZWJiM2NlYTVhYmVjOWY0NjI1NmEzNTUzZDZkOC4uN2RlNjY2MmYwOGUwODU3NTg0OGE4 YzUzNGJmNzc4NzZlNjBmYWNmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTkyMCw3ICs5MjAsNyBAQCBib29sIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJDb21wb3NpdGluZ1N0YXRlKFJlbmRlckxheWVy JiBsYXllciwgQ29tcAogCiAgICAgLy8gU2VlIGlmIHdlIG5lZWQgY29udGVudCBvciBjbGlwcGlu ZyBsYXllcnMuIE1ldGhvZHMgY2FsbGVkIGhlcmUgc2hvdWxkIGFzc3VtZQogICAgIC8vIHRoYXQg dGhlIGNvbXBvc2l0aW5nIHN0YXRlIG9mIGRlc2NlbmRhbnQgbGF5ZXJzIGhhcyBub3QgYmVlbiB1 cGRhdGVkIHlldC4KLSAgICBpZiAobGF5ZXIuYmFja2luZygpICYmIGxheWVyLmJhY2tpbmcoKS0+ dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRpb24oKSkKKyAgICBpZiAobGF5ZXIuYmFja2lu ZygpICYmIGxheWVyLmJhY2tpbmcoKS0+dXBkYXRlQ29uZmlndXJhdGlvbigpKQogICAgICAgICBs YXllckNoYW5nZWQgPSB0cnVlOwogCiAgICAgcmV0dXJuIGxheWVyQ2hhbmdlZDsKQEAgLTE0MzMs MTAgKzE0MzMsMTAgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21wb3Np dGluZ0xheWVyVHJlZShSZW5kZXJMYXllciYgbGF5ZXIsIFZlY3QKICAgICAgICAgICAgICAgICBy ZWZsZWN0aW9uLT5iYWNraW5nKCktPnVwZGF0ZUNvbXBvc2l0ZWRCb3VuZHMoKTsKICAgICAgICAg fQogCi0gICAgICAgIGlmIChsYXllckJhY2tpbmctPnVwZGF0ZUdyYXBoaWNzTGF5ZXJDb25maWd1 cmF0aW9uKCkpCisgICAgICAgIGlmIChsYXllckJhY2tpbmctPnVwZGF0ZUNvbmZpZ3VyYXRpb24o KSkKICAgICAgICAgICAgIGxheWVyQmFja2luZy0+dXBkYXRlRGVidWdJbmRpY2F0b3JzKG1fc2hv d0RlYnVnQm9yZGVycywgbV9zaG93UmVwYWludENvdW50ZXIpOwogICAgICAgICAKLSAgICAgICAg bGF5ZXJCYWNraW5nLT51cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKTsKKyAgICAgICAgbGF5 ZXJCYWNraW5nLT51cGRhdGVHZW9tZXRyeSgpOwogCiAgICAgICAgIGlmICghbGF5ZXIucGFyZW50 KCkpCiAgICAgICAgICAgICB1cGRhdGVSb290TGF5ZXJQb3NpdGlvbigpOwpAQCAtMTcxNiw4ICsx NzE2LDggQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyVHJlZUdlb21l dHJ5KFJlbmRlckxheWVyJiBsYXllciwgaW50IGRlcHQKICAgICAgICAgICAgICAgICByZWZsZWN0 aW9uLT5iYWNraW5nKCktPnVwZGF0ZUNvbXBvc2l0ZWRCb3VuZHMoKTsKICAgICAgICAgfQogCi0g ICAgICAgIGxheWVyQmFja2luZy0+dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRpb24oKTsK LSAgICAgICAgbGF5ZXJCYWNraW5nLT51cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnkoKTsKKyAg ICAgICAgbGF5ZXJCYWNraW5nLT51cGRhdGVDb25maWd1cmF0aW9uKCk7CisgICAgICAgIGxheWVy QmFja2luZy0+dXBkYXRlR2VvbWV0cnkoKTsKIAogICAgICAgICBpZiAoIWxheWVyLnBhcmVudCgp KQogICAgICAgICAgICAgdXBkYXRlUm9vdExheWVyUG9zaXRpb24oKTsKQEAgLTE3NjUsNyArMTc2 NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0Rlc2Nl bmRhbnRHZW9tZXRyeShSZW5kZXJMYXllciYgY29tCiAgICAgICAgICAgICAgICAgICAgIHJlZmxl Y3Rpb24tPmJhY2tpbmcoKS0+dXBkYXRlQ29tcG9zaXRlZEJvdW5kcygpOwogICAgICAgICAgICAg fQogCi0gICAgICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRy eSgpOworICAgICAgICAgICAgbGF5ZXJCYWNraW5nLT51cGRhdGVHZW9tZXRyeSgpOwogICAgICAg ICAgICAgaWYgKGNvbXBvc2l0ZWRDaGlsZHJlbk9ubHkpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CkBAIC0zMzM1LDcgKzMzMzUsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6YXR0YWNoUm9vdExheWVyKFJvb3RMYXllckF0dGFjaG1lbnQgYXR0YWNobWVudCkKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgUm9vdExheWVyQXR0YWNo ZWRWaWFFbmNsb3NpbmdGcmFtZTogewotICAgICAgICAgICAgLy8gVGhlIGxheWVyIHdpbGwgZ2V0 IGhvb2tlZCB1cCB2aWEgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyQ29u ZmlndXJhdGlvbigpCisgICAgICAgICAgICAvLyBUaGUgbGF5ZXIgd2lsbCBnZXQgaG9va2VkIHVw IHZpYSBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24oKQogICAgICAgICAg ICAgLy8gZm9yIHRoZSBmcmFtZSdzIHJlbmRlcmVyIGluIHRoZSBwYXJlbnQgZG9jdW1lbnQuCiAg ICAgICAgICAgICBtX3JlbmRlclZpZXcuZG9jdW1lbnQoKS5vd25lckVsZW1lbnQoKS0+c2NoZWR1 bGVTZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRpY1N0eWxlQ2hhbmdlKTsKICAgICAgICAgICAg IGJyZWFrOwo=