92441 2012-07-26 17:17:40 -0700 [TexMap][cairo] Add GC3D::RenderToCurrentGLContext support 2012-08-29 13:40:34 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78672 0 helder.correia mrobinson mrobinson rtakacs oldest_to_newest 679938 0 helder.correia 2012-07-26 17:17:40 -0700 After bug 78672, some additional logic is needed to support the new GraphicsContext3D::RenderToCurrentGLContext RenderStyle. The new GC3D::createWrapperForCurrentGLContext() should now be used in order for Cairo to use the new TextureMapperGL's GC3D backend. 707786 1 161295 mrobinson 2012-08-29 13:18:03 -0700 Created attachment 161295 Patch 707814 2 161295 mrobinson 2012-08-29 13:40:32 -0700 Comment on attachment 161295 Patch Clearing flags on attachment: 161295 Committed r127044: <http://trac.webkit.org/changeset/127044> 707815 3 mrobinson 2012-08-29 13:40:34 -0700 All reviewed patches have been landed. Closing bug. 161295 2012-08-29 13:18:03 -0700 2012-08-29 13:40:32 -0700 Patch bug-92441-20120829131753.patch text/plain 9501 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM3Nzg5ZDRhNTIwODA4 ZTdkNWY3NDI2MjVhNzk3ZTE2ZDBhNmRhZC4uZjUxYzJhOTdmNWY0ZDEwNzU5OGVjMmIwNjNiNWVh YzI5ZDI3MTM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA4LTI5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXVtj YWlyb10gQWRkIEdDM0Q6OlJlbmRlclRvQ3VycmVudEdMQ29udGV4dCBzdXBwb3J0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ0MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIFJlbmRlclRvQ3Vy cmVudEdMQ29udGV4dCBmb3IgdGhlIENhaXJvIEdyYXBoaWNzQ29udGV4dDNELiBUaGlzIHdpbGwg YWxsb3cKKyAgICAgICAgVGV4dHVyZU1hcHBlckdMIHRvIGJlIHJld3JpdHRlbiBvbiB0b3Agb2Yg R3JhcGhpY3NDb250ZXh0M0QgYnkgZXhwb3NpbmcgdGhlIEdDM0QKKyAgICAgICAgaW50ZXJmYWNl IGZvciB0aGUgd2lkZ2V0J3MgR0wgY29udGV4dC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgd2lsbCBiZSBjb3ZlcmVkIGJ5IHRoZSBleGlzdGluZyBBQyB0ZXN0cyBhZnRlciB0aGUgcGF0 Y2ggb24KKyAgICAgICAgYnVnIDc4NjcyIGxhbmRzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhpY3NDb250ZXh0M0QpOiBPbmx5IGNyZWF0ZSB0aGUg b2Zmc2NyZWVuCisgICAgICAgIHJlbmRlcmluZyBidWZmZXJzIGlmIHdlIGFyZSByZW5kZXJpbmcg b2Zmc2NyZWVuLiBQYXNzIHRoZSByZW5kZXJpbmcgc3R5bGUgdG8KKyAgICAgICAgdGhlIHByaXZh dGUgZGF0YSBmYWN0b3J5LgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6On5H cmFwaGljc0NvbnRleHQzRCk6IE9ubHkgZGVzdHJveSB0aGUgb2Zmc2NyZWVuCisgICAgICAgIHJl bmRlcmluZyBidWZmZXJzIGlmIHdlIGFyZSByZW5kZXJpbmcgb2Zmc2NyZWVuLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmNyZWF0ZSk6IFBhc3Mg dGhlIHJlbmRlcmluZyBzdHlsZSB0aHJvdWdoLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0M0RQcml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUpOiBJZiB3ZSBhcmUgdXNp bmcKKyAgICAgICAgYSAiY3VycmVudCBHTCBjb250ZXh0IiByZW5kZXJpbmcgc3R5bGUsIHdlIGRv bid0IG5lZWQgdG8gY3JlYXRlIGEgR0wgY29udGV4dC4KKyAgICAgICAgV2UnbGwgYWx3YXlzIGp1 c3QgdXNlIHRoZSBvbmUgdGhhdCdzIGN1cnJlbnRseSBhY3RpdmUuCisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKTogQXNzZXJ0 IHRoYXQgd2Ugb25seQorICAgICAgICBkbyB0aGlzIHdpdGggdGhlIG9mZnNjcmVlbiByZW5kZXJp bmcgc3R5bGUuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlLmg6IFVwZGF0ZSBtZXRob2QgZGVmaW5pdGlvbnMKKyAgICAgICAgYW5kIGV4 cG9zZSB0aGUgcmVuZGVyaW5nIHN0eWxlIG1lbWJlciBHcmFwaGljc0NvbnRleHQzRC4KKwogMjAx Mi0wOC0yOCAgWW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFtGb3Jtc10gTWFrZSBIVE1MSW5wdXRFbGVtZW50OjpibHVyKCkvZm9jdXMoKSBvdmVycmlkZS1h YmxlIGJ5IGlucHV0IHR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAKaW5kZXgg NjRhMmZhYWEwZTJhYzJkYTI4YmE5ZTliMGMyNTNmMTZkMzVmNTFlNy4uZGMxMmY2YzVkNjJkNjQ3 MWU1NDllZGQ4ZTBhZjRkNDM4MjY5MDExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWly by5jcHAKQEAgLTY1LDcgKzY1LDcgQEAgUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gR3Jh cGhpY3NDb250ZXh0M0Q6OmNyZWF0ZShHcmFwaGljc0NvbnRleHQzRDo6QXR0cmkKICAgICByZXR1 cm4gY29udGV4dC5yZWxlYXNlKCk7CiB9CiAKLUdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0Nv bnRleHQzRChHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyaWJ1dGVzLCBIb3N0V2lu ZG93KiwgR3JhcGhpY3NDb250ZXh0M0Q6OlJlbmRlclN0eWxlKQorR3JhcGhpY3NDb250ZXh0M0Q6 OkdyYXBoaWNzQ29udGV4dDNEKEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJpYnV0 ZXMsIEhvc3RXaW5kb3cqLCBHcmFwaGljc0NvbnRleHQzRDo6UmVuZGVyU3R5bGUgcmVuZGVyU3R5 bGUpCiAgICAgOiBtX2N1cnJlbnRXaWR0aCgwKQogICAgICwgbV9jdXJyZW50SGVpZ2h0KDApCiAg ICAgLCBtX2F0dHJzKGF0dHJpYnV0ZXMpCkBAIC03OCwzNyArNzgsMzkgQEAgR3JhcGhpY3NDb250 ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEKEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0 dHJpYnV0ZXMsIEgKICAgICAsIG1fbXVsdGlzYW1wbGVGQk8oMCkKICAgICAsIG1fbXVsdGlzYW1w bGVEZXB0aFN0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlcigw KQotICAgICwgbV9wcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Y3JlYXRlKHRoaXMp KQorICAgICwgbV9wcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Y3JlYXRlKHRoaXMs IHJlbmRlclN0eWxlKSkKIHsKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKIAogICAgIHZhbGlk YXRlQXR0cmlidXRlcygpOwogCi0gICAgLy8gQ3JlYXRlIGEgdGV4dHVyZSB0byByZW5kZXIgaW50 by4KLSAgICA6OmdsR2VuVGV4dHVyZXMoMSwgJm1fdGV4dHVyZSk7Ci0gICAgOjpnbEJpbmRUZXh0 dXJlKEdMX1RFWFRVUkVfMkQsIG1fdGV4dHVyZSk7Ci0gICAgOjpnbFRleFBhcmFtZXRlcmYoR0xf VEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpOwotICAgIDo6Z2xU ZXhQYXJhbWV0ZXJmKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUlOX0ZJTFRFUiwgR0xfTElO RUFSKTsKLSAgICA6OmdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX1dS QVBfUywgR0xfQ0xBTVApOwotICAgIDo6Z2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdM X1RFWFRVUkVfV1JBUF9ULCBHTF9DTEFNUCk7Ci0gICAgOjpnbEJpbmRUZXh0dXJlKEdMX1RFWFRV UkVfMkQsIDApOwotCi0gICAgLy8gQ3JlYXRlIGFuIEZCTy4KLSAgICA6OmdsR2VuRnJhbWVidWZm ZXJzRVhUKDEsICZtX2Zibyk7Ci0gICAgOjpnbEJpbmRGcmFtZWJ1ZmZlckVYVChHTF9GUkFNRUJV RkZFUl9FWFQsIG1fZmJvKTsKLQotICAgIG1fYm91bmRGQk8gPSBtX2ZibzsKLSAgICBpZiAoIW1f YXR0cnMuYW50aWFsaWFzICYmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkpCi0g ICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJzRVhUKDEsICZtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7 Ci0gICAgCi0gICAgLy8gQ3JlYXRlIGEgbXVsdGlzYW1wbGUgRkJPLgotICAgIGlmIChtX2F0dHJz LmFudGlhbGlhcykgewotICAgICAgICA6OmdsR2VuRnJhbWVidWZmZXJzRVhUKDEsICZtX211bHRp c2FtcGxlRkJPKTsKLSAgICAgICAgOjpnbEJpbmRGcmFtZWJ1ZmZlckVYVChHTF9GUkFNRUJVRkZF Ul9FWFQsIG1fbXVsdGlzYW1wbGVGQk8pOwotICAgICAgICBtX2JvdW5kRkJPID0gbV9tdWx0aXNh bXBsZUZCTzsKLSAgICAgICAgOjpnbEdlblJlbmRlcmJ1ZmZlcnNFWFQoMSwgJm1fbXVsdGlzYW1w bGVDb2xvckJ1ZmZlcik7Ci0gICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5k ZXB0aCkKLSAgICAgICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJzRVhUKDEsICZtX211bHRpc2Ft cGxlRGVwdGhTdGVuY2lsQnVmZmVyKTsKKyAgICBpZiAocmVuZGVyU3R5bGUgPT0gUmVuZGVyT2Zm c2NyZWVuKSB7CisgICAgICAgIC8vIENyZWF0ZSBhIHRleHR1cmUgdG8gcmVuZGVyIGludG8uCisg ICAgICAgIDo6Z2xHZW5UZXh0dXJlcygxLCAmbV90ZXh0dXJlKTsKKyAgICAgICAgOjpnbEJpbmRU ZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1fdGV4dHVyZSk7CisgICAgICAgIDo6Z2xUZXhQYXJhbWV0 ZXJmKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUFHX0ZJTFRFUiwgR0xfTElORUFSKTsKKyAg ICAgICAgOjpnbFRleFBhcmFtZXRlcmYoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9NSU5fRklM VEVSLCBHTF9MSU5FQVIpOworICAgICAgICA6OmdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJE LCBHTF9URVhUVVJFX1dSQVBfUywgR0xfQ0xBTVApOworICAgICAgICA6OmdsVGV4UGFyYW1ldGVy aShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX1dSQVBfVCwgR0xfQ0xBTVApOworICAgICAgICA6 OmdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgMCk7CisKKyAgICAgICAgLy8gQ3JlYXRlIGFu IEZCTy4KKyAgICAgICAgOjpnbEdlbkZyYW1lYnVmZmVyc0VYVCgxLCAmbV9mYm8pOworICAgICAg ICA6OmdsQmluZEZyYW1lYnVmZmVyRVhUKEdMX0ZSQU1FQlVGRkVSX0VYVCwgbV9mYm8pOworCisg ICAgICAgIG1fYm91bmRGQk8gPSBtX2ZibzsKKyAgICAgICAgaWYgKCFtX2F0dHJzLmFudGlhbGlh cyAmJiAobV9hdHRycy5zdGVuY2lsIHx8IG1fYXR0cnMuZGVwdGgpKQorICAgICAgICAgICAgOjpn bEdlblJlbmRlcmJ1ZmZlcnNFWFQoMSwgJm1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKKworICAgICAg ICAvLyBDcmVhdGUgYSBtdWx0aXNhbXBsZSBGQk8uCisgICAgICAgIGlmIChtX2F0dHJzLmFudGlh bGlhcykgeworICAgICAgICAgICAgOjpnbEdlbkZyYW1lYnVmZmVyc0VYVCgxLCAmbV9tdWx0aXNh bXBsZUZCTyk7CisgICAgICAgICAgICA6OmdsQmluZEZyYW1lYnVmZmVyRVhUKEdMX0ZSQU1FQlVG RkVSX0VYVCwgbV9tdWx0aXNhbXBsZUZCTyk7CisgICAgICAgICAgICBtX2JvdW5kRkJPID0gbV9t dWx0aXNhbXBsZUZCTzsKKyAgICAgICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJzRVhUKDEsICZt X211bHRpc2FtcGxlQ29sb3JCdWZmZXIpOworICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNp bCB8fCBtX2F0dHJzLmRlcHRoKQorICAgICAgICAgICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJz RVhUKDEsICZtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgfQogICAg IH0KIAogICAgIC8vIEFOR0xFIGluaXRpYWxpemF0aW9uLgpAQCAtMTM0LDYgKzEzNiw5IEBAIEdy YXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRChHcmFwaGljc0NvbnRleHQzRDo6QXR0 cmlidXRlcyBhdHRyaWJ1dGVzLCBICiAKIEdyYXBoaWNzQ29udGV4dDNEOjp+R3JhcGhpY3NDb250 ZXh0M0QoKQogeworICAgIGlmIChtX3ByaXZhdGUtPnJlbmRlclN0eWxlKCkgPT0gUmVuZGVyVG9D dXJyZW50R0xDb250ZXh0KQorICAgICAgICByZXR1cm47CisKICAgICBtYWtlQ29udGV4dEN1cnJl bnQoKTsKICAgICA6OmdsRGVsZXRlVGV4dHVyZXMoMSwgJm1fdGV4dHVyZSk7CiAgICAgaWYgKG1f YXR0cnMuYW50aWFsaWFzKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmNwcApp bmRleCA3ZDY2MjlmNjlkZmU1N2Y4NjFjZjU4ZDcyZGJlNDI5ZTYxMzJlNmIxLi42YjRjYmVhZDdj MGY2ZDU4ZDM1N2ZmMjc2ZjZkNTk3ZmZkN2U3ODIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZS5jcHAKQEAgLTM2LDE1ICszNiwyNSBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NPd25QdHI8R3JhcGhpY3NDb250ZXh0M0RQcml2 YXRlPiBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmNyZWF0ZShHcmFwaGljc0NvbnRleHQzRCog Y29udGV4dCkKK1Bhc3NPd25QdHI8R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlPiBHcmFwaGljc0Nv bnRleHQzRFByaXZhdGU6OmNyZWF0ZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgR3JhcGhp Y3NDb250ZXh0M0Q6OlJlbmRlclN0eWxlIHJlbmRlclN0eWxlKQogewotICAgIHJldHVybiBhZG9w dFB0cihuZXcgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKGNvbnRleHQpKTsKKyAgICByZXR1cm4g YWRvcHRQdHIobmV3IEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZShjb250ZXh0LCByZW5kZXJTdHls ZSkpOwogfQogCi1HcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OkdyYXBoaWNzQ29udGV4dDNEUHJp dmF0ZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkKK0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBH cmFwaGljc0NvbnRleHQzRDo6UmVuZGVyU3R5bGUgcmVuZGVyU3R5bGUpCiAgICAgOiBtX2NvbnRl eHQoY29udGV4dCkKLSAgICAsIG1fZ2xDb250ZXh0KEdMQ29udGV4dDo6Y3JlYXRlT2Zmc2NyZWVu Q29udGV4dChHTENvbnRleHQ6OnNoYXJpbmdDb250ZXh0KCkpKQorICAgICwgbV9yZW5kZXJTdHls ZShyZW5kZXJTdHlsZSkKIHsKKyAgICBzd2l0Y2ggKHJlbmRlclN0eWxlKSB7CisgICAgY2FzZSBH cmFwaGljc0NvbnRleHQzRDo6UmVuZGVyT2Zmc2NyZWVuOgorICAgICAgICBtX2dsQ29udGV4dCA9 IEdMQ29udGV4dDo6Y3JlYXRlT2Zmc2NyZWVuQ29udGV4dChHTENvbnRleHQ6OnNoYXJpbmdDb250 ZXh0KCkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpSZW5k ZXJUb0N1cnJlbnRHTENvbnRleHQ6CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgR3JhcGhpY3ND b250ZXh0M0Q6OlJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93OgorICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogfQogCiBHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6On5HcmFwaGljc0NvbnRleHQzRFByaXZhdGUoKQpAQCAtNjcsNiArNzcsOCBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6cGFpbnRUb1RleHR1cmVNYXBwZXIoVGV4dHVy ZU1hcHBlciogdGV4dHVyZU1hcHBlcgogICAgIGlmICghbV9nbENvbnRleHQpCiAgICAgICAgIHJl dHVybjsKIAorICAgIEFTU0VSVChtX3JlbmRlclN0eWxlID09IEdyYXBoaWNzQ29udGV4dDNEOjpS ZW5kZXJPZmZzY3JlZW4pOworCiAgICAgLy8gRklYTUU6IFdlIGRvIG5vdCBzdXBwb3J0IG1hc2sg Zm9yIHRoZSBtb21lbnQgd2l0aCBUZXh0dXJlTWFwcGVySW1hZ2VCdWZmZXIuCiAgICAgaWYgKHRl eHR1cmVNYXBwZXItPmFjY2VsZXJhdGlvbk1vZGUoKSAhPSBUZXh0dXJlTWFwcGVyOjpPcGVuR0xN b2RlKSB7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCA9IHRleHR1cmVNYXBwZXIt PmdyYXBoaWNzQ29udGV4dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaAppbmRl eCBmMWRiYTgyMjU5MTAxZDlkOWU2ZDE2OTFkMGZhOGFhZDRhOTc5OGY1Li42OWRhZDY3NTQ3MjJh YzdhODgyY2E4NzYxNWFiODg1NDk3OWFmYmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRFBy aXZhdGUuaApAQCAtMzYsMjAgKzM2LDIzIEBAIGNsYXNzIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZQogI2VuZGlmCiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8R3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlPiBjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqKTsKKyAgICBzdGF0aWMgUGFz c093blB0cjxHcmFwaGljc0NvbnRleHQzRFByaXZhdGU+IGNyZWF0ZShHcmFwaGljc0NvbnRleHQz RCosIEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJTdHlsZSk7CiAgICAgfkdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZSgpOwogICAgIGJvb2wgbWFrZUNvbnRleHRDdXJyZW50KCk7CiAgICAgUGxhdGZv cm1HcmFwaGljc0NvbnRleHQzRCBwbGF0Zm9ybUNvbnRleHQoKTsKIAorICAgIEdyYXBoaWNzQ29u dGV4dDNEOjpSZW5kZXJTdHlsZSByZW5kZXJTdHlsZSgpIHsgcmV0dXJuIG1fcmVuZGVyU3R5bGU7 IH0KKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQ UEVSKQogICAgIHZpcnR1YWwgdm9pZCBwYWludFRvVGV4dHVyZU1hcHBlcihUZXh0dXJlTWFwcGVy KiwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXQsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4Jiwg ZmxvYXQgb3BhY2l0eSwgQml0bWFwVGV4dHVyZSogbWFzayk7CiAjZW5kaWYKIAogcHJpdmF0ZToK LSAgICBHcmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqKTsKKyAgICBH cmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqLCBHcmFwaGljc0NvbnRl eHQzRDo6UmVuZGVyU3R5bGUpOwogCiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIG1fY29udGV4dDsK ICAgICBPd25QdHI8R0xDb250ZXh0PiBtX2dsQ29udGV4dDsKKyAgICBHcmFwaGljc0NvbnRleHQz RDo6UmVuZGVyU3R5bGUgbV9yZW5kZXJTdHlsZTsKIH07CiAKIH0K