118302 2013-07-02 06:53:53 -0700 [Qt][WK1] Support direct painting without GraphicsSurface 2013-07-22 07:03:41 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 118251 1 allan.jensen allan.jensen commit-queue dino jturcotte kenneth kondapallykalyan noam zeno oldest_to_newest 905405 0 allan.jensen 2013-07-02 06:53:53 -0700 In bug #118251 I reintroduced WebGL without graphics surfaces. It does however do inefficient pixel copies from one OpenGL context to the other. A few simple changes should allow us to do more effective texture copy. 905406 1 205908 allan.jensen 2013-07-02 06:58:02 -0700 Created attachment 205908 Patch 907637 2 205908 zeno 2013-07-11 07:06:02 -0700 Comment on attachment 205908 Patch LGTM 909714 3 205908 jturcotte 2013-07-18 05:40:33 -0700 Comment on attachment 205908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205908&action=review > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:257 > +#else What happens if we're running WebKit2 in a !USE(GRAPHICS_SURFACE) build? Maybe we also need runtime detection for WK1/2. > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:263 > + Not needed. 910654 4 allan.jensen 2013-07-22 06:26:46 -0700 (In reply to comment #3) > (From update of attachment 205908 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205908&action=review > > > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:257 > > +#else > > What happens if we're running WebKit2 in a !USE(GRAPHICS_SURFACE) build? Maybe we also need runtime detection for WK1/2. > There was a crash I have fixed, but we do not support canvas content in coordinated graphics without graphics-surfaces. 910657 5 207244 allan.jensen 2013-07-22 06:30:48 -0700 Created attachment 207244 Patch 910660 6 205908 jturcotte 2013-07-22 06:58:10 -0700 Comment on attachment 205908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205908&action=review >>> Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:257 >>> +#else >> >> What happens if we're running WebKit2 in a !USE(GRAPHICS_SURFACE) build? Maybe we also need runtime detection for WK1/2. > > There was a crash I have fixed, but we do not support canvas content in coordinated graphics without graphics-surfaces. Ok I was wrong, paintToTextureMapper will never be called for WK2 and "textureMapper->accelerationMode() == TextureMapper::OpenGLMode" will be enough to pick the right code path. 910661 7 207244 jturcotte 2013-07-22 06:59:46 -0700 Comment on attachment 207244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207244&action=review > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:98 > + bool m_canPaintDirectly; r=me if you remove this member. 910664 8 allan.jensen 2013-07-22 07:03:41 -0700 Committed r152969: <http://trac.webkit.org/changeset/152969> 205908 2013-07-02 06:58:02 -0700 2013-07-22 06:58:10 -0700 Patch bug-118302-20130702155557.patch text/plain 3965 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q1ZWQ2Y2M3NjMxMDA4 NGQ4ZTNjZTllYmNjOTJiZmZlODQzMDU1MS4uZWVkYzNhMzM5Mjg5OGM4NjU0NjE2NjVhNWMyNzQy MjExMDQ1ZWQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA3LTAyICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF1bV0sxXSBTdXBwb3J0IGRpcmVjdCBwYWludGluZyB3aXRob3V0IEdyYXBoaWNzU3VyZmFjZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MzAyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29uZmlndXJl IHRoZSBXZWJHTCBPcGVuR0wgY29udGV4dCB0byBzaGFyZSB0ZXh0dXJlIHdpdGgKKyAgICAgICAg dGhlIEhvc3RXaW5kb3cgT3BlbkdMIGlmIGF2YWlsYWJsZSwgYW5kIHBhaW50IGFjY2VsZXJhdGVk CisgICAgICAgIHVzaW5nIHRoZSB0aGUgbm93IHNoYXJlZCB0ZXh0dXJlcy4KKworICAgICAgICBU aGlzIHNob3VsZCByZXR1cm4gdGhlIHBlcmZvcm1hbmNlIHdpdGhvdXQgR3JhcGhpY3NTdXJmYWNl CisgICAgICAgIG9uIHRoZSBXSzEgY29kZSBwYXRoIHRvIHdoYXQgaXQgd2FzIGJlZm9yZSByMTM1 OTk1ICgyOC8xMSAyMDEyKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0RQ cml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0M0RQcml2YXRlOjpwYWludFRvVGV4dHVyZU1hcHBlcik6CisKIDIwMTMtMDct MDIgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXgg Y2FzdC1hbGlnbiB3YXJuaW5ncyBpbiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCmluZGV4IDJjMDgxNDIzYjc4 ODllZmY3NmViOTY0MzlhNWJlN2ZkYzZkNjI3ZTcuLjUyZjliYWQxODJhYWUzYmY2YWIzZWVmM2Vj NzA3YTU0YTBiMjUzZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCkBAIC0xMjAsNiArMTIwLDEw IEBAIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKEdy YXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBICiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBRT3BlbkdMQ29udGV4dCogc2hhcmVDb250ZXh0ID0gMDsKKyAgICBpZiAoaG9zdFdpbmRvdyAm JiBob3N0V2luZG93LT5wbGF0Zm9ybVBhZ2VDbGllbnQoKS0+bWFrZU9wZW5HTENvbnRleHRDdXJy ZW50SWZBdmFpbGFibGUoKSkKKyAgICAgICAgc2hhcmVDb250ZXh0ID0gUU9wZW5HTENvbnRleHQ6 OmN1cnJlbnRDb250ZXh0KCk7CisKICNpZiBRVF9WRVJTSU9OID49IDB4MDUwMTAwCiAgICAgUU9m ZnNjcmVlblN1cmZhY2UqIHN1cmZhY2UgPSBuZXcgUU9mZnNjcmVlblN1cmZhY2U7CiAgICAgc3Vy ZmFjZS0+Y3JlYXRlKCk7CkBAIC0xMzUsNiArMTM5LDggQEAgR3JhcGhpY3NDb250ZXh0M0RQcml2 YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs IEgKICNlbmRpZgogCiAgICAgbV9wbGF0Zm9ybUNvbnRleHQgPSBuZXcgUU9wZW5HTENvbnRleHQo bV9zdXJmYWNlT3duZXIpOworICAgIGlmIChzaGFyZUNvbnRleHQpCisgICAgICAgIG1fcGxhdGZv cm1Db250ZXh0LT5zZXRTaGFyZUNvbnRleHQoc2hhcmVDb250ZXh0KTsKICAgICBpZiAoIW1fcGxh dGZvcm1Db250ZXh0LT5jcmVhdGUoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0yMjksOSArMjM1 LDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpwYWludFRvVGV4dHVyZU1hcHBl cihUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyCiAgICAgbV9jb250ZXh0LT5tYXJrTGF5ZXJD b21wb3NpdGVkKCk7CiAgICAgYmxpdE11bHRpc2FtcGxlRnJhbWVidWZmZXJBbmRSZXN0b3JlQ29u dGV4dCgpOwogCi0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi0gICAgQVNTRVJUKG1fZ3JhcGhp Y3NTdXJmYWNlKTsKICAgICBpZiAodGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09 IFRleHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpIHsKKyAgICAgICAgVGV4dHVyZU1hcHBlckdMKiB0 ZXhtYXBHTCA9IHN0YXRpY19jYXN0PFRleHR1cmVNYXBwZXJHTCo+KHRleHR1cmVNYXBwZXIpOwor I2lmIFVTRShHUkFQSElDU19TVVJGQUNFKQorICAgICAgICBBU1NFUlQobV9ncmFwaGljc1N1cmZh Y2UpOwogICAgICAgICAvLyBDR0wgb25seSBwcm92aWRlcyB1cyB0aGUgY29udGV4dCwgYnV0IG5v dCB0aGUgdmlldyB0aGUgY29udGV4dCBpcyBjdXJyZW50bHkgYm91bmQgdG8uCiAgICAgICAgIC8v IFRvIG1ha2Ugc3VyZSB0aGUgY29udGV4dCBpcyBib3VuZCB0aGUgdGhlIHJpZ2h0IHN1cmZhY2Ug d2UgaGF2ZSB0byBkbyBhIG1ha2VDdXJyZW50IHRocm91Z2ggUU9wZW5HTCBhZ2Fpbi4KICAgICAg ICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGNvZGUgYXMgc29vbiBhcyBHcmFwaGljc1N1cmZhY2VN YWMgbWFrZXMgdXNlIG9mIE5TT3BlbkdMLgpAQCAtMjQ2LDExICsyNTMsMTUgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQzRFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXIq IHRleHR1cmVNYXBwZXIKICAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGNvZGUgYXMgc29v biBhcyBHcmFwaGljc1N1cmZhY2VNYWMgbWFrZXMgdXNlIG9mIE5TT3BlbkdMLgogICAgICAgICBj dXJyZW50Q29udGV4dC0+bWFrZUN1cnJlbnQoY3VycmVudFN1cmZhY2UpOwogCi0gICAgICAgIFRl eHR1cmVNYXBwZXJHTCogdGV4bWFwR0wgPSBzdGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyR0wqPih0 ZXh0dXJlTWFwcGVyKTsKICAgICAgICAgbV9ncmFwaGljc1N1cmZhY2UtPnBhaW50VG9UZXh0dXJl TWFwcGVyKHRleG1hcEdMLCB0YXJnZXRSZWN0LCBtYXRyaXgsIG9wYWNpdHkpOworI2Vsc2UKKyAg ICAgICAgVGV4dHVyZU1hcHBlckdMOjpGbGFncyBmbGFncyA9IFRleHR1cmVNYXBwZXJHTDo6U2hv dWxkRmxpcFRleHR1cmUgfCAobV9jb250ZXh0LT5tX2F0dHJzLmFscGhhID8gVGV4dHVyZU1hcHBl ckdMOjpTaG91bGRCbGVuZCA6IDApOworICAgICAgICBJbnRTaXplIHRleHR1cmVTaXplKG1fY29u dGV4dC0+bV9jdXJyZW50V2lkdGgsIG1fY29udGV4dC0+bV9jdXJyZW50SGVpZ2h0KTsKKyAgICAg ICAgdGV4bWFwR0wtPmRyYXdUZXh0dXJlKG1fY29udGV4dC0+bV90ZXh0dXJlLCBmbGFncywgdGV4 dHVyZVNpemUsIHRhcmdldFJlY3QsIG1hdHJpeCwgb3BhY2l0eSk7CisjZW5kaWYKICAgICAgICAg cmV0dXJuOworCiAgICAgfQotI2VuZGlmCiAKICAgICBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQg PSB0ZXh0dXJlTWFwcGVyLT5ncmFwaGljc0NvbnRleHQoKTsKICAgICBRUGFpbnRlciogcGFpbnRl ciA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwo= 207244 2013-07-22 06:30:48 -0700 2013-07-22 06:59:46 -0700 Patch bug-118302-20130722153046.patch text/plain 5104 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyOTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JhMDM1MDY0NjMyNTBm ODllN2RmYThkMjQxMWYyNzkyNDkxN2ZjNC4uMzQ4ZTAzMTA1ZTRjYmIzNWQ0OGZmNjNiNWM3MWRi ZDRiZDQ3MzQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA3LTIyICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF1bV0sxXSBTdXBwb3J0IGRpcmVjdCBwYWludGluZyB3aXRob3V0IEdyYXBoaWNzU3VyZmFjZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MzAyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29uZmlndXJl IHRoZSBXZWJHTCBPcGVuR0wgY29udGV4dCB0byBzaGFyZSB0ZXh0dXJlIHdpdGgKKyAgICAgICAg dGhlIEhvc3RXaW5kb3cgT3BlbkdMIGlmIGF2YWlsYWJsZSwgYW5kIHBhaW50IGFjY2VsZXJhdGVk CisgICAgICAgIHVzaW5nIHRoZSB0aGUgbm93IHNoYXJlZCB0ZXh0dXJlcy4KKworICAgICAgICBU aGlzIHNob3VsZCByZXR1cm4gdGhlIHBlcmZvcm1hbmNlIHdpdGhvdXQgR3JhcGhpY3NTdXJmYWNl CisgICAgICAgIG9uIHRoZSBXSzEgY29kZSBwYXRoIHRvIHdoYXQgaXQgd2FzIGJlZm9yZSByMTM1 OTk1ICgyOC8xMSAyMDEyKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0RQ cml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0M0RQcml2YXRlOjpwYWludFRvVGV4dHVyZU1hcHBlcik6CisKIDIwMTMtMDct MTEgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAg ICAgICAgW1F0XSBJbXBsZW1lbnQgbW9yZSBvZiBET00zIEtleUV2ZW50IGtleS1pZGVudGlmaWVy cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCAyYzA4MTQyM2I3ODg5ZWZmNzZlYjk2NDM5YTVi ZTdmZGM2ZDYyN2U3Li5iYmM2YjI3OTA3NWNhZjQ1M2JmZDA1NDg0OGY3ZWFkZTdmNTQ0NGYzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHQzRFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcApAQCAtOTUsNiArOTUsNyBAQCBwdWJsaWM6CiAgICAgR3Jh cGhpY3NTdXJmYWNlOjpGbGFncyBtX3N1cmZhY2VGbGFnczsKICAgICBSZWZQdHI8R3JhcGhpY3NT dXJmYWNlPiBtX2dyYXBoaWNzU3VyZmFjZTsKICNlbmRpZgorICAgIGJvb2wgbV9jYW5QYWludERp cmVjdGx5OwogfTsKIAogYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6aXNHTEVTMkNvbXBsaWFudCgp IGNvbnN0CkBAIC0xMTIsNiArMTEzLDcgQEAgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpHcmFw aGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEgKICAgICAs IG1fc3VyZmFjZSgwKQogICAgICwgbV9wbGF0Zm9ybUNvbnRleHQoMCkKICAgICAsIG1fc3VyZmFj ZU93bmVyKDApCisgICAgLCBtX2NhblBhaW50RGlyZWN0bHkoZmFsc2UpCiB7CiAgICAgaWYgKHJl bmRlclN0eWxlID09IEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJUb0N1cnJlbnRHTENvbnRleHQp IHsKICAgICAgICAgbV9wbGF0Zm9ybUNvbnRleHQgPSBRT3BlbkdMQ29udGV4dDo6Y3VycmVudENv bnRleHQoKTsKQEAgLTEyMCw2ICsxMjIsMTAgQEAgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpH cmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEgKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFFPcGVuR0xDb250ZXh0KiBzaGFyZUNvbnRleHQg PSAwOworICAgIGlmIChob3N0V2luZG93ICYmIGhvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNsaWVu dCgpICYmIGhvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNsaWVudCgpLT5tYWtlT3BlbkdMQ29udGV4 dEN1cnJlbnRJZkF2YWlsYWJsZSgpKQorICAgICAgICBzaGFyZUNvbnRleHQgPSBRT3BlbkdMQ29u dGV4dDo6Y3VycmVudENvbnRleHQoKTsKKwogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNTAxMDAKICAg ICBRT2Zmc2NyZWVuU3VyZmFjZSogc3VyZmFjZSA9IG5ldyBRT2Zmc2NyZWVuU3VyZmFjZTsKICAg ICBzdXJmYWNlLT5jcmVhdGUoKTsKQEAgLTEzNSw2ICsxNDEsMTEgQEAgR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQsIEgKICNlbmRpZgogCiAgICAgbV9wbGF0Zm9ybUNvbnRleHQgPSBuZXcgUU9wZW5HTENv bnRleHQobV9zdXJmYWNlT3duZXIpOworICAgIGlmIChzaGFyZUNvbnRleHQpIHsKKyAgICAgICAg bV9wbGF0Zm9ybUNvbnRleHQtPnNldFNoYXJlQ29udGV4dChzaGFyZUNvbnRleHQpOworICAgICAg ICBtX2NhblBhaW50RGlyZWN0bHkgPSB0cnVlOworICAgIH0KKwogICAgIGlmICghbV9wbGF0Zm9y bUNvbnRleHQtPmNyZWF0ZSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE0NSw4ICsxNTYsMTAg QEAgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGUoR3Jh cGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEgKICAgICBtX3N1cmZhY2VGbGFncyA9IEdyYXBoaWNz U3VyZmFjZTo6U3VwcG9ydHNUZXh0dXJlVGFyZ2V0CiAgICAgICAgICAgICAgICAgICAgIHwgR3Jh cGhpY3NTdXJmYWNlOjpTdXBwb3J0c1NoYXJpbmc7CiAKLSAgICBpZiAoIXN1cmZhY2VTaXplLmlz RW1wdHkoKSkKKyAgICBpZiAoIXN1cmZhY2VTaXplLmlzRW1wdHkoKSkgewogICAgICAgICBtX2dy YXBoaWNzU3VyZmFjZSA9IEdyYXBoaWNzU3VyZmFjZTo6Y3JlYXRlKHN1cmZhY2VTaXplLCBtX3N1 cmZhY2VGbGFncywgbV9wbGF0Zm9ybUNvbnRleHQpOworICAgICAgICBtX2NhblBhaW50RGlyZWN0 bHkgPSB0cnVlOworICAgIH0KICNlbmRpZgogfQogCkBAIC0yMjksOSArMjQyLDEwIEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpwYWludFRvVGV4dHVyZU1hcHBlcihUZXh0dXJlTWFw cGVyKiB0ZXh0dXJlTWFwcGVyCiAgICAgbV9jb250ZXh0LT5tYXJrTGF5ZXJDb21wb3NpdGVkKCk7 CiAgICAgYmxpdE11bHRpc2FtcGxlRnJhbWVidWZmZXJBbmRSZXN0b3JlQ29udGV4dCgpOwogCisg ICAgaWYgKHRleHR1cmVNYXBwZXItPmFjY2VsZXJhdGlvbk1vZGUoKSA9PSBUZXh0dXJlTWFwcGVy OjpPcGVuR0xNb2RlICYmIG1fY2FuUGFpbnREaXJlY3RseSkgeworICAgICAgICBUZXh0dXJlTWFw cGVyR0wqIHRleG1hcEdMID0gc3RhdGljX2Nhc3Q8VGV4dHVyZU1hcHBlckdMKj4odGV4dHVyZU1h cHBlcik7CiAjaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi0gICAgQVNTRVJUKG1fZ3JhcGhpY3NT dXJmYWNlKTsKLSAgICBpZiAodGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09IFRl eHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpIHsKKyAgICAgICAgQVNTRVJUKG1fZ3JhcGhpY3NTdXJm YWNlKTsKICAgICAgICAgLy8gQ0dMIG9ubHkgcHJvdmlkZXMgdXMgdGhlIGNvbnRleHQsIGJ1dCBu b3QgdGhlIHZpZXcgdGhlIGNvbnRleHQgaXMgY3VycmVudGx5IGJvdW5kIHRvLgogICAgICAgICAv LyBUbyBtYWtlIHN1cmUgdGhlIGNvbnRleHQgaXMgYm91bmQgdGhlIHRoZSByaWdodCBzdXJmYWNl IHdlIGhhdmUgdG8gZG8gYSBtYWtlQ3VycmVudCB0aHJvdWdoIFFPcGVuR0wgYWdhaW4uCiAgICAg ICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBjb2RlIGFzIHNvb24gYXMgR3JhcGhpY3NTdXJmYWNl TWFjIG1ha2VzIHVzZSBvZiBOU09wZW5HTC4KQEAgLTI0NiwxMSArMjYwLDE0IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0M0RQcml2YXRlOjpwYWludFRvVGV4dHVyZU1hcHBlcihUZXh0dXJlTWFwcGVy KiB0ZXh0dXJlTWFwcGVyCiAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBjb2RlIGFzIHNv b24gYXMgR3JhcGhpY3NTdXJmYWNlTWFjIG1ha2VzIHVzZSBvZiBOU09wZW5HTC4KICAgICAgICAg Y3VycmVudENvbnRleHQtPm1ha2VDdXJyZW50KGN1cnJlbnRTdXJmYWNlKTsKIAotICAgICAgICBU ZXh0dXJlTWFwcGVyR0wqIHRleG1hcEdMID0gc3RhdGljX2Nhc3Q8VGV4dHVyZU1hcHBlckdMKj4o dGV4dHVyZU1hcHBlcik7CiAgICAgICAgIG1fZ3JhcGhpY3NTdXJmYWNlLT5wYWludFRvVGV4dHVy ZU1hcHBlcih0ZXhtYXBHTCwgdGFyZ2V0UmVjdCwgbWF0cml4LCBvcGFjaXR5KTsKKyNlbHNlCisg ICAgICAgIFRleHR1cmVNYXBwZXJHTDo6RmxhZ3MgZmxhZ3MgPSBUZXh0dXJlTWFwcGVyR0w6OlNo b3VsZEZsaXBUZXh0dXJlIHwgKG1fY29udGV4dC0+bV9hdHRycy5hbHBoYSA/IFRleHR1cmVNYXBw ZXJHTDo6U2hvdWxkQmxlbmQgOiAwKTsKKyAgICAgICAgSW50U2l6ZSB0ZXh0dXJlU2l6ZShtX2Nv bnRleHQtPm1fY3VycmVudFdpZHRoLCBtX2NvbnRleHQtPm1fY3VycmVudEhlaWdodCk7CisgICAg ICAgIHRleG1hcEdMLT5kcmF3VGV4dHVyZShtX2NvbnRleHQtPm1fdGV4dHVyZSwgZmxhZ3MsIHRl eHR1cmVTaXplLCB0YXJnZXRSZWN0LCBtYXRyaXgsIG9wYWNpdHkpOworI2VuZGlmCiAgICAgICAg IHJldHVybjsKICAgICB9Ci0jZW5kaWYKIAogICAgIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCA9 IHRleHR1cmVNYXBwZXItPmdyYXBoaWNzQ29udGV4dCgpOwogICAgIFFQYWludGVyKiBwYWludGVy ID0gY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7Cg==