25773 2009-05-13 17:47:13 -0700 Clean up the "graphicsContextsFlipped" terminology for accelerated compositing 2009-05-17 10:02:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 121181 0 simon.fraser 2009-05-13 17:47:13 -0700 The GraphicsLayer code has this method called "graphicsContextsFlipped", which is vague and not really meaningful. What we really need is an indication that the compositing system uses a top-down or bottom-up cooridinate system. 121187 1 30308 simon.fraser 2009-05-13 18:06:59 -0700 Created attachment 30308 Patch, changelog 121553 2 30308 hyatt 2009-05-15 12:03:02 -0700 Comment on attachment 30308 Patch, changelog r=me 121691 3 simon.fraser 2009-05-17 10:02:29 -0700 http://trac.webkit.org/changeset/43777 30308 2009-05-13 18:06:59 -0700 2009-05-15 12:03:02 -0700 Patch, changelog 25773_patch.txt text/plain 10557 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDU1MWRiMi4uMjEyNjdiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAwOS0wNS0xMyAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNTc3MworICAgICAgICAKKyAgICAgICAgUmVuYW1lIEdyYXBoaWNzTGF5ZXI6 OmdyYXBoaWNzQ29udGV4dHNGbGlwcGVkKCkgdG8gCisgICAgICAgIEdyYXBoaWNzTGF5ZXI6OmNv bXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbigpIGluIG9yZGVyIHRvIGNsYXJpZnkgdGhl IHVzYWdlLgorCisgICAgICAgIENsZWFuIHVwIGNvZGUgYXJvdW5kIHRoZSBHcmFwaGljc0xheWVy ICJjb250ZW50cyIgbGF5ZXIgdGhhdCBtYWtlcyB1c2Ugb2YgdGhpcworICAgICAgICBmbGFnLCBi eSByZW1vdmluZyB0aGUgc2V0SGFzQ29udGVudHNMYXllcigpIG1ldGhvZCwgYW5kIGp1c3QgdXNp bmcgc2V0Q29udGVudHNMYXllcigpLAorICAgICAgICB3aGljaCBjYW4gdGhlbiBhbHdheXMgZG8g dGhlIGZsaXBwaW5nIGlmIG5lY2Vzc2FyeS4KKworICAgICAgICBPbmx5IGFmZmVjdHMgQUNDRUxF UkFURURfQ09NUE9TSVRJTkcgYnVpbGRzLgorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy OjopOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EuaDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y29udGVudHNMYXllcik6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OmNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnNldEJhY2tncm91bmRDb2xv cik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OmNsZWFyQmFja2dyb3VuZENv bG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6c2V0Q29udGVudHNUb0lt YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y2xlYXJDb250ZW50cyk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnN3YXBGcm9tT3JUb1RpbGVkTGF5 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50c0xheWVy KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdFBsYXRmb3JtTGF5 ZXIpOgorCiAyMDA5LTA1LTEzICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAgPHplY2tlQHNl bGZpc2gub3JnPgogCiAgICAgICAgIFJ1YmJlciBTdGFtcGVkIGJ5IE9saXZlciBIdW50LgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmggYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAppbmRleCBmOTI4Y2U4Li5hZTUx OTUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIu aAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaApAQCAtMjg4 LDggKzI4OCwxMCBAQCBwdWJsaWM6CiAgICAgaW50IGluY3JlbWVudFJlcGFpbnRDb3VudCgpIHsg cmV0dXJuICsrbV9yZXBhaW50Q291bnQ7IH0KICNlbmRpZgogCi0gICAgLy8gUGxhdGZvcm0gYmVo YXZpb3JzCi0gICAgc3RhdGljIGJvb2wgZ3JhcGhpY3NDb250ZXh0c0ZsaXBwZWQoKTsKKyAgICAv LyBSZXBvcnQgd2hldGhlciB0aGUgdW5kZXJseWluZyBjb21wb3NpdGluZyBzeXN0ZW0gdXNlcyBh IHRvcC1kb3duCisgICAgLy8gb3IgYSBib3R0b20tdXAgY29vcmRpbmF0ZSBzeXN0ZW0uCisgICAg ZW51bSBDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb24geyBDb21wb3NpdGluZ0Nvb3Jk aW5hdGVzVG9wRG93biwgQ29tcG9zaXRpbmdDb29yZGluYXRlc0JvdHRvbVVwIH07CisgICAgc3Rh dGljIENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbiBjb21wb3NpdGluZ0Nvb3JkaW5h dGVzT3JpZW50YXRpb24oKTsKIAogI2lmbmRlZiBOREVCVUcKICAgICBzdGF0aWMgYm9vbCBzaG93 RGVidWdCb3JkZXJzKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9HcmFwaGljc0xheWVyQ0EuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBo aWNzTGF5ZXJDQS5oCmluZGV4IDNhNjkyZDMuLjUwMTM4ZDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oCkBAIC0xMTcsOSArMTE3LDggQEAg cHJpdmF0ZToKICAgICBib29sIHJlcXVpcmVzVGlsZWRMYXllcihjb25zdCBGbG9hdFNpemUmKSBj b25zdDsKICAgICB2b2lkIHN3YXBGcm9tT3JUb1RpbGVkTGF5ZXIoYm9vbCB1c2VUaWxlZExheWVy KTsKIAotICAgIHZvaWQgc2V0SGFzQ29udGVudHNMYXllcihib29sKTsKICAgICB2b2lkIHNldENv bnRlbnRzTGF5ZXIoV2ViTGF5ZXIqKTsKLSAgICB2b2lkIHNldENvbnRlbnRzTGF5ZXJGbGlwcGVk KGJvb2wpOworICAgIFdlYkxheWVyKiBjb250ZW50c0xheWVyKCkgY29uc3QgeyByZXR1cm4gbV9j b250ZW50c0xheWVyLmdldCgpOyB9CiAgICAgCiAgICAgUmV0YWluUHRyPFdlYkxheWVyPiBtX2xh eWVyOwogICAgIFJldGFpblB0cjxXZWJMYXllcj4gbV90cmFuc2Zvcm1MYXllcjsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbSBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbQppbmRleCBjYTUx ZjMwLi5mMzYxNDM3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9H cmFwaGljc0xheWVyQ0EubW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3Jh cGhpY3NMYXllckNBLm1tCkBAIC0yNzEsOSArMjcxLDkgQEAgc3RhdGljIGJvb2wgZm9yY2VTb2Z0 d2FyZUFuaW1hdGlvbigpCiAgICAgcmV0dXJuIGZvcmNlU29mdHdhcmVBbmltYXRpb247CiB9CiAK LWJvb2wgR3JhcGhpY3NMYXllcjo6Z3JhcGhpY3NDb250ZXh0c0ZsaXBwZWQoKQorR3JhcGhpY3NM YXllcjo6Q29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uIEdyYXBoaWNzTGF5ZXI6OmNv bXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbigpCiB7Ci0gICAgcmV0dXJuIHRydWU7Cisg ICAgcmV0dXJuIENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNCb3R0b21VcDsKIH0KIAogI2lmbmRlZiBO REVCVUcKQEAgLTc2Myw3ICs3NjMsMTQgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEJhY2tn cm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3IsIGNvbnN0IEFuaW1hdGlvbiogdHIKICAgICBH cmFwaGljc0xheWVyOjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29sb3IsIHRyYW5zaXRpb24sIGJlZ2lu VGltZSk7CiAKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKLSAgICBzZXRIYXNDb250 ZW50c0xheWVyKHRydWUpOworICAgIAorICAgIGlmICghbV9jb250ZW50c0xheWVyLmdldCgpKSB7 CisgICAgICAgIFdlYkxheWVyKiBjb2xvckxheWVyID0gW1dlYkxheWVyIGxheWVyXTsKKyNpZm5k ZWYgTkRFQlVHCisgICAgICAgIFtjb2xvckxheWVyIHNldE5hbWU6QCJDb2xvciBMYXllciJdOwor I2VuZGlmCisgICAgICAgIHNldENvbnRlbnRzTGF5ZXIoY29sb3JMYXllcik7CisgICAgfQogICAg IAogICAgIGlmICh0cmFuc2l0aW9uICYmICF0cmFuc2l0aW9uLT5pc0VtcHR5T3JaZXJvRHVyYXRp b24oKSkgewogICAgICAgICBDQUxheWVyKiBwcmVzTGF5ZXIgPSBbbV9jb250ZW50c0xheWVyLmdl dCgpIHByZXNlbnRhdGlvbkxheWVyXTsKQEAgLTc3OSw3ICs3ODYsNiBAQCB2b2lkIEdyYXBoaWNz TGF5ZXJDQTo6c2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IENvbG9yJiBjb2xvciwgY29uc3QgQW5p bWF0aW9uKiB0cgogICAgICAgICBDR0NvbG9yUmVsZWFzZShiZ0NvbG9yKTsKICAgICB9IGVsc2Ug ewogICAgICAgICByZW1vdmVBbGxBbmltYXRpb25zRm9yUHJvcGVydHkoQW5pbWF0ZWRQcm9wZXJ0 eUJhY2tncm91bmRDb2xvcik7ICAgIAotICAgICAgICBzZXRIYXNDb250ZW50c0xheWVyKHRydWUp OwogICAgICAgICBzZXRMYXllckJhY2tncm91bmRDb2xvcihtX2NvbnRlbnRzTGF5ZXIuZ2V0KCks IG1fYmFja2dyb3VuZENvbG9yKTsKICAgICB9CiAKQEAgLTc4OSw3ICs3OTUsNyBAQCB2b2lkIEdy YXBoaWNzTGF5ZXJDQTo6c2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IENvbG9yJiBjb2xvciwgY29u c3QgQW5pbWF0aW9uKiB0cgogdm9pZCBHcmFwaGljc0xheWVyQ0E6OmNsZWFyQmFja2dyb3VuZENv bG9yKCkKIHsKICAgICBpZiAoIW1fY29udGVudExheWVyRm9ySW1hZ2VPclZpZGVvKQotICAgICAg ICBzZXRIYXNDb250ZW50c0xheWVyKGZhbHNlKTsKKyAgICAgICAgc2V0Q29udGVudHNMYXllcigw KTsKICAgICBlbHNlCiAgICAgICAgIGNsZWFyTGF5ZXJCYWNrZ3JvdW5kQ29sb3IobV9jb250ZW50 c0xheWVyLmdldCgpKTsKIH0KQEAgLTEwODQsMzUgKzEwOTAsMjcgQEAgYm9vbCBHcmFwaGljc0xh eWVyQ0E6OmFuaW1hdGVGbG9hdChBbmltYXRlZFByb3BlcnR5SUQgcHJvcGVydHksIGNvbnN0IEZs b2F0VmFsdWUKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2Uq IGltYWdlKQogewogICAgIGlmIChpbWFnZSkgewotICAgICAgICBzZXRIYXNDb250ZW50c0xheWVy KHRydWUpOwotCi0gICAgICAgIC8vIEZJWE1FOiBpcyBpbWFnZSBmbGlwcGluZyByZWFsbHkgYSBw cm9wZXJ0eSBvZiB0aGUgZ3JhcGhpY3MgY29udGV4dD8KLSAgICAgICAgYm9vbCBuZWVkVG9GbGlw ID0gR3JhcGhpY3NMYXllcjo6Z3JhcGhpY3NDb250ZXh0c0ZsaXBwZWQoKTsKLSAgICAgICAgQ0dQ b2ludCBhbmNob3JQb2ludCA9IG5lZWRUb0ZsaXAgPyBDR1BvaW50TWFrZSgwLjBmLCAxLjBmKSA6 IENHUG9pbnRaZXJvOwotCiAgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUwogICAg ICAgICB7Ci0gICAgICAgICAgICBDR0ltYWdlUmVmIHRoZUltYWdlID0gaW1hZ2UtPm5hdGl2ZUlt YWdlRm9yQ3VycmVudEZyYW1lKCk7CisgICAgICAgICAgICBpZiAoIW1fY29udGVudHNMYXllci5n ZXQoKSkgeworICAgICAgICAgICAgICAgIFdlYkxheWVyKiBpbWFnZUxheWVyID0gW1dlYkxheWVy IGxheWVyXTsKKyNpZm5kZWYgTkRFQlVHCisgICAgICAgICAgICAgICAgW2ltYWdlTGF5ZXIgc2V0 TmFtZTpAIkltYWdlIExheWVyIl07CisjZW5kaWYKKyAgICAgICAgICAgICAgICBzZXRDb250ZW50 c0xheWVyKGltYWdlTGF5ZXIpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAvLyBGSVhN RTogbWF5YmUgb25seSBkbyB0cmlsaW5lYXIgaWYgdGhlIGltYWdlIGlzIGJlaW5nIHNjYWxlZCBk b3duLAogICAgICAgICAgICAgLy8gYnV0IHRoZW4gd2hhdCBpZiB0aGUgbGF5ZXIgc2l6ZSBjaGFu Z2VzPwotI2lmIEhBVkVfTU9ERVJOX1FVQVJUWkNPUkUKKyNpZiAhZGVmaW5lZChCVUlMRElOR19P Tl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKICAgICAgICAgICAgIFtt X2NvbnRlbnRzTGF5ZXIuZ2V0KCkgc2V0TWluaWZpY2F0aW9uRmlsdGVyOmtDQUZpbHRlclRyaWxp bmVhcl07CiAjZW5kaWYKLSAgICAgICAgICAgIGlmIChuZWVkVG9GbGlwKSB7Ci0gICAgICAgICAg ICAgICAgQ0FUcmFuc2Zvcm0zRCBmbGlwcGVyID0gewotICAgICAgICAgICAgICAgICAgICAxLjBm LCAwLjBmLCAwLjBmLCAwLjBmLAotICAgICAgICAgICAgICAgICAgICAwLjBmLCAtMS4wZiwgMC4w ZiwgMC4wZiwKLSAgICAgICAgICAgICAgICAgICAgMC4wZiwgMC4wZiwgMS4wZiwgMC4wZiwKLSAg ICAgICAgICAgICAgICAgICAgMC4wZiwgMC4wZiwgMC4wZiwgMS4wZn07Ci0gICAgICAgICAgICAg ICAgW21fY29udGVudHNMYXllci5nZXQoKSBzZXRUcmFuc2Zvcm06ZmxpcHBlcl07Ci0gICAgICAg ICAgICB9Ci0KLSAgICAgICAgICAgIFttX2NvbnRlbnRzTGF5ZXIuZ2V0KCkgc2V0QW5jaG9yUG9p bnQ6YW5jaG9yUG9pbnRdOworICAgICAgICAgICAgQ0dJbWFnZVJlZiB0aGVJbWFnZSA9IGltYWdl LT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpOwogICAgICAgICAgICAgW21fY29udGVudHNM YXllci5nZXQoKSBzZXRDb250ZW50czooaWQpdGhlSW1hZ2VdOwogICAgICAgICB9CiAgICAgICAg IEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMKICAgICB9IGVsc2UKLSAgICAgICAgc2V0SGFzQ29u dGVudHNMYXllcihmYWxzZSk7CisgICAgICAgIHNldENvbnRlbnRzTGF5ZXIoMCk7CiAKICAgICBt X2NvbnRlbnRMYXllckZvckltYWdlT3JWaWRlbyA9IChpbWFnZSAhPSAwKTsKIH0KQEAgLTExMjYs NyArMTEyNCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50c1RvVmlkZW8oUGxh dGZvcm1MYXllciogdmlkZW9MYXllcikKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpjbGVhckNvbnRl bnRzKCkKIHsKICAgICBpZiAobV9jb250ZW50TGF5ZXJGb3JJbWFnZU9yVmlkZW8pIHsKLSAgICAg ICAgc2V0SGFzQ29udGVudHNMYXllcihmYWxzZSk7CisgICAgICAgIHNldENvbnRlbnRzTGF5ZXIo MCk7CiAgICAgICAgIG1fY29udGVudExheWVyRm9ySW1hZ2VPclZpZGVvID0gZmFsc2U7CiAgICAg fQogfQpAQCAtMTQzMyw3ICsxNDMxLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnN3YXBGcm9t T3JUb1RpbGVkTGF5ZXIoYm9vbCB1c2VyVGlsZWRMYXllcikKICAgICAgICAgW3RpbGVkTGF5ZXIg c2V0TGV2ZWxzT2ZEZXRhaWw6MV07CiAgICAgICAgIFt0aWxlZExheWVyIHNldExldmVsc09mRGV0 YWlsQmlhczowXTsKIAotICAgICAgICBpZiAoR3JhcGhpY3NMYXllcjo6Z3JhcGhpY3NDb250ZXh0 c0ZsaXBwZWQoKSkKKyAgICAgICAgaWYgKEdyYXBoaWNzTGF5ZXI6OmNvbXBvc2l0aW5nQ29vcmRp bmF0ZXNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0aW5nQ29vcmRpbmF0 ZXNCb3R0b21VcCkKICAgICAgICAgICAgIFt0aWxlZExheWVyIHNldENvbnRlbnRzR3Jhdml0eTpA ImJvdHRvbUxlZnQiXTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgW3RpbGVkTGF5ZXIgc2V0 Q29udGVudHNHcmF2aXR5OkAidG9wTGVmdCJdOwpAQCAtMTQ3OCwyNCArMTQ3Niw2IEBAIHZvaWQg R3JhcGhpY3NMYXllckNBOjpzd2FwRnJvbU9yVG9UaWxlZExheWVyKGJvb2wgdXNlclRpbGVkTGF5 ZXIpCiAjZW5kaWYKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEhhc0NvbnRlbnRzTGF5 ZXIoYm9vbCBoYXNMYXllcikKLXsKLSAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKLQot ICAgIGlmIChoYXNMYXllciAmJiAhbV9jb250ZW50c0xheWVyKSB7Ci0gICAgICAgIC8vIGNyZWF0 ZSB0aGUgaW5uZXIgbGF5ZXIKLSAgICAgICAgV2ViTGF5ZXIqIGNvbnRlbnRzTGF5ZXIgPSBbV2Vi TGF5ZXIgbGF5ZXJdOwotI2lmbmRlZiBOREVCVUcKLSAgICAgICAgW2NvbnRlbnRzTGF5ZXIgc2V0 TmFtZTpAIkNvbnRlbnRzIExheWVyIl07Ci0jZW5kaWYKLSAgICAgICAgc2V0Q29udGVudHNMYXll cihjb250ZW50c0xheWVyKTsKLQotICAgIH0gZWxzZSBpZiAoIWhhc0xheWVyICYmIG1fY29udGVu dHNMYXllcikKLSAgICAgICAgc2V0Q29udGVudHNMYXllcigwKTsKLQotICAgIEVORF9CTE9DS19P QkpDX0VYQ0VQVElPTlMKLX0KLQogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldENvbnRlbnRzTGF5 ZXIoV2ViTGF5ZXIqIGNvbnRlbnRzTGF5ZXIpCiB7CiAgICAgaWYgKGNvbnRlbnRzTGF5ZXIgPT0g bV9jb250ZW50c0xheWVyKQpAQCAtMTUxMywxNCArMTQ5MywyNiBAQCB2b2lkIEdyYXBoaWNzTGF5 ZXJDQTo6c2V0Q29udGVudHNMYXllcihXZWJMYXllciogY29udGVudHNMYXllcikKICAgICAgICAg W2NvbnRlbnRzTGF5ZXIgc2V0U3R5bGU6W05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVj dDpudWxsQWN0aW9uc0RpY3Rpb25hcnkoKSBmb3JLZXk6QCJhY3Rpb25zIl1dOwogCiAgICAgICAg IG1fY29udGVudHNMYXllci5hZG9wdE5TKFtjb250ZW50c0xheWVyIHJldGFpbl0pOwotICAgICAg ICBbbV9jb250ZW50c0xheWVyLmdldCgpIHNldEFuY2hvclBvaW50OkNHUG9pbnRaZXJvXTsKLSAg ICAgICAgW21fbGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6bV9jb250ZW50c0xheWVyLmdldCgpXTsK IAotICAgICAgICB1cGRhdGVDb250ZW50c1JlY3QoKTsKKyAgICAgICAgYm9vbCBuZWVkVG9GbGlw ID0gR3JhcGhpY3NMYXllcjo6Y29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uKCkgPT0g R3JhcGhpY3NMYXllcjo6Q29tcG9zaXRpbmdDb29yZGluYXRlc0JvdHRvbVVwOworICAgICAgICBD R1BvaW50IGFuY2hvclBvaW50ID0gbmVlZFRvRmxpcCA/IENHUG9pbnRNYWtlKDAuMGYsIDEuMGYp IDogQ0dQb2ludFplcm87CiAKLSAgICAgICAgLy8gU2V0IGNvbnRlbnRzIHRvIG5pbCBpZiB0aGUg bGF5ZXIgZG9lcyBub3QgZHJhdyBpdHMgb3duIGNvbnRlbnQuCi0gICAgICAgIGlmIChtX2NsaWVu dCAmJiAhZHJhd3NDb250ZW50KCkpCi0gICAgICAgICAgICBbbV9sYXllci5nZXQoKSBzZXRDb250 ZW50czpuaWxdOworICAgICAgICAvLyBJZiB0aGUgbGF5ZXIgd29ybGQgaXMgZmxpcHBlZCwgd2Ug bmVlZCB0byB1bi1mbGlwIHRoZSBjb250ZW50cyBsYXllcgorICAgICAgICBpZiAobmVlZFRvRmxp cCkgeworICAgICAgICAgICAgQ0FUcmFuc2Zvcm0zRCBmbGlwcGVyID0geworICAgICAgICAgICAg ICAgIDEuMGYsIDAuMGYsIDAuMGYsIDAuMGYsCisgICAgICAgICAgICAgICAgMC4wZiwgLTEuMGYs IDAuMGYsIDAuMGYsCisgICAgICAgICAgICAgICAgMC4wZiwgMC4wZiwgMS4wZiwgMC4wZiwKKyAg ICAgICAgICAgICAgICAwLjBmLCAwLjBmLCAwLjBmLCAxLjBmfTsKKyAgICAgICAgICAgIFttX2Nv bnRlbnRzTGF5ZXIuZ2V0KCkgc2V0VHJhbnNmb3JtOmZsaXBwZXJdOworICAgICAgICB9CisgICAg ICAgIFttX2NvbnRlbnRzTGF5ZXIuZ2V0KCkgc2V0QW5jaG9yUG9pbnQ6YW5jaG9yUG9pbnRdOwor CisgICAgICAgIC8vIEluc2VydCB0aGUgY29udGVudCBsYXllciBmaXJzdC4gVmlkZW8gZWxlbWVu dHMgcmVxdWlyZSB0aGlzLCBiZWNhdXNlIHRoZXkgaGF2ZQorICAgICAgICAvLyBzaGFkb3cgY29u dGVudCB0aGF0IG11c3QgZGlzcGxheSBpbiBmcm9udCBvZiB0aGUgdmlkZW8uCisgICAgICAgIFtt X2xheWVyLmdldCgpIGluc2VydFN1YmxheWVyOm1fY29udGVudHNMYXllci5nZXQoKSBhdEluZGV4 OjBdOworCisgICAgICAgIHVwZGF0ZUNvbnRlbnRzUmVjdCgpOwogCiAjaWZuZGVmIE5ERUJVRwog ICAgICAgICBpZiAoc2hvd0RlYnVnQm9yZGVycygpKSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA3NWQwZGQ4Li5mZWMzYjFkIDEwMDY0NAotLS0g YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTc3MSw3ICs3NzEsNyBA QCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdFBsYXRmb3JtTGF5ZXIoKQog ICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXItPnNldFNpemUoRmxvYXRTaXplKG1fcmVuZGVyVmlldy0+ ZG9jV2lkdGgoKSwgbV9yZW5kZXJWaWV3LT5kb2NIZWlnaHQoKSkpOwogICAgIG1fcm9vdFBsYXRm b3JtTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoMCwgMCkpOwogCi0gICAgaWYgKEdyYXBo aWNzTGF5ZXI6OmdyYXBoaWNzQ29udGV4dHNGbGlwcGVkKCkpCisgICAgaWYgKEdyYXBoaWNzTGF5 ZXI6OmNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5ZXI6 OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNCb3R0b21VcCkKICAgICAgICAgbV9yb290UGxhdGZvcm1M YXllci0+c2V0Q2hpbGRyZW5UcmFuc2Zvcm0oZmxpcFRyYW5zZm9ybSgpKTsKIAogICAgIC8vIE5l ZWQgdG8gY2xpcCB0byBwcmV2ZW50IHRyYW5zZm9ybWVkIGNvbnRlbnQgc2hvd2luZyBvdXRzaWRl IHRoaXMgZnJhbWUK