66432 2011-08-17 16:48:26 -0700 [chromium] LayerChromium::updateCompositorResources should use an explicit GC3D 2011-08-19 14:24:30 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66430 1 enne enne enne husky jamesr nduca oldest_to_newest 452728 0 enne 2011-08-17 16:48:26 -0700 LayerChromium::updateCompositorResources is a commit-time function. Therefore, it should use a GraphicsContext3D that is passed explicitly in as a function arg, rather than one that it implicitly has access to via LayerRendererChromium. 453939 1 104532 enne 2011-08-19 11:25:56 -0700 Created attachment 104532 Patch 453951 2 104532 jamesr 2011-08-19 11:38:03 -0700 Comment on attachment 104532 Patch Cool 453981 3 enne 2011-08-19 12:23:41 -0700 (In reply to comment #2) > (From update of attachment 104532 [details]) > Cool Hrm. I though tthis was going to be sufficient, but in looking at this further, it looks like I might need to s/GraphicsContext3D/LayerRendererChromium/ in this patch so that I can get the skia context from it from it for the accelerated painting update. Alternatively, maybe this isn't patch isn't so big that I can just wrap this fix into bug 66433. 454009 4 jamesr 2011-08-19 13:10:59 -0700 It should be fine to do this and leave the layerRenderer()->context() getter alone, so the old codepaths work, and then later go and remove the getters. 454085 5 enne 2011-08-19 14:20:38 -0700 (In reply to comment #4) > It should be fine to do this and leave the layerRenderer()->context() getter alone, so the old codepaths work, and then later go and remove the getters. Ok, I think I can make it work and will just land it as-is. 454087 6 enne 2011-08-19 14:24:30 -0700 Committed r93438: <http://trac.webkit.org/changeset/93438> 104532 2011-08-19 11:25:56 -0700 2011-08-19 11:38:02 -0700 Patch bug-66432-20110819112555.patch text/plain 10187 enne U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0MjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YTNmOGY1MDIwMTBkNDJh MmY0OTgzNDVhYWRkMWEwOTY2MmRmZWI2Li5jMWU3MzUzOTAwZTZmZGQxODgwODM1YmVmY2UyNDE3 ZTlhYTVkZDhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDgtMTggIEFkcmll bm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFJlZmFj dG9yIHVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMgdG8gdGFrZSBhbiBleHBsaWNpdCBHcmFwaGlj c0NvbnRleHQzRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjY0MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNhbnZhczJETGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVtLmg6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNl cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNo cm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBk YXRlQ29tcG9zaXRvclJlc291cmNlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5 ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlZpZGVvTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVt Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9t aXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29t cG9zaXRvclJlc291cmNlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v V2ViR0xMYXllckNocm9taXVtLmg6CisKIDIwMTEtMDgtMTcgIEFkcmllbm5lIFdhbGtlciAgPGVu bmVAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFNwbGl0IHRpbGVyIGludG8gbWFp biB0aHJlYWQgLyBjb21wb3NpdG9yIHRocmVhZCB2ZXJzaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckNocm9taXVt LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJE TGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggN2E4ZTBiZmE3YTJjYzBiMTU4MjI4YzczYjk0ZTVlZmI5 MmY4MzJlOC4uMzc4MGVmNWE0NjFhOGY2NWY4MmUxZWQ2ZmViNTdmNTI1MWExYWY5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRM YXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwCkBAIC02Niw3ICs2Niw3IEBAIGJvb2wg Q2FudmFzMkRMYXllckNocm9taXVtOjpkcmF3c0NvbnRlbnQoKSBjb25zdAogICAgICAgICAgICAg JiYgKGNvbnRleHQtPmdldEV4dGVuc2lvbnMoKS0+Z2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigp ID09IEdyYXBoaWNzQ29udGV4dDNEOjpOT19FUlJPUikpOwogfQogCi12b2lkIENhbnZhczJETGF5 ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcygpCit2b2lkIENhbnZhczJETGF5 ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGljc0NvbnRleHQzRCop CiB7CiAgICAgaWYgKCFtX2NvbnRlbnRzRGlydHkgfHwgIWRyYXdzQ29udGVudCgpKQogICAgICAg ICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5oCmluZGV4IDcyODY3OTYz NjUyNGU1ODJkOTExNTZiNTNlZWM2YjRkM2YzNGI5NjQuLmI2ODliMWMzN2FkNjgyNTA2NjQ4ZTdl NWQ0ZmQwYTFkYWExOTk5NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5oCkBA IC00Niw3ICs0Niw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDYW52YXMyRExh eWVyQ2hyb21pdW0+IGNyZWF0ZShEcmF3aW5nQnVmZmVyKiwgR3JhcGhpY3NMYXllckNocm9taXVt KiBvd25lcik7CiAgICAgdmlydHVhbCB+Q2FudmFzMkRMYXllckNocm9taXVtKCk7CiAgICAgdmly dHVhbCBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVD b21wb3NpdG9yUmVzb3VyY2VzKCk7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbXBvc2l0b3JS ZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqKTsKIAogICAgIHZvaWQgc2V0VGV4dHVyZUNoYW5n ZWQoKTsKICAgICB2aXJ0dWFsIHVuc2lnbmVkIHRleHR1cmVJZCgpIGNvbnN0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1 bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJv bWl1bS5oCmluZGV4IDc3MmY1YjQ0YWMyYWNjMTFjZTI0ZDIxNTBhY2Q4YmNkMTg3YjUzY2EuLjI1 YjRlMjYyMWFmMjIxMzFmNWM3ODViZjRlMmQ1OWMwODdkNjEzZjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVt LmgKQEAgLTE2Niw3ICsxNjYsNyBAQCBwdWJsaWM6CiAgICAgLy8gVGhlc2UgbWV0aG9kcyB0eXBp Y2FsbHkgbmVlZCB0byBiZSBvdmVyd3JpdHRlbiBieSBkZXJpdmVkIGNsYXNzZXMuCiAgICAgdmly dHVhbCBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmly dHVhbCB2b2lkIHBhaW50Q29udGVudHNJZkRpcnR5KCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHVw ZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ29t cG9zaXRvclJlc291cmNlcyhHcmFwaGljc0NvbnRleHQzRCopIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBzZXRJc01hc2soYm9vbCkge30KICAgICB2aXJ0dWFsIHZvaWQgdW5yZXNlcnZlQ29udGVudHNU ZXh0dXJlKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGJpbmRDb250ZW50c1RleHR1cmUoKSB7IH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IDQ1OTUyZWJlZmU5NDhj MGRlMGFjZThmZjk5NWUxN2JjZGQ0NjEwNWYuLjI1MmMyYjA3M2Y2MjQwZWE0YzBhNWEyMmQxMjVh NjFlYWI2OGJhM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAt OTUxLDcgKzk1MSw3IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVDb21wb3Np dG9yUmVzb3VyY2VzKExheWVyQ2hyb21pdW0qIGxheWVyKQogICAgICAgICB1cGRhdGVDb21wb3Np dG9yUmVzb3VyY2VzKGxheWVyLT5yZXBsaWNhTGF5ZXIoKSk7CiAKICAgICBpZiAobGF5ZXItPmRy YXdzQ29udGVudCgpKQotICAgICAgICBsYXllci0+dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcygp OworICAgICAgICBsYXllci0+dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhjb250ZXh0KCkpOwog fQogCiBNYW5hZ2VkVGV4dHVyZSogTGF5ZXJSZW5kZXJlckNocm9taXVtOjpnZXRPZmZzY3JlZW5M YXllclRleHR1cmUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNjEwNTkw Njg0MjQxMmE4M2JhMzFhOTIzMmJjOTQxNjBkMjY5MTM3Yy4uYmZkMDhjNTU0YmU3NzNlYjNjMzRh ZThkZWNmY2M0ZWMzNWE2OGJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwCkBA IC0xNTYsMTMgKzE1NiwxMiBAQCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6Y3JlYXRlVGlsZXJJ Zk5lZWRlZCgpCiAgICAgICAgIGlzUm9vdExheWVyKCkgPyBDQ0xheWVyVGlsaW5nRGF0YTo6Tm9C b3JkZXJUZXhlbHMgOiBDQ0xheWVyVGlsaW5nRGF0YTo6SGFzQm9yZGVyVGV4ZWxzKTsKIH0KIAot dm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoKQordm9p ZCBUaWxlZExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3ND b250ZXh0M0QqIGNvbnRleHQpCiB7CiAgICAgLy8gUGFpbnRpbmcgY291bGQgY2F1c2UgY29tcG9z aXRpbmcgdG8gZ2V0IHR1cm5lZCBvZmYsIHdoaWNoIG1heSBjYXVzZSB0aGUgdGlsZXIgdG8gYmVj b21lIGludmFsaWRhdGVkIG1pZC11cGRhdGUuCiAgICAgaWYgKG1fc2tpcHNEcmF3IHx8IG1fdXBk YXRlUmVjdC5pc0VtcHR5KCkgfHwgIW1fdGlsZXItPm51bVRpbGVzKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0ID0gbGF5ZXJSZW5kZXJlcigpLT5j b250ZXh0KCk7CiAgICAgaW50IGxlZnQsIHRvcCwgcmlnaHQsIGJvdHRvbTsKICAgICBtX3RpbGVy LT5jb250ZW50UmVjdFRvVGlsZUluZGljZXMobV91cGRhdGVSZWN0LCBsZWZ0LCB0b3AsIHJpZ2h0 LCBib3R0b20pOwogICAgIGZvciAoaW50IGogPSB0b3A7IGogPD0gYm90dG9tOyArK2opIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vVGlsZWRMYXllckNocm9taXVtLmgKaW5kZXggZDgyZjMxNzc0YTUzZjcxYjQzNTFjODk5YzIx OTVlNDYwNmVmZmMwOC4uYmQ1M2UxZjYwNTM2NTlkODZhMGI2NTY2YzNmZWI0ZmVkNjJhMDU4NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGls ZWRMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCB+VGlsZWRMYXllckNocm9taXVtKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQg dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcygpOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDb21w b3NpdG9yUmVzb3VyY2VzKEdyYXBoaWNzQ29udGV4dDNEKik7CiAgICAgdmlydHVhbCB2b2lkIHNl dElzTWFzayhib29sKTsKIAogICAgIHZpcnR1YWwgdm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5 ZXJJbXBsKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcAppbmRleCAyMmJkMzBjNzhk NDY4NzJhOGIyN2EwYmU4ZDFlOGEzNjRkZjliMjc2Li42YzQ4M2I1NWY1MzVlZjk4NWU2ODRmNGQ4 NTA0NDA5YWFlMzk1YzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTk0 LDcgKzk0LDcgQEAgdm9pZCBWaWRlb0xheWVyQ2hyb21pdW06OmNsZWFudXBSZXNvdXJjZXMoKQog ICAgICAgICByZXNldEZyYW1lUGFyYW1ldGVycygpOwogfQogCi12b2lkIFZpZGVvTGF5ZXJDaHJv bWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcygpCit2b2lkIFZpZGVvTGF5ZXJDaHJvbWl1 bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkK IHsKICAgICBpZiAoIW1fY29udGVudHNEaXJ0eSB8fCAhbV9vd25lcikKICAgICAgICAgcmV0dXJu OwpAQCAtMTI1LDcgKzEyNSw2IEBAIHZvaWQgVmlkZW9MYXllckNocm9taXVtOjp1cGRhdGVDb21w b3NpdG9yUmVzb3VyY2VzKCkKIAogICAgIC8vIEFsbG9jYXRlIHRleHR1cmVzIGZvciBwbGFuZXMg aWYgdGhleSBhcmUgbm90IGFsbG9jYXRlZCBhbHJlYWR5LCBvcgogICAgIC8vIHJlYWxsb2NhdGUg dGV4dHVyZXMgdGhhdCBhcmUgdGhlIHdyb25nIHNpemUgZm9yIHRoZSBmcmFtZS4KLSAgICBHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCA9IGxheWVyUmVuZGVyZXJDb250ZXh0KCk7CiAgICAgYm9v bCB0ZXh0dXJlc0FsbG9jYXRlZCA9IGFsbG9jYXRlVGV4dHVyZXNJZk5lZWRlZChjb250ZXh0LCBm cmFtZSwgdGV4dHVyZUZvcm1hdCk7CiAgICAgaWYgKCF0ZXh0dXJlc0FsbG9jYXRlZCkgewogICAg ICAgICBtX3NraXBzRHJhdyA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5oCmluZGV4 IGEyZTRjYTQyOTI2ZDFiZDMyYjk5NWVjNmIyMTZjYTM5MmM1MDYzNzUuLjJmNjUxZWE2OGJlMDEw NzYzNTdiOTE0ZGZiNWU5NjNmYjNjNzA5YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5o CkBAIC01Niw3ICs1Niw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxDQ0xh eWVySW1wbD4gY3JlYXRlQ0NMYXllckltcGwoKTsKIAotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVD b21wb3NpdG9yUmVzb3VyY2VzKCk7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbXBvc2l0b3JS ZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqKTsKICAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250 ZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyBj YWxsZWQgYnkgVmlkZW9GcmFtZVByb3ZpZGVyLiBXaGVuIHRoaXMgbWV0aG9kIGlzIGNhbGxlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2Vi R0xMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggYWI2ZTNmNmU5Mjk4ZGNhNThiY2Ji MzFmNjhiMmFiMjljY2I4Mjk0Mi4uMTBmMWE3ZjIwZjA2NjBhOWQ4N2JiYmM1YjE5NWQ1YWMxOGVh OTFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vV2ViR0xMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCkBAIC02OCw3ICs2OCw3IEBA IGJvb2wgV2ViR0xMYXllckNocm9taXVtOjpkcmF3c0NvbnRlbnQoKSBjb25zdAogICAgIHJldHVy biAobV9jb250ZXh0ICYmIG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5nZXRHcmFwaGljc1Jl c2V0U3RhdHVzQVJCKCkgPT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SKTsKIH0KIAotdm9p ZCBXZWJHTExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoKQordm9pZCBX ZWJHTExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250 ZXh0M0QqIHJlbmRlcmVyQ29udGV4dCkKIHsKICAgICBpZiAoIWRyYXdzQ29udGVudCgpKQogICAg ICAgICByZXR1cm47CkBAIC03Niw3ICs3Niw2IEBAIHZvaWQgV2ViR0xMYXllckNocm9taXVtOjp1 cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKCkKICAgICBpZiAoIW1fY29udGVudHNEaXJ0eSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgR3JhcGhpY3NDb250ZXh0M0QqIHJlbmRlcmVyQ29udGV4dCA9 IGxheWVyUmVuZGVyZXJDb250ZXh0KCk7CiAgICAgaWYgKG1fdGV4dHVyZUNoYW5nZWQpIHsKICAg ICAgICAgcmVuZGVyZXJDb250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVY VFVSRV8yRCwgbV90ZXh0dXJlSWQpOwogICAgICAgICAvLyBTZXQgdGhlIG1pbi1tYWcgZmlsdGVy cyB0byBsaW5lYXIgYW5kIHdyYXAgbW9kZXMgdG8gR0xfQ0xBTVBfVE9fRURHRQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNo cm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJH TExheWVyQ2hyb21pdW0uaAppbmRleCAyNjM4MDZjZTk2M2ZlYzllNWU3NGEyOTQzZTlmZTYwMTkx NWJmNDA1Li4xZjQzYjVlNWY2M2E5MjM1YzQzMmQ1OWM2NjY2M2FhM2Y1MzUwMmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVy Q2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9XZWJHTExheWVyQ2hyb21pdW0uaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB+V2ViR0xMYXllckNocm9taXVtKCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250 ZW50KCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMo KTsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGljc0Nv bnRleHQzRCopOwogICAgIHZvaWQgc2V0VGV4dHVyZVVwZGF0ZWQoKTsKICAgICBib29sIHBhaW50 UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMoSW1hZ2VCdWZmZXIqKTsKIAo=