80464 2012-03-06 17:40:41 -0800 [chromium] Support printing WebGL content in threaded compositor 2012-03-07 15:56:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80459 1 jamesr jamesr cc-bugs kbr nduca vangelis webkit.review.bot oldest_to_newest 572346 0 jamesr 2012-03-06 17:40:41 -0800 [chromium] Support printing WebGL content in threaded compositor 572350 1 130496 jamesr 2012-03-06 17:42:24 -0800 Created attachment 130496 Patch 573170 2 130681 jamesr 2012-03-07 13:25:10 -0800 Created attachment 130681 Patch 573171 3 jamesr 2012-03-07 13:25:50 -0800 Updated to ToT. I've confirmed manually that printing and lost context recovery work for WebGL content in threaded mode. 573218 4 130681 kbr 2012-03-07 14:02:09 -0800 Comment on attachment 130681 Patch Fantastic. Thanks for taking care of this. r=me 573236 5 130681 enne 2012-03-07 14:19:22 -0800 Comment on attachment 130681 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130681&action=review > Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp:111 > + if (m_textureUpdated || !m_drawingBuffer || !drawsContent()) Shouldn't this be context()? Can't m_drawingBuffer->graphicsContext3D() be potentially null? 573237 6 jamesr 2012-03-07 14:21:11 -0800 Looking at WebGLLayerChromium::setDrawingBuffer() it looks like a non-NULL DrawingBuffer with a NULL DrawingBuffer::graphicsContext3D() is not a valid state for this code. 573326 7 130681 webkit.review.bot 2012-03-07 15:55:55 -0800 Comment on attachment 130681 Patch Clearing flags on attachment: 130681 Committed r110118: <http://trac.webkit.org/changeset/110118> 573327 8 webkit.review.bot 2012-03-07 15:56:02 -0800 All reviewed patches have been landed. Closing bug. 130496 2012-03-06 17:42:24 -0800 2012-03-07 13:25:07 -0800 Patch bug-80464-20120306174223.patch text/plain 3742 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNw cAppbmRleCAzMTNjYTAxODU1ZWMzNDYwOTVhZTkxZWFlMjE0NGVmZGJkNjgzNDkzLi5lM2UxOWUy NThmYWE2MDRiYzdmNWJhYjI5MjcyMjM2YzJjMTY3ZDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJD aHJvbWl1bS5jcHAKQEAgLTEwOCwyMCArMTA4LDI2IEBAIHZvaWQgV2ViR0xMYXllckNocm9taXVt OjpwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKiBsYXllcikKIAogYm9vbCBXZWJHTExheWVy Q2hyb21pdW06OnBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMoSW1hZ2VCdWZmZXIqIGltYWdl QnVmZmVyKQogewotICAgIGlmIChtX3RleHR1cmVVcGRhdGVkIHx8ICFsYXllclJlbmRlcmVyQ29u dGV4dCgpIHx8ICFkcmF3c0NvbnRlbnQoKSkKKyAgICBpZiAobV90ZXh0dXJlVXBkYXRlZCB8fCAh bV9kcmF3aW5nQnVmZmVyIHx8ICFkcmF3c0NvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgSW50U2l6ZSBmcmFtZWJ1ZmZlclNpemUgPSBjb250ZXh0KCktPmdldEludGVybmFs RnJhbWVidWZmZXJTaXplKCk7Ci0gICAgQVNTRVJUKGxheWVyUmVuZGVyZXJDb250ZXh0KCkpOwog Ci0gICAgLy8gVGhpcyB3b3VsZCBpZGVhbGx5IGJlIGRvbmUgaW4gdGhlIHdlYmdsIGNvbnRleHQs IGJ1dCB0aGF0IGlzbid0IHBvc3NpYmxlIHlldC4KLSAgICBQbGF0Zm9ybTNET2JqZWN0IGZyYW1l YnVmZmVyID0gbGF5ZXJSZW5kZXJlckNvbnRleHQoKS0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKLSAg ICBsYXllclJlbmRlcmVyQ29udGV4dCgpLT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0 M0Q6OkZSQU1FQlVGRkVSLCBmcmFtZWJ1ZmZlcik7Ci0gICAgbGF5ZXJSZW5kZXJlckNvbnRleHQo KS0+ZnJhbWVidWZmZXJUZXh0dXJlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBH cmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4dDNEOjpU RVhUVVJFXzJELCBtX3RleHR1cmVJZCwgMCk7CisgICAgLy8gU2luY2Ugd2UncmUgdXNpbmcgdGhl IHNhbWUgY29udGV4dCBhcyBXZWJHTCwgd2UgaGF2ZSB0byByZXN0b3JlIGFueSBzdGF0ZSB3ZSBj aGFuZ2UgKGluIHRoaXMgY2FzZSwganVzdCB0aGUgZnJhbWVidWZmZXIgYmluZGluZykuCisgICAg Ly8gRklYTUU6IFRoZSBXZWJHTFJlbmRlcmluZ0NvbnRleHQgdHJhY2tzIHRoZSBjdXJyZW50IGZy YW1lYnVmZmVyIGJpbmRpbmcsIGl0IHdvdWxkIGJlIHNsaWdodGx5IG1vcmUgZWZmaWNpZW50IHRv IHVzZSB0aGlzIHZhbHVlCisgICAgLy8gcmF0aGVyIHRoYW4gcXVlcnlpbmcgaXQgb2ZmIG9mIHRo ZSBjb250ZXh0LgorICAgIEdDM0RpbnQgcHJldmlvdXNGcmFtZWJ1ZmZlciA9IDA7CisgICAgY29u dGV4dCgpLT5nZXRJbnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQklORElO RywgJnByZXZpb3VzRnJhbWVidWZmZXIpOwogCi0gICAgRXh0ZW5zaW9uczNEQ2hyb21pdW0qIGV4 dGVuc2lvbnMgPSBzdGF0aWNfY2FzdDxFeHRlbnNpb25zM0RDaHJvbWl1bSo+KGxheWVyUmVuZGVy ZXJDb250ZXh0KCktPmdldEV4dGVuc2lvbnMoKSk7CisgICAgUGxhdGZvcm0zRE9iamVjdCBmcmFt ZWJ1ZmZlciA9IGNvbnRleHQoKS0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKKyAgICBjb250ZXh0KCkt PmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIGZyYW1lYnVm ZmVyKTsKKyAgICBjb250ZXh0KCktPmZyYW1lYnVmZmVyVGV4dHVyZTJEKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0FUVEFDSE1FTlQwLCBH cmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgbV90ZXh0dXJlSWQsIDApOworCisgICAgRXh0 ZW5zaW9uczNEQ2hyb21pdW0qIGV4dGVuc2lvbnMgPSBzdGF0aWNfY2FzdDxFeHRlbnNpb25zM0RD aHJvbWl1bSo+KGNvbnRleHQoKS0+Z2V0RXh0ZW5zaW9ucygpKTsKICAgICBleHRlbnNpb25zLT5w YWludEZyYW1lYnVmZmVyVG9DYW52YXMoZnJhbWVidWZmZXIsIGZyYW1lYnVmZmVyU2l6ZS53aWR0 aCgpLCBmcmFtZWJ1ZmZlclNpemUuaGVpZ2h0KCksICFjb250ZXh0KCktPmdldENvbnRleHRBdHRy aWJ1dGVzKCkucHJlbXVsdGlwbGllZEFscGhhLCBpbWFnZUJ1ZmZlcik7Ci0gICAgbGF5ZXJSZW5k ZXJlckNvbnRleHQoKS0+ZGVsZXRlRnJhbWVidWZmZXIoZnJhbWVidWZmZXIpOworICAgIGNvbnRl eHQoKS0+ZGVsZXRlRnJhbWVidWZmZXIoZnJhbWVidWZmZXIpOworCisgICAgY29udGV4dCgpLT5i aW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBwcmV2aW91c0Zy YW1lYnVmZmVyKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTczLDE1ICsxNzksNiBAQCBH cmFwaGljc0NvbnRleHQzRCogV2ViR0xMYXllckNocm9taXVtOjpjb250ZXh0KCkgY29uc3QKICAg ICByZXR1cm4gMDsKIH0KIAotR3JhcGhpY3NDb250ZXh0M0QqIFdlYkdMTGF5ZXJDaHJvbWl1bTo6 bGF5ZXJSZW5kZXJlckNvbnRleHQoKQotewotICAgIC8vIEZJWE1FOiBJbiB0aGUgdGhyZWFkZWQg Y2FzZSwgcGFpbnRSZW5kZXJlZFJlc3VsdHNUb0NhbnZhcyBtdXN0IGJlCi0gICAgLy8gcmVmYWN0 b3JlZCB0byBiZSBhc3luY2hyb25vdXMuIEN1cnJlbnRseSB0aGlzIGlzIHVuaW1wbGVtZW50ZWQu Ci0gICAgaWYgKCFsYXllclRyZWVIb3N0KCkgfHwgQ0NQcm94eTo6aGFzSW1wbFRocmVhZCgpKQot ICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gbGF5ZXJUcmVlSG9zdCgpLT5jb250ZXh0KCk7 Ci19Ci0KIH0KIAogI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5 ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v V2ViR0xMYXllckNocm9taXVtLmgKaW5kZXggNzc2OGNlYmM1YTc4NDA4ZWQ5Mzk4YTZiNzI4Mjdl MTRiZGJmZWY3MS4uYWYxMzhmYTFlMGYzYzk4NzQxZGFlMGU5YWI0ZmM1MDczNWE3ZDA3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xM YXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vV2ViR0xMYXllckNocm9taXVtLmgKQEAgLTY3LDggKzY3LDYgQEAgcHJpdmF0ZToKICAg ICBXZWJHTExheWVyQ2hyb21pdW0oKTsKICAgICBmcmllbmQgY2xhc3MgV2ViR0xMYXllckNocm9t aXVtUmF0ZUxpbWl0VGFzazsKIAotICAgIEdyYXBoaWNzQ29udGV4dDNEKiBsYXllclJlbmRlcmVy Q29udGV4dCgpOwotCiAgICAgYm9vbCBtX2hhc0FscGhhOwogICAgIGJvb2wgbV9wcmVtdWx0aXBs aWVkQWxwaGE7CiAgICAgdW5zaWduZWQgbV90ZXh0dXJlSWQ7Cg== 130681 2012-03-07 13:25:10 -0800 2012-03-07 15:55:55 -0800 Patch bug-80464-20120307132509.patch text/plain 4832 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjOTc5N2E5NzllNWVj MjZlYzhmZDhkMGFiZjFmNjk3ZWY3MmQ3Mi4uYTczOGY0NzJhZjg0MmEzNGMxYzgzNjM1MzJjN2Zh MjVjODU1NjVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTA3ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBT dXBwb3J0IHByaW50aW5nIFdlYkdMIGNvbnRlbnQgaW4gdGhyZWFkZWQgY29tcG9zaXRvcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA0NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEbyB0aGUgcmVhZGJh Y2sgb24gdGhlIFdlYkdMIGNvbnRleHQgaW5zdGVhZCBvZiB0aGUgY29tcG9zaXRvcidzIGNvbnRl eHQgc2luY2Ugd2UgY2Fubm90IHVzZSB0aGUgbGF0dGVyIGZyb20gdGhlCisgICAgICAgIG1haW4g dGhyZWFkLiBTaW5jZSB3ZSdyZSBvbiB0aGUgV2ViR0wgY29udGV4dCwgd2UgaGF2ZSB0byBiZSBj YXJlZnVsIHRvIHJlc3RvcmUgYW55IHN0YXRlIHdlIGNoYW5nZS4KKworICAgICAgICBUZXN0ZWQg cHJpbnRpbmcgbWFudWFsbHkgd2l0aCB0aHJlYWRlZCBjb21wb3NpdGluZyBlbmFibGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMTGF5ZXJDaHJvbWl1bTo6cGFpbnRSZW5kZXJlZFJl c3VsdHNUb0NhbnZhcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2Vi R0xMYXllckNocm9taXVtLmg6CisgICAgICAgIChXZWJHTExheWVyQ2hyb21pdW0pOgorCiAyMDEy LTAzLTA3ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgQVNTRVJUIGZhaWx1cmUgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJv bWl1bS5jcHAKaW5kZXggMzEzY2EwMTg1NWVjMzQ2MDk1YWU5MWVhZTIxNDRlZmRiZDY4MzQ5My4u ZTNlMTllMjU4ZmFhNjA0YmM3ZjViYWIyOTI3MjIzNmMyYzE2N2QxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJH TExheWVyQ2hyb21pdW0uY3BwCkBAIC0xMDgsMjAgKzEwOCwyNiBAQCB2b2lkIFdlYkdMTGF5ZXJD aHJvbWl1bTo6cHVzaFByb3BlcnRpZXNUbyhDQ0xheWVySW1wbCogbGF5ZXIpCiAKIGJvb2wgV2Vi R0xMYXllckNocm9taXVtOjpwYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFzKEltYWdlQnVmZmVy KiBpbWFnZUJ1ZmZlcikKIHsKLSAgICBpZiAobV90ZXh0dXJlVXBkYXRlZCB8fCAhbGF5ZXJSZW5k ZXJlckNvbnRleHQoKSB8fCAhZHJhd3NDb250ZW50KCkpCisgICAgaWYgKG1fdGV4dHVyZVVwZGF0 ZWQgfHwgIW1fZHJhd2luZ0J1ZmZlciB8fCAhZHJhd3NDb250ZW50KCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIEludFNpemUgZnJhbWVidWZmZXJTaXplID0gY29udGV4dCgpLT5nZXRJ bnRlcm5hbEZyYW1lYnVmZmVyU2l6ZSgpOwotICAgIEFTU0VSVChsYXllclJlbmRlcmVyQ29udGV4 dCgpKTsKIAotICAgIC8vIFRoaXMgd291bGQgaWRlYWxseSBiZSBkb25lIGluIHRoZSB3ZWJnbCBj b250ZXh0LCBidXQgdGhhdCBpc24ndCBwb3NzaWJsZSB5ZXQuCi0gICAgUGxhdGZvcm0zRE9iamVj dCBmcmFtZWJ1ZmZlciA9IGxheWVyUmVuZGVyZXJDb250ZXh0KCktPmNyZWF0ZUZyYW1lYnVmZmVy KCk7Ci0gICAgbGF5ZXJSZW5kZXJlckNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNz Q29udGV4dDNEOjpGUkFNRUJVRkZFUiwgZnJhbWVidWZmZXIpOwotICAgIGxheWVyUmVuZGVyZXJD b250ZXh0KCktPmZyYW1lYnVmZmVyVGV4dHVyZTJEKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJV RkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0FUVEFDSE1FTlQwLCBHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRV8yRCwgbV90ZXh0dXJlSWQsIDApOworICAgIC8vIFNpbmNlIHdlJ3JlIHVz aW5nIHRoZSBzYW1lIGNvbnRleHQgYXMgV2ViR0wsIHdlIGhhdmUgdG8gcmVzdG9yZSBhbnkgc3Rh dGUgd2UgY2hhbmdlIChpbiB0aGlzIGNhc2UsIGp1c3QgdGhlIGZyYW1lYnVmZmVyIGJpbmRpbmcp LgorICAgIC8vIEZJWE1FOiBUaGUgV2ViR0xSZW5kZXJpbmdDb250ZXh0IHRyYWNrcyB0aGUgY3Vy cmVudCBmcmFtZWJ1ZmZlciBiaW5kaW5nLCBpdCB3b3VsZCBiZSBzbGlnaHRseSBtb3JlIGVmZmlj aWVudCB0byB1c2UgdGhpcyB2YWx1ZQorICAgIC8vIHJhdGhlciB0aGFuIHF1ZXJ5aW5nIGl0IG9m ZiBvZiB0aGUgY29udGV4dC4KKyAgICBHQzNEaW50IHByZXZpb3VzRnJhbWVidWZmZXIgPSAwOwor ICAgIGNvbnRleHQoKS0+Z2V0SW50ZWdlcnYoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVS X0JJTkRJTkcsICZwcmV2aW91c0ZyYW1lYnVmZmVyKTsKIAotICAgIEV4dGVuc2lvbnMzRENocm9t aXVtKiBleHRlbnNpb25zID0gc3RhdGljX2Nhc3Q8RXh0ZW5zaW9uczNEQ2hyb21pdW0qPihsYXll clJlbmRlcmVyQ29udGV4dCgpLT5nZXRFeHRlbnNpb25zKCkpOworICAgIFBsYXRmb3JtM0RPYmpl Y3QgZnJhbWVidWZmZXIgPSBjb250ZXh0KCktPmNyZWF0ZUZyYW1lYnVmZmVyKCk7CisgICAgY29u dGV4dCgpLT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBm cmFtZWJ1ZmZlcik7CisgICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclRleHR1cmUyRChHcmFwaGlj c0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9BVFRBQ0hN RU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG1fdGV4dHVyZUlkLCAwKTsKKwor ICAgIEV4dGVuc2lvbnMzRENocm9taXVtKiBleHRlbnNpb25zID0gc3RhdGljX2Nhc3Q8RXh0ZW5z aW9uczNEQ2hyb21pdW0qPihjb250ZXh0KCktPmdldEV4dGVuc2lvbnMoKSk7CiAgICAgZXh0ZW5z aW9ucy0+cGFpbnRGcmFtZWJ1ZmZlclRvQ2FudmFzKGZyYW1lYnVmZmVyLCBmcmFtZWJ1ZmZlclNp emUud2lkdGgoKSwgZnJhbWVidWZmZXJTaXplLmhlaWdodCgpLCAhY29udGV4dCgpLT5nZXRDb250 ZXh0QXR0cmlidXRlcygpLnByZW11bHRpcGxpZWRBbHBoYSwgaW1hZ2VCdWZmZXIpOwotICAgIGxh eWVyUmVuZGVyZXJDb250ZXh0KCktPmRlbGV0ZUZyYW1lYnVmZmVyKGZyYW1lYnVmZmVyKTsKKyAg ICBjb250ZXh0KCktPmRlbGV0ZUZyYW1lYnVmZmVyKGZyYW1lYnVmZmVyKTsKKworICAgIGNvbnRl eHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgcHJl dmlvdXNGcmFtZWJ1ZmZlcik7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE3MywxNSArMTc5 LDYgQEAgR3JhcGhpY3NDb250ZXh0M0QqIFdlYkdMTGF5ZXJDaHJvbWl1bTo6Y29udGV4dCgpIGNv bnN0CiAgICAgcmV0dXJuIDA7CiB9CiAKLUdyYXBoaWNzQ29udGV4dDNEKiBXZWJHTExheWVyQ2hy b21pdW06OmxheWVyUmVuZGVyZXJDb250ZXh0KCkKLXsKLSAgICAvLyBGSVhNRTogSW4gdGhlIHRo cmVhZGVkIGNhc2UsIHBhaW50UmVuZGVyZWRSZXN1bHRzVG9DYW52YXMgbXVzdCBiZQotICAgIC8v IHJlZmFjdG9yZWQgdG8gYmUgYXN5bmNocm9ub3VzLiBDdXJyZW50bHkgdGhpcyBpcyB1bmltcGxl bWVudGVkLgotICAgIGlmICghbGF5ZXJUcmVlSG9zdCgpIHx8IENDUHJveHk6Omhhc0ltcGxUaHJl YWQoKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIGxheWVyVHJlZUhvc3QoKS0+Y29u dGV4dCgpOwotfQotCiB9CiAKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9X ZWJHTExheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDc3NjhjZWJjNWE3ODQwOGVkOTM5OGE2 YjcyODI3ZTE0YmRiZmVmNzEuLmFmMTM4ZmExZTBmM2M5ODc0MWRhZTBlOWFiNGZjNTA3MzVhN2Qw NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L1dlYkdMTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oCkBAIC02Nyw4ICs2Nyw2IEBAIHByaXZh dGU6CiAgICAgV2ViR0xMYXllckNocm9taXVtKCk7CiAgICAgZnJpZW5kIGNsYXNzIFdlYkdMTGF5 ZXJDaHJvbWl1bVJhdGVMaW1pdFRhc2s7CiAKLSAgICBHcmFwaGljc0NvbnRleHQzRCogbGF5ZXJS ZW5kZXJlckNvbnRleHQoKTsKLQogICAgIGJvb2wgbV9oYXNBbHBoYTsKICAgICBib29sIG1fcHJl bXVsdGlwbGllZEFscGhhOwogICAgIHVuc2lnbmVkIG1fdGV4dHVyZUlkOwo=