201111 2019-08-23 17:56:40 -0700 RenderLayerModelObject should not call private RenderLayer functions 2019-08-23 20:34:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1564734 0 simon.fraser 2019-08-23 17:56:40 -0700 RenderLayerModelObject should not call private RenderLayer functions 1564735 1 377189 simon.fraser 2019-08-23 17:58:46 -0700 Created attachment 377189 Patch 1564756 2 simon.fraser 2019-08-23 20:33:56 -0700 https://trac.webkit.org/changeset/249080/webkit 1564757 3 webkit-bug-importer 2019-08-23 20:34:19 -0700 <rdar://problem/54664920> 377189 2019-08-23 17:58:46 -0700 2019-08-23 20:30:30 -0700 Patch bug-201111-20190823175845.patch text/plain 10005 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU0NzVhZDkyNzVmNTIw NDdhNTlhZjY5NDNkYWE1MDY0YTkxMzM2My4uZDZiYTRjNjRjZDE0M2U1ODNkNDQ2MzlmNGQ0OWQz OTNiNmQ1NGY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA4LTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmRlckxheWVy TW9kZWxPYmplY3Qgc2hvdWxkIG5vdCBjYWxsIHByaXZhdGUgUmVuZGVyTGF5ZXIgZnVuY3Rpb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDExMTEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJl bmRlckxheWVyTW9kZWxPYmplY3Qgbm8gbG9uZ2VyIGEgZnJpZW5kIGNsYXNzIG9mIFJlbmRlckxh eWVyLCBnaXZpbmcgaXQgYSBwdWJsaWMKKyAgICAgICAgd2lsbFJlbW92ZUNoaWxkV2l0aEJsZW5k TW9kZSgpIGZ1bmN0aW9uIHRvIGNhbGwuIEFsc28gbWFrZSB0aGUgVXBkYXRlTGF5ZXJQb3NpdGlv bnNGbGFnCisgICAgICAgIGVudW0gcHJpdmF0ZSwgcHJvdmlkaW5nIGEgdXBkYXRlTGF5ZXJQb3Np dGlvbnNBZnRlclN0eWxlQ2hhbmdlKCkgZm9yIFJlbmRlckxheWVyTW9kZWxPYmplY3QsCisgICAg ICAgIGFuZCBjaGFuZ2luZyB0aGUgYXJndW1lbnRzIG9mIHVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0 ZXJMYXlvdXQoKSBmb3IgRnJhbWVWaWV3LgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6ZGlkTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZUxheWVyUG9zaXRpb25G bGFncyk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyU3R5 bGVDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9z aXRpb25zQWZ0ZXJMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OndpbGxS ZW1vdmVDaGlsZFdpdGhCbGVuZE1vZGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN0eWxlRGlkQ2hhbmdlKToK KwogMjAxOS0wOC0yMiAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdW1dQRV0gRml4ZXMgZm9yIG5vbi11bmlmaWVkIGJ1aWxkcyBhZnRl ciByMjQ4NTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggYTVlNWVkZTBiNGI3NDdl NDc5NGRjNzk0MDZhZWZjY2JiMzg1ZGQ2ZC4uY2I0YjgxYTM1Njg1YzhlYTBlZjFkMzFmNzc1MWE5 ZTBlMDcwMDk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMTQ1LDE4ICsxNDUs NiBAQCBzdGF0aWMgY29uc3RleHByIGZsb2F0IGRlZmF1bHRTaWduaWZpY2FudFJlbmRlcmVkVGV4 dE1lYW5MZW5ndGggPSA1MDsKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWFpbkFydGljbGVT aWduaWZpY2FudFJlbmRlcmVkVGV4dENoYXJhY3RlclRocmVzaG9sZCA9IDE1MDA7CiBzdGF0aWMg Y29uc3RleHByIGZsb2F0IG1haW5BcnRpY2xlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRNZWFuTGVu Z3RoID0gMjU7CiAKLXN0YXRpYyBPcHRpb25TZXQ8UmVuZGVyTGF5ZXI6OlVwZGF0ZUxheWVyUG9z aXRpb25zRmxhZz4gdXBkYXRlTGF5ZXJQb3NpdGlvbkZsYWdzKFJlbmRlckxheWVyKiBsYXllciwg Ym9vbCBpc1JlbGF5b3V0aW5nU3VidHJlZSwgYm9vbCBkaWRGdWxsUmVwYWludCkKLXsKLSAgICBh dXRvIGZsYWdzID0gUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zRGVmYXVsdEZsYWdz KCk7Ci0gICAgaWYgKGRpZEZ1bGxSZXBhaW50KSB7Ci0gICAgICAgIGZsYWdzLnJlbW92ZShSZW5k ZXJMYXllcjo6Q2hlY2tGb3JSZXBhaW50KTsKLSAgICAgICAgZmxhZ3MuYWRkKFJlbmRlckxheWVy OjpOZWVkc0Z1bGxSZXBhaW50SW5CYWNraW5nKTsKLSAgICB9Ci0gICAgaWYgKGlzUmVsYXlvdXRp bmdTdWJ0cmVlICYmIGxheWVyLT5lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIoUmVuZGVyTGF5ZXI6 OkluY2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzKSkKLSAgICAgICAgZmxhZ3MuYWRkKFJl bmRlckxheWVyOjpVcGRhdGVQYWdpbmF0aW9uKTsKLSAgICByZXR1cm4gZmxhZ3M7Ci19Ci0KIFBh Z2luYXRpb246Ok1vZGUgcGFnaW5hdGlvbk1vZGVGb3JSZW5kZXJTdHlsZShjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUpCiB7CiAgICAgT3ZlcmZsb3cgb3ZlcmZsb3cgPSBzdHlsZS5vdmVyZmxvd1ko KTsKQEAgLTEyNDUsNyArMTIzMyw3IEBAIHZvaWQgRnJhbWVWaWV3OjpkaWRMYXlvdXQoV2Vha1B0 cjxSZW5kZXJFbGVtZW50PiBsYXlvdXRSb290KQogewogICAgIHJlbmRlclZpZXcoKS0+cmVsZWFz ZVByb3RlY3RlZFJlbmRlcldpZGdldHMoKTsKICAgICBhdXRvKiBsYXlvdXRSb290RW5jbG9zaW5n TGF5ZXIgPSBsYXlvdXRSb290LT5lbmNsb3NpbmdMYXllcigpOwotICAgIGxheW91dFJvb3RFbmNs b3NpbmdMYXllci0+dXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dChyZW5kZXJWaWV3KCkt PmxheWVyKCksIHVwZGF0ZUxheWVyUG9zaXRpb25GbGFncyhsYXlvdXRSb290RW5jbG9zaW5nTGF5 ZXIsICFpczxSZW5kZXJWaWV3PigqbGF5b3V0Um9vdCksIGxheW91dENvbnRleHQoKS5uZWVkc0Z1 bGxSZXBhaW50KCkpKTsKKyAgICBsYXlvdXRSb290RW5jbG9zaW5nTGF5ZXItPnVwZGF0ZUxheWVy UG9zaXRpb25zQWZ0ZXJMYXlvdXQoIWlzPFJlbmRlclZpZXc+KCpsYXlvdXRSb290KSwgbGF5b3V0 Q29udGV4dCgpLm5lZWRzRnVsbFJlcGFpbnQoKSk7CiAKICAgICB1cGRhdGVDb21wb3NpdGluZ0xh eWVyc0FmdGVyTGF5b3V0KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCmluZGV4IDZlMzAyZWRiNmI4MjZmODgyYmRlNjM5ZTNjMWIwODUxZDQ2YzdkMzAuLmUyY2I1 OWM1Y2NlMjQ3NThhZjAzNTQ5N2UxZmVlMjAwZWZhYmVhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtODc0LDEzICs4NzQsMzAgQEAgYm9vbCBSZW5kZXJM YXllcjo6cmVxdWlyZXNGdWxsTGF5ZXJJbWFnZUZvckZpbHRlcnMoKSBjb25zdAogICAgIHJldHVy biBtX2ZpbHRlcnMgJiYgbV9maWx0ZXJzLT5oYXNGaWx0ZXJUaGF0TW92ZXNQaXhlbHMoKTsKIH0K IAotdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dChjb25z dCBSZW5kZXJMYXllciogcm9vdExheWVyLCBPcHRpb25TZXQ8VXBkYXRlTGF5ZXJQb3NpdGlvbnNG bGFnPiBmbGFncykKK3ZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJT dHlsZUNoYW5nZSgpCiB7CisgICAgdXBkYXRlTGF5ZXJQb3NpdGlvbnMobnVsbHB0ciwgUmVuZGVy TGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zRGVmYXVsdEZsYWdzKCkpOworfQorCit2b2lkIFJl bmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyTGF5b3V0KGJvb2wgaXNSZWxheW91 dGluZ1N1YnRyZWUsIGJvb2wgZGlkRnVsbFJlcGFpbnQpCit7CisgICAgYXV0byB1cGRhdGVMYXll clBvc2l0aW9uRmxhZ3MgPSBbJl0oYm9vbCBpc1JlbGF5b3V0aW5nU3VidHJlZSwgYm9vbCBkaWRG dWxsUmVwYWludCkgeworICAgICAgICBhdXRvIGZsYWdzID0gUmVuZGVyTGF5ZXI6OnVwZGF0ZUxh eWVyUG9zaXRpb25zRGVmYXVsdEZsYWdzKCk7CisgICAgICAgIGlmIChkaWRGdWxsUmVwYWludCkg eworICAgICAgICAgICAgZmxhZ3MucmVtb3ZlKFJlbmRlckxheWVyOjpDaGVja0ZvclJlcGFpbnQp OworICAgICAgICAgICAgZmxhZ3MuYWRkKFJlbmRlckxheWVyOjpOZWVkc0Z1bGxSZXBhaW50SW5C YWNraW5nKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoaXNSZWxheW91dGluZ1N1YnRyZWUgJiYg ZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyKFJlbmRlckxheWVyOjpJbmNsdWRlQ29tcG9zaXRlZFBh Z2luYXRlZExheWVycykpCisgICAgICAgICAgICBmbGFncy5hZGQoUmVuZGVyTGF5ZXI6OlVwZGF0 ZVBhZ2luYXRpb24pOworICAgICAgICByZXR1cm4gZmxhZ3M7CisgICAgfTsKKwogICAgIExPRyhD b21wb3NpdGluZywgIlJlbmRlckxheWVyICVwIHVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJMYXlv dXQiLCB0aGlzKTsKICAgICBSZW5kZXJHZW9tZXRyeU1hcCBnZW9tZXRyeU1hcChVc2VUcmFuc2Zv cm1zKTsKLSAgICBpZiAodGhpcyAhPSByb290TGF5ZXIpCisgICAgaWYgKCFpc1JlbmRlclZpZXdM YXllcigpKQogICAgICAgICBnZW9tZXRyeU1hcC5wdXNoTWFwcGluZ3NUb0FuY2VzdG9yKHBhcmVu dCgpLCBudWxscHRyKTsKLSAgICB1cGRhdGVMYXllclBvc2l0aW9ucygmZ2VvbWV0cnlNYXAsIGZs YWdzKTsKKworICAgIHVwZGF0ZUxheWVyUG9zaXRpb25zKCZnZW9tZXRyeU1hcCwgdXBkYXRlTGF5 ZXJQb3NpdGlvbkZsYWdzKGlzUmVsYXlvdXRpbmdTdWJ0cmVlLCBkaWRGdWxsUmVwYWludCkpOwog fQogCiB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyhSZW5kZXJHZW9tZXRy eU1hcCogZ2VvbWV0cnlNYXAsIE9wdGlvblNldDxVcGRhdGVMYXllclBvc2l0aW9uc0ZsYWc+IGZs YWdzKQpAQCAtMTE2OSw2ICsxMTg2LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUJsZW5k TW9kZSgpCiAgICAgICAgIG1fYmxlbmRNb2RlID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG5ld0Js ZW5kTW9kZSk7CiB9CiAKK3ZvaWQgUmVuZGVyTGF5ZXI6OndpbGxSZW1vdmVDaGlsZFdpdGhCbGVu ZE1vZGUoKQoreworICAgIHBhcmVudCgpLT5kaXJ0eUFuY2VzdG9yQ2hhaW5IYXNCbGVuZGluZ0Rl c2NlbmRhbnRzKCk7Cit9CisKIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUFuY2VzdG9yQ2hhaW5I YXNCbGVuZGluZ0Rlc2NlbmRhbnRzKCkKIHsKICAgICBmb3IgKGF1dG8qIGxheWVyID0gdGhpczsg bGF5ZXI7IGxheWVyID0gbGF5ZXItPnBhcmVudCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oCmluZGV4IGUzMWFiYjg3NjMwZmY2ZWZmN2Q0NjBmYTFlM2IyZTEyMmI5MGI2 NTkuLjkzMTY0MzkyN2JiNzkzNzNlZDJkZmE2OWY1ZTcyNjc5M2UyZTg2M2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC0xNDAsNiArMTQwLDggQEAgY2xhc3MgUmVu ZGVyTGF5ZXIgZmluYWwgOiBwdWJsaWMgU2Nyb2xsYWJsZUFyZWEgewogcHVibGljOgogICAgIGZy aWVuZCBjbGFzcyBSZW5kZXJSZXBsaWNhOwogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJMYXllckZp bHRlcnM7CisgICAgZnJpZW5kIGNsYXNzIFJlbmRlckxheWVyQmFja2luZzsKKyAgICBmcmllbmQg Y2xhc3MgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOwogCiAgICAgZXhwbGljaXQgUmVuZGVyTGF5ZXIo UmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYpOwogICAgIHZpcnR1YWwgflJlbmRlckxheWVyKCk7CkBA IC01MjksMTkgKzUzMSw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgY2FuUmVuZGVyM0RUcmFuc2Zv cm1zKCkgY29uc3Q7CiAKLSAgICBlbnVtIFVwZGF0ZUxheWVyUG9zaXRpb25zRmxhZyB7Ci0gICAg ICAgIENoZWNrRm9yUmVwYWludCAgICAgICAgICAgICAgICAgICAgID0gMSA8PCAwLAotICAgICAg ICBOZWVkc0Z1bGxSZXBhaW50SW5CYWNraW5nICAgICAgICAgICA9IDEgPDwgMSwKLSAgICAgICAg Q29udGFpbmluZ0NsaXBwaW5nTGF5ZXJDaGFuZ2VkU2l6ZSAgPSAxIDw8IDIsCi0gICAgICAgIFVw ZGF0ZVBhZ2luYXRpb24gICAgICAgICAgICAgICAgICAgID0gMSA8PCAzLAotICAgICAgICBTZWVu Rml4ZWRMYXllciAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgNCwKLSAgICAgICAgU2VlblRy YW5zZm9ybWVkTGF5ZXIgICAgICAgICAgICAgICAgPSAxIDw8IDUsCi0gICAgICAgIFNlZW4zRFRy YW5zZm9ybWVkTGF5ZXIgICAgICAgICAgICAgID0gMSA8PCA2LAotICAgICAgICBTZWVuQ29tcG9z aXRlZFNjcm9sbGluZ0xheWVyICAgICAgICA9IDEgPDwgNywKLSAgICB9OwotICAgIHN0YXRpYyBj b25zdGV4cHIgT3B0aW9uU2V0PFVwZGF0ZUxheWVyUG9zaXRpb25zRmxhZz4gdXBkYXRlTGF5ZXJQ b3NpdGlvbnNEZWZhdWx0RmxhZ3MoKSB7IHJldHVybiB7IENoZWNrRm9yUmVwYWludCB9OyB9Ci0K LSAgICB2b2lkIHVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJMYXlvdXQoY29uc3QgUmVuZGVyTGF5 ZXIqIHJvb3RMYXllciwgT3B0aW9uU2V0PFVwZGF0ZUxheWVyUG9zaXRpb25zRmxhZz4pOworICAg IHZvaWQgdXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclN0eWxlQ2hhbmdlKCk7CisgICAgdm9pZCB1 cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyTGF5b3V0KGJvb2wgaXNSZWxheW91dGluZ1N1YnRyZWUs IGJvb2wgZGlkRnVsbFJlcGFpbnQpOwogCiAgICAgdm9pZCB1cGRhdGVMYXllclBvc2l0aW9uc0Fm dGVyT3ZlcmZsb3dTY3JvbGwoKTsKICAgICB2b2lkIHVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJE b2N1bWVudFNjcm9sbCgpOwpAQCAtNTU5LDYgKzU1MCw3IEBAIHB1YmxpYzoKICAgICAKICNpZiBF TkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQogICAgIHZvaWQgdXBkYXRlQmxlbmRNb2RlKCk7CisgICAg dm9pZCB3aWxsUmVtb3ZlQ2hpbGRXaXRoQmxlbmRNb2RlKCk7CiAjZW5kaWYKIAogICAgIGNvbnN0 IExheW91dFNpemUmIG9mZnNldEZvckluRmxvd1Bvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9v ZmZzZXRGb3JJbkZsb3dQb3NpdGlvbjsgfQpAQCAtOTg2LDYgKzk3OCwxOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgdXBkYXRlU2Nyb2xsYmFyc0FmdGVyU3R5bGVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0eWxlKTsKICAgICB2b2lkIHVwZGF0ZVNjcm9sbGJhcnNBZnRlckxheW91dCgpOwog CisgICAgZW51bSBVcGRhdGVMYXllclBvc2l0aW9uc0ZsYWcgeworICAgICAgICBDaGVja0ZvclJl cGFpbnQgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKKyAgICAgICAgTmVlZHNGdWxsUmVw YWludEluQmFja2luZyAgICAgICAgICAgPSAxIDw8IDEsCisgICAgICAgIENvbnRhaW5pbmdDbGlw cGluZ0xheWVyQ2hhbmdlZFNpemUgID0gMSA8PCAyLAorICAgICAgICBVcGRhdGVQYWdpbmF0aW9u ICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMywKKyAgICAgICAgU2VlbkZpeGVkTGF5ZXIgICAg ICAgICAgICAgICAgICAgICAgPSAxIDw8IDQsCisgICAgICAgIFNlZW5UcmFuc2Zvcm1lZExheWVy ICAgICAgICAgICAgICAgID0gMSA8PCA1LAorICAgICAgICBTZWVuM0RUcmFuc2Zvcm1lZExheWVy ICAgICAgICAgICAgICA9IDEgPDwgNiwKKyAgICAgICAgU2VlbkNvbXBvc2l0ZWRTY3JvbGxpbmdM YXllciAgICAgICAgPSAxIDw8IDcsCisgICAgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIE9wdGlv blNldDxVcGRhdGVMYXllclBvc2l0aW9uc0ZsYWc+IHVwZGF0ZUxheWVyUG9zaXRpb25zRGVmYXVs dEZsYWdzKCkgeyByZXR1cm4geyBDaGVja0ZvclJlcGFpbnQgfTsgfQorCiAgICAgLy8gUmV0dXJu cyB0cnVlIGlmIHRoZSBwb3NpdGlvbiBjaGFuZ2VkLgogICAgIGJvb2wgdXBkYXRlTGF5ZXJQb3Np dGlvbihPcHRpb25TZXQ8VXBkYXRlTGF5ZXJQb3NpdGlvbnNGbGFnPiogPSBudWxscHRyKTsKIApA QCAtMTE3MSwxMCArMTE3NSw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRJbmRpcmVjdENvbXBv c2l0aW5nUmVhc29uKEluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb24gcmVhc29uKSB7IG1faW5kaXJl Y3RDb21wb3NpdGluZ1JlYXNvbiA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyZWFzb24pOyB9CiAg ICAgYm9vbCBtdXN0Q29tcG9zaXRlRm9ySW5kaXJlY3RSZWFzb25zKCkgY29uc3QgeyByZXR1cm4g bV9pbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOyB9CiAKLSAgICBmcmllbmQgY2xhc3MgUmVuZGVy TGF5ZXJCYWNraW5nOwotICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJMYXllckNvbXBvc2l0b3I7Ci0g ICAgZnJpZW5kIGNsYXNzIFJlbmRlckxheWVyTW9kZWxPYmplY3Q7Ci0KICAgICBMYXlvdXRVbml0 IG92ZXJmbG93VG9wKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBvdmVyZmxvd0JvdHRvbSgpIGNv bnN0OwogICAgIExheW91dFVuaXQgb3ZlcmZsb3dMZWZ0KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAKaW5kZXggMTI4 Yzk2ZGFlMGIzMTAwNmNhMjVkNWE1NmM3MjBiYzg5MGQzNGYwZi4uMWM1MzdlY2FlOTg3Mjk3ZDdj ODg3MDJkNjIxNmY3YzJlMDhmZjBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcApAQCAtMTcxLDEzICsxNzEsMTMgQEAgdm9p ZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2Ug ZGlmZiwgY29uc3QgUmVuZGVyU3QKICAgICAgICAgICAgIGNyZWF0ZUxheWVyKCk7CiAgICAgICAg ICAgICBpZiAocGFyZW50KCkgJiYgIW5lZWRzTGF5b3V0KCkgJiYgY29udGFpbmluZ0Jsb2NrKCkp IHsKICAgICAgICAgICAgICAgICBsYXllcigpLT5zZXRSZXBhaW50U3RhdHVzKE5lZWRzRnVsbFJl cGFpbnQpOwotICAgICAgICAgICAgICAgIGxheWVyKCktPnVwZGF0ZUxheWVyUG9zaXRpb25zKCk7 CisgICAgICAgICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclN0eWxl Q2hhbmdlKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKGxheWVy KCkgJiYgbGF5ZXIoKS0+cGFyZW50KCkpIHsKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQog ICAgICAgICBpZiAob2xkU3R5bGUtPmhhc0JsZW5kTW9kZSgpKQotICAgICAgICAgICAgbGF5ZXIo KS0+cGFyZW50KCktPmRpcnR5QW5jZXN0b3JDaGFpbkhhc0JsZW5kaW5nRGVzY2VuZGFudHMoKTsK KyAgICAgICAgICAgIGxheWVyKCktPndpbGxSZW1vdmVDaGlsZFdpdGhCbGVuZE1vZGUoKTsKICNl bmRpZgogICAgICAgICBzZXRIYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoZmFsc2UpOyAvLyBB bGwgdHJhbnNmb3JtLXJlbGF0ZWQgcHJvcGV0aWVzIGZvcmNlIGxheWVycywgc28gd2Uga25vdyB3 ZSBkb24ndCBoYXZlIG9uZSBvciB0aGUgb2JqZWN0IGRvZXNuJ3Qgc3VwcG9ydCB0aGVtLgogICAg ICAgICBzZXRIYXNSZWZsZWN0aW9uKGZhbHNlKTsK