78942 2012-02-17 16:14:38 -0800 Coalesce composited layers if applicable 2012-02-27 10:35:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 50192 P2 Normal --- 1 wangxianzhu webkit-unassigned dglazkov enne jamesr klobag simon.fraser vangelis webkit.review.bot wiltzius oldest_to_newest 559625 0 wangxianzhu 2012-02-17 16:14:38 -0800 Try to coalesce some composited layers. If subtree compositing flag is off, and the layer is fully inside the ancestor, there is no need to do the overlap test. This will reduce a lot of sub layers. --klobag 563545 1 128567 wangxianzhu 2012-02-23 15:22:04 -0800 Created attachment 128567 patch 563583 2 enne 2012-02-23 15:51:16 -0800 I think this might be a duplicate of what smfr is trying to do in https://bugs.webkit.org/show_bug.cgi?id=50192. smfr: What's the status on that patch? 563618 3 128567 webkit.review.bot 2012-02-23 16:05:06 -0800 Comment on attachment 128567 patch Attachment 128567 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11600483 New failing tests: compositing/reflections/nested-reflection-transformed2.html compositing/reflections/nested-reflection-transformed.html compositing/reflections/reflection-on-composited.html 563658 4 simon.fraser 2012-02-23 16:27:56 -0800 *** This bug has been marked as a duplicate of bug 50192 *** 128567 2012-02-23 15:22:04 -0800 2012-02-27 10:35:17 -0800 patch 78942a text/plain 10430 wangxianzhu SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwODY0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIzICBYaWFuemh1 IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ29hbGVzY2UgY29t cG9zaXRlZCBsYXllcnMgaWYgYXBwbGljYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg5NDIKKworICAgICAgICBUcnkgdG8gY29hbGVzY2Ugc29t ZSBjb21wb3NpdGVkIGxheWVycy4gSWYgc3VidHJlZSBjb21wb3NpdGluZyBmbGFnIGlzIAorICAg ICAgICBvZmYsIGFuZCB0aGUgbGF5ZXIgaXMgZnVsbHkgaW5zaWRlIHRoZSBhbmNlc3RvciwgdGhl cmUgaXMgbm8gbmVlZCB0byBkbyAKKyAgICAgICAgdGhlIG92ZXJsYXAgdGVzdC4gVGhpcyB3aWxs IHJlZHVjZSBhIGxvdCBvZiBzdWIgbGF5ZXJzLiAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9j b2FsZXNjZS1sYXllci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcDoKKyAgICAgICAgKENvbXBvc2l0aW5nU3RhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMp OgorCiAyMDEyLTAyLTIzICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3Jn PgogCiAgICAgICAgIENsZWFudXAgUmVuZGVyQmxvY2s6Om1vdmVDaGlsZHJlblRvCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cAkocmV2aXNpb24gMTA4Mzk2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3LDYgKzg3LDEwIEBAIHN0cnVj dCBDb21wb3NpdGluZ1N0YXRlIHsKICAgICAKICAgICBSZW5kZXJMYXllciogbV9jb21wb3NpdGlu Z0FuY2VzdG9yOwogICAgIGJvb2wgbV9zdWJ0cmVlSXNDb21wb3NpdGluZzsKKyAgICAvLyBtX2Nv bXBvc2l0aW5nQm91bmRzIGlzIG9ubHkgdXNlZCBpbiBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJl bWVudHMuIEl0IGNhbiBiZSBlaXRoZXIgdGhlCisgICAgLy8gYW5jZXN0b3IgYm91bmRzIG9yIHRo ZSBib3VuZHMgZm9yIHRoZSBzaWJsaW5nIGxheWVycyB3aGljaCBhcmUgYWJvdmUgdGhlIGNvbXBv c2l0ZWQgbGF5ZXIuCisgICAgLy8gSXQgaXMgdXNlZCB0byByZWplY3QgY3JlYXRpbmcgdW5uZWNl c3NhcnkgbGF5ZXJzLgorICAgIExheW91dFJlY3QgbV9jb21wb3NpdGluZ0JvdW5kczsKICNpZm5k ZWYgTkRFQlVHCiAgICAgaW50IG1fZGVwdGg7CiAjZW5kaWYKQEAgLTU3OSwxMSArNTgzLDggQEAg UmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5jbAogICAgIHJldHVybiAwOwog fQogCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkVG9PdmVybGFwTWFwKE92ZXJsYXBN YXAmIG92ZXJsYXBNYXAsIFJlbmRlckxheWVyKiBsYXllciwgSW50UmVjdCYgbGF5ZXJCb3VuZHMs IGJvb2wmIGJvdW5kc0NvbXB1dGVkKQordm9pZCBjb21wdXRlQWJzb2x1dGVCb3VuZHMoY29uc3Qg UmVuZGVyTGF5ZXIqIGxheWVyLCBJbnRSZWN0JiBsYXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29t cHV0ZWQpCiB7Ci0gICAgaWYgKGxheWVyLT5pc1Jvb3RMYXllcigpKQotICAgICAgICByZXR1cm47 Ci0KICAgICBpZiAoIWJvdW5kc0NvbXB1dGVkKSB7CiAgICAgICAgIGxheWVyQm91bmRzID0gbGF5 ZXItPnJlbmRlcmVyKCktPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KGxheWVyLT5sb2Nh bEJvdW5kaW5nQm94KCkpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogICAgICAgICAvLyBFbXB0 eSByZWN0cyBuZXZlciBpbnRlcnNlY3QsIGJ1dCB3ZSBuZWVkIHRoZW0gdG8gZm9yIHRoZSBwdXJw b3NlcyBvZiBvdmVybGFwIHRlc3RpbmcuCkBAIC01OTEsNiArNTkyLDE0IEBAIHZvaWQgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXAKICAgICAgICAgICAgIGxheWVyQm91bmRzLnNl dFNpemUoSW50U2l6ZSgxLCAxKSk7CiAgICAgICAgIGJvdW5kc0NvbXB1dGVkID0gdHJ1ZTsKICAg ICB9Cit9CisKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoT3Zl cmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVyTGF5ZXIqIGxheWVyLCBJbnRSZWN0JiBsYXllckJv dW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpCit7CisgICAgaWYgKGxheWVyLT5pc1Jvb3RMYXll cigpKQorICAgICAgICByZXR1cm47CisKKyAgICBjb21wdXRlQWJzb2x1dGVCb3VuZHMobGF5ZXIs IGxheWVyQm91bmRzLCBib3VuZHNDb21wdXRlZCk7CiAKICAgICBJbnRSZWN0IGNsaXBSZWN0ID0g cGl4ZWxTbmFwcGVkSW50UmVjdChsYXllci0+YmFja2dyb3VuZENsaXBSZWN0KHJvb3RSZW5kZXJM YXllcigpLCAwLCB0cnVlKS5yZWN0KCkpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVn aW9ucy4KICAgICBjbGlwUmVjdC5zY2FsZShwYWdlU2NhbGVGYWN0b3IoKSk7CkBAIC02NzMsMTIg KzY4MiwxMSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvCiAgICAg SW50UmVjdCBhYnNCb3VuZHM7CiAgICAgaWYgKG92ZXJsYXBNYXAgJiYgIW92ZXJsYXBNYXAtPmlz RW1wdHkoKSkgewogICAgICAgICAvLyBJZiB3ZSdyZSB0ZXN0aW5nIGZvciBvdmVybGFwLCB3ZSBv bmx5IG5lZWQgdG8gY29tcG9zaXRlIGlmIHdlIG92ZXJsYXAgc29tZXRoaW5nIHRoYXQgaXMgYWxy ZWFkeSBjb21wb3NpdGVkLgotICAgICAgICBhYnNCb3VuZHMgPSBsYXllci0+cmVuZGVyZXIoKS0+ bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKSkp LmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7Ci0gICAgICAgIC8vIEVtcHR5IHJlY3RzIG5ldmVyIGlu dGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhlIHB1cnBvc2VzIG9mIG92ZXJsYXAg dGVzdGluZy4KLSAgICAgICAgaWYgKGFic0JvdW5kcy5pc0VtcHR5KCkpCi0gICAgICAgICAgICBh YnNCb3VuZHMuc2V0U2l6ZShJbnRTaXplKDEsIDEpKTsKLSAgICAgICAgaGF2ZUNvbXB1dGVkQm91 bmRzID0gdHJ1ZTsKLSAgICAgICAgbXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzID0gb3Zlcmxh cHNDb21wb3NpdGVkTGF5ZXJzKCpvdmVybGFwTWFwLCBhYnNCb3VuZHMpOworICAgICAgICBjb21w dXRlQWJzb2x1dGVCb3VuZHMobGF5ZXIsIGFic0JvdW5kcywgaGF2ZUNvbXB1dGVkQm91bmRzKTsK KyAgICAgICAgLy8gSWYgdGhlIGN1cnJlbnQgc3VidHJlZSBpcyBub3QgY29tcG9zaXRpbmcsIGFu ZCB0aGUgbGF5ZXIgaXMgZnVsbHkgaW5zaWRlIHRoZSBjdXJyZW50IGNvbXBvc2l0aW5nIGJvdW5k cywKKyAgICAgICAgLy8gdGhlcmUgaXMgbm8gbmVlZCB0byBkbyB0aGUgb3ZlcmxhcCB0ZXN0LiBU aGlzIHJlZHVjZXMgdGhlIHRvdGFsIG51bWJlciBvZiB0aGUgY29tcG9zaXRlZCBsYXllcnMuCisg ICAgICAgIGlmIChjb21wb3NpdGluZ1N0YXRlLm1fc3VidHJlZUlzQ29tcG9zaXRpbmcgfHwgIWNv bXBvc2l0aW5nU3RhdGUubV9jb21wb3NpdGluZ0JvdW5kcy5jb250YWlucyhhYnNCb3VuZHMpKQor ICAgICAgICAgICAgbXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzID0gb3ZlcmxhcHNDb21wb3Np dGVkTGF5ZXJzKCpvdmVybGFwTWFwLCBhYnNCb3VuZHMpOwogICAgIH0KICAgICAKICAgICBsYXll ci0+c2V0TXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzKG11c3RPdmVybGFwQ29tcG9zaXRlZExh eWVycyk7CkBAIC02OTksNiArNzA3LDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpj b21wdXRlQ29tcG8KICAgICAgICAgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgPSBs YXllcjsKICAgICB9CiAKKyAgICBpZiAoY29tcG9zaXRpbmdTdGF0ZS5tX3N1YnRyZWVJc0NvbXBv c2l0aW5nKSB7CisgICAgICAgIGNvbXB1dGVBYnNvbHV0ZUJvdW5kcyhsYXllciwgYWJzQm91bmRz LCBoYXZlQ29tcHV0ZWRCb3VuZHMpOworICAgICAgICBjaGlsZFN0YXRlLm1fY29tcG9zaXRpbmdC b3VuZHMgPSBhYnNCb3VuZHM7CisgICAgfSBlbHNlCisgICAgICAgIGNoaWxkU3RhdGUubV9jb21w b3NpdGluZ0JvdW5kcyA9IGNvbXBvc2l0aW5nU3RhdGUubV9jb21wb3NpdGluZ0JvdW5kczsKKwog ICAgIGlmIChvdmVybGFwTWFwICYmIGNoaWxkU3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yICYm ICFjaGlsZFN0YXRlLm1fY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSb290TGF5ZXIoKSkgewogICAg ICAgICBhZGRUb092ZXJsYXBNYXAoKm92ZXJsYXBNYXAsIGxheWVyLCBhYnNCb3VuZHMsIGhhdmVD b21wdXRlZEJvdW5kcyk7CiAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA4NjQ3KQorKysgTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTIt MDItMjMgIFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KKworICAgICAg ICBDb2FsZXNjZSBjb21wb3NpdGVkIGxheWVycyBpZiBhcHBsaWNhYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODk0MgorCisgICAgICAgIFRyeSB0 byBjb2FsZXNjZSBzb21lIGNvbXBvc2l0ZWQgbGF5ZXJzLiBJZiBzdWJ0cmVlIGNvbXBvc2l0aW5n IGZsYWcgaXMKKyAgICAgICAgb2ZmLCBhbmQgdGhlIGxheWVyIGlzIGZ1bGx5IGluc2lkZSB0aGUg YW5jZXN0b3IsIHRoZXJlIGlzIG5vIG5lZWQgdG8gZG8KKyAgICAgICAgdGhlIG92ZXJsYXAgdGVz dC4gVGhpcyB3aWxsIHJlZHVjZSBhIGxvdCBvZiBzdWIgbGF5ZXJzLgorCisgICAgICAgICogY29t cG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLW92ZXJmbG93LXJvb3QtZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGNvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL2NvYWxlc2NlLWxh eWVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvbGF5ZXItY3Jl YXRpb24vY29hbGVzY2UtbGF5ZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vY2hy b21pdW0td2luL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1vdmVyZmxv dy1yb290LWV4cGVjdGVkLnR4dDoKKwogMjAxMi0wMi0yMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8 b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBnYXJkZW5pbmcuCklu ZGV4OiBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMt b3ZlcmZsb3ctcm9vdC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLW92ZXJmbG93LXJvb3QtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAxMDgzOTYpCisrKyBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9t ZXRyeS9saW1pdC1sYXllci1ib3VuZHMtb3ZlcmZsb3ctcm9vdC1leHBlY3RlZC50eHQJKHdvcmtp bmcgY29weSkKQEAgLTE2LDEzICsxNiw2IEBACiAgICAgICAgIChHcmFwaGljc0xheWVyCiAgICAg ICAgICAgKGJvdW5kcyAxNDIuMDAgMTQyLjAwKQogICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkK LSAgICAgICAgICAoY2hpbGRyZW4gMQotICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKLSAgICAg ICAgICAgICAgKHBvc2l0aW9uIDIxLjAwIDIxLjAwKQotICAgICAgICAgICAgICAoYm91bmRzIDEw MC4wMCAxMDAuMDApCi0gICAgICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKLSAgICAgICAgICAg ICkKLSAgICAgICAgICApCiAgICAgICAgICkKICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKICAgICAg ICAgICAocG9zaXRpb24gMC4wMCAxMy4wMCkKSW5kZXg6IExheW91dFRlc3RzL2NvbXBvc2l0aW5n L2xheWVyLWNyZWF0aW9uL2NvYWxlc2NlLWxheWVyLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9jb2FsZXNjZS1sYXllci1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXll ci1jcmVhdGlvbi9jb2FsZXNjZS1sYXllci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsMzQgQEAKK0JsdWUKK0dyZWVuIG9uIHRvcAorKEdyYXBoaWNzTGF5ZXIKKyAgKGJvdW5k cyA4MDAuMDAgNjAwLjAwKQorICAoY2hpbGRyZW4gMQorICAgIChHcmFwaGljc0xheWVyCisgICAg ICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAoY2hpbGRyZW4gMworICAgICAgICAoR3Jh cGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAyMS4wMCAyMS4wMCkKKyAgICAgICAgICAo Ym91bmRzIDEwMC4wMCAxMDAuMDApCisgICAgICAgICkKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIK KyAgICAgICAgICAocG9zaXRpb24gMjEuMDAgMjEuMDApCisgICAgICAgICAgKGJvdW5kcyAxMDAu MDAgMTAwLjAwKQorICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgKQorICAgICAg ICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiA3MS4wMCAyMS4wMCkKKyAgICAg ICAgICAoYm91bmRzIDEwMC4wMCAxMDAuMDApCisgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQor ICAgICAgICAgIChjaGlsZHJlbiAxCisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAg ICAgICAgICAocG9zaXRpb24gLTUwLjAwIDAuMDApCisgICAgICAgICAgICAgIChib3VuZHMgMTAw LjAwIDEwMC4wMCkKKyAgICAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAgICAgICAgICAg KQorICAgICAgICAgICkKKyAgICAgICAgKQorICAgICAgKQorICAgICkKKyAgKQorKQorCkluZGV4 OiBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9jb2FsZXNjZS1sYXllci5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2NvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9u L2NvYWxlc2NlLWxheWVyLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9jb21wb3Np dGluZy9sYXllci1jcmVhdGlvbi9jb2FsZXNjZS1sYXllci5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDg4IEBACis8IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgPHN0eWxl IHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KKyAgICBodG1sLCBib2R5IHsKKyAgICAg IG92ZXJmbG93OiBoaWRkZW47CisgICAgICBtYXJnaW46IDA7CisgICAgfQorICAgIHZpZGVvIHsK KyAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgIHRvcDogMjFweDsKKyAgICAgIGxlZnQ6 IDIxcHg7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAgICBoZWlnaHQ6IDEwMHB4OworICAgIH0K KyAgICAub3ZlcmxhcC1jb250YWluZXIgeworICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAg ICAgdG9wOiAyMXB4OworICAgICAgbGVmdDogMjFweDsKKyAgICAgIHdpZHRoOiAxMDBweDsKKyAg ICAgIGhlaWdodDogMTAwcHg7CisgICAgICB6LWluZGV4OiAwOworICAgICAgYmFja2dyb3VuZC1j b2xvcjogcmVkOworICAgIH0KKyAgICAub3ZlcmxhcC1jaGlsZCB7CisgICAgICBwb3NpdGlvbjog cmVsYXRpdmU7CisgICAgICBsZWZ0OiAwcHg7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAgICBo ZWlnaHQ6IDEwMHB4OworICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgICB9CisgICAg Lm5vbm92ZXJsYXAtY29udGFpbmVyIHsKKyAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAg IHRvcDogMjFweDsKKyAgICAgIGxlZnQ6IDcxcHg7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAg ICBoZWlnaHQ6IDEwMHB4OworICAgICAgei1pbmRleDogMDsKKyAgICAgIGJhY2tncm91bmQtY29s b3I6IHllbGxvdzsKKyAgICB9CisgICAgLm5vbm92ZXJsYXAtY2hpbGQgeworICAgICAgcG9zaXRp b246IHJlbGF0aXZlOworICAgICAgbGVmdDogLTUwcHg7CisgICAgICB3aWR0aDogMTAwcHg7Cisg ICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAg fQorICAgIAorICA8L3N0eWxlPgorICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hh cnNldD0idXRmLTgiPgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgIGxheW91dFRlc3RD b250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBkb1Rlc3Qo KQorICAgIHsKKyAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAg ICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2xheWVycycpLmlubmVyVGV4dCA9IGxheW91dFRl c3RDb250cm9sbGVyLmxheWVyVHJlZUFzVGV4dCgpOworICAgICAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5ub3RpZnlEb25lKCk7CisgICAgICB9CisgICAgfQorCisgICAgd2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoJ2xvYWQnLCBkb1Rlc3QsIGZhbHNlKTsKKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+CisK Kzxib2R5PgorICAKKyAgPHZpZGVvIHNyYz0iLi4vcmVzb3VyY2VzL3ZpZGVvLm1wNCI+PC92aWRl bz4KKworICA8ZGl2IGNsYXNzPSJvdmVybGFwLWNvbnRhaW5lciI+CisgICAgPGRpdiBjbGFzcz0i b3ZlcmxhcC1jaGlsZCI+CisgICAgICBCbHVlCisgICAgPC9kaXY+CisgIDwvZGl2PgorCisgIDxk aXYgY2xhc3M9Im5vbm92ZXJsYXAtY29udGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJub25vdmVy bGFwLWNoaWxkIj4KKyAgICAgIEdyZWVuIG9uIHRvcAorICAgIDwvZGl2PgorICA8L2Rpdj4KKyAg CisgIDxwcmUgaWQ9ImxheWVycyI+TGF5ZXIgdHJlZSBnb2VzIGhlcmUgaW4gRFJUPC9wcmU+Cis8 L2JvZHk+Cis8L2h0bWw+CisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLXdp bi9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtb3ZlcmZsb3ctcm9vdC1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0t d2luL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1vdmVyZmxvdy1yb290 LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTA4Mzk2KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0td2luL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1vdmVy Zmxvdy1yb290LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTYsMTMgKzE2LDYgQEAK ICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKICAgICAgICAgICAoYm91bmRzIDE0Mi4wMCAxNDIuMDAp CiAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQotICAgICAgICAgIChjaGlsZHJlbiAxCi0gICAg ICAgICAgICAoR3JhcGhpY3NMYXllcgotICAgICAgICAgICAgICAocG9zaXRpb24gMjEuMDAgMjEu MDApCi0gICAgICAgICAgICAgIChib3VuZHMgMTAwLjAwIDEwMC4wMCkKLSAgICAgICAgICAgICAg KGRyYXdzQ29udGVudCAxKQotICAgICAgICAgICAgKQotICAgICAgICAgICkKICAgICAgICAgKQog ICAgICAgICAoR3JhcGhpY3NMYXllcgogICAgICAgICAgIChwb3NpdGlvbiAwLjAwIDEzLjAwKQo=