133871 2014-06-13 11:38:05 -0700 [GTK] Guard uses of RedirectedXCompositeWindow in WebKitWebViewBase with PLATFORM(X11) 2014-07-08 11:57:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan berto cgarcia commit-queue elima gustavo itoral mrobinson yoon oldest_to_newest 1015482 0 zan 2014-06-13 11:38:05 -0700 [GTK] Guard uses of RedirectedXCompositeWindow in WebKitWebViewBase with PLATFORM(X11) 1015488 1 233065 zan 2014-06-13 11:54:39 -0700 Created attachment 233065 Patch 1015490 2 commit-queue 2014-06-13 11:56:56 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1015504 3 233065 mrobinson 2014-06-13 13:19:54 -0700 Comment on attachment 233065 Patch I think we always need compile-time support for X11. 1015619 4 233065 yoon 2014-06-13 22:40:10 -0700 Comment on attachment 233065 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233065&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:435 > +#if PLATFORM(X11) && defined(GDK_WINDOWING_X11) As you mentioned in commit log, PLATFORM(X11) should imply GDK_WINDOWING_X11. So I think it is better to remove defined(GDK_WINDOWING_X11) from this patch. 1016087 5 zan 2014-06-17 01:45:03 -0700 (In reply to comment #3) > (From update of attachment 233065 [details]) > I think we always need compile-time support for X11. We do now, but this patch guards RedirectedXCompositeWindow that won't be used in builds for the Wayland target. 1016088 6 zan 2014-06-17 01:46:54 -0700 (In reply to comment #4) > (From update of attachment 233065 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=233065&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:435 > > +#if PLATFORM(X11) && defined(GDK_WINDOWING_X11) > > As you mentioned in commit log, PLATFORM(X11) should imply GDK_WINDOWING_X11. > So I think it is better to remove defined(GDK_WINDOWING_X11) from this patch. OK, I'll enhance the CMake system to properly check for dependencies that would make 'PLATFORM(X11)' equivalent to 'PLATFORM(X11) && defined(GDK_WINDOWING_X11)', and then use PLATFORM(X11) only. 1016127 7 mrobinson 2014-06-17 09:31:12 -0700 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 233065 [details] [details]) > > I think we always need compile-time support for X11. > > We do now, but this patch guards RedirectedXCompositeWindow that won't be used in builds for the Wayland target. Can you talk more about builds that do not support X11, but do support Wayland? 1021052 8 234551 zan 2014-07-08 00:12:22 -0700 Created attachment 234551 Patch 1021098 9 zan 2014-07-08 09:26:44 -0700 (In reply to comment #7) > (In reply to comment #5) > > (In reply to comment #3) > > > (From update of attachment 233065 [details] [details] [details]) > > > I think we always need compile-time support for X11. > > > > We do now, but this patch guards RedirectedXCompositeWindow that won't be used in builds for the Wayland target. > > Can you talk more about builds that do not support X11, but do support Wayland? In Autotools we supported building for either X11 windowing target, Wayland windowing target, or both -- much like GTK+ can support different windowing targets. Of course we'll be checking that the GTK+ installation that's used was actually configured to enable the desired windowing target. The idea is to achieve the same with CMake. I can't really remember though why all these guards that are being added in this patch weren't necessary ~6 months ago. 1021099 10 234551 zan 2014-07-08 09:35:08 -0700 Comment on attachment 234551 Patch Clearing flags on attachment: 234551 Committed r170887: <http://trac.webkit.org/changeset/170887> 1021100 11 zan 2014-07-08 09:35:17 -0700 All reviewed patches have been landed. Closing bug. 1021110 12 mrobinson 2014-07-08 09:56:46 -0700 (In reply to comment #9) > In Autotools we supported building for either X11 windowing target, Wayland windowing target, or both -- much like GTK+ can support different windowing targets. Of course we'll be checking that the GTK+ installation that's used was actually configured to enable the desired windowing target. I'm not sure of the benefit of making this configurable. My proposal is that we just target the same platforms that the GTK+ we are compiling against supports. 1021146 13 zan 2014-07-08 11:57:17 -0700 (In reply to comment #12) > (In reply to comment #9) > > > In Autotools we supported building for either X11 windowing target, Wayland windowing target, or both -- much like GTK+ can support different windowing targets. Of course we'll be checking that the GTK+ installation that's used was actually configured to enable the desired windowing target. > > I'm not sure of the benefit of making this configurable. My proposal is that we just target the same platforms that the GTK+ we are compiling against supports. That makes sense. Bug 134736. 233065 2014-06-13 11:54:39 -0700 2014-07-08 00:12:05 -0700 Patch bug-133871-20140613115414.patch text/plain 5340 zan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTkzOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA2LTEzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBHdWFyZCB1c2Vz IG9mIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93IGluIFdlYktpdFdlYlZpZXdCYXNlIHdpdGgg UExBVEZPUk0oWDExKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMzODcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgR3VhcmQgdXNlcyBvZiB0aGUgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgb2JqZWN0 IGluIFdlYktpdFdlYlZpZXdCYXNlIHdpdGggdGhlCisgICAgICAgIFBMQVRGT1JNKFgxMSkgYnVp bGQgZ3VhcmQuIFRoaXMgaXMgcmVxdWlyZWQgdG8gcHJvcGVybHkgc3VwcG9ydCBidWlsZGluZyB0 aGUgR1RLCisgICAgICAgIHBvcnQgb25seSBmb3IgdGhlIFdheWxhbmQgdGFyZ2V0LgorCisgICAg ICAgIFRoZSBQTEFURk9STShYMTEpIGJ1aWxkIGd1YXJkIGlzIG9mdGVuIHVzZWQgdG9nZXRoZXIg d2l0aCBkZWZpbmVkKEdES19XSU5ET1dJTkdfWDExKS4KKyAgICAgICAgVGhlIGZvcm1lciBjaGVj a3Mgd2hldGhlciBXZWJLaXRHVEsrIGlzIGJlaW5nIGJ1aWx0IHdpdGggc3VwcG9ydCBmb3IgdGhl IFgxMSB0YXJnZXQKKyAgICAgICAgd2hpbGUgdGhlIGxhdHRlciBjaGVja3MgdGhhdCB0aGUgR1RL KyB0b29sa2l0IHdhcyBidWlsdCB3aXRoIHRoYXQgc3VwcG9ydC4gSW4gdGhlIGZ1dHVyZQorICAg ICAgICB0aGUgQ01ha2UgY29uZmlndXJhdGlvbiBzdGVwIHNob3VsZCBwcm9wZXJseSBkZXRlcm1p bmUgdGhhdCB0aGUgR1RLKyBkZXBlbmRlbmN5IHN1cHBvcnRzCisgICAgICAgIHRoZSBYMTEgdGFy Z2V0IHdoZW4gd2Ugd2FudCB0byBlbmFibGUgaXQsIG1lYW5pbmcgdGhhdCBQTEFURk9STShYMTEp IHdvdWxkIGFsc28gaW1wbHkKKyAgICAgICAgZGVmaW5lZChHREtfV0lORE9XSU5HX1gxMSkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAg ICAgICh3ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKToKKyAgICAgICAgKHdlYmtpdFdlYlZp ZXdSZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nUmVzdWx0cyk6CisgICAgICAgIChyZXNpemVX ZWJLaXRXZWJWaWV3QmFzZUZyb21BbGxvY2F0aW9uKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdC YXNlVXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VDcmVhdGVX ZWJQYWdlKToKKwogMjAxNC0wNi0xMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgog CiAgICAgICAgIFtpT1NdIE5ldHdvcmtpbmcgcHJvY2VzcyBhbHdheXMgZGVjb2RlcyBrZXlzCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwCShyZXZpc2lvbiAxNjk5MzkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1 LDcgKzc1LDcgQEAKICNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjZW5k aWYKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgZGVmaW5lZChHREtfV0lORE9XSU5H X1gxMSkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkgJiYgZGVm aW5lZChHREtfV0lORE9XSU5HX1gxMSkKICNpbmNsdWRlIDxXZWJDb3JlL1JlZGlyZWN0ZWRYQ29t cG9zaXRlV2luZG93Lmg+CiAjZW5kaWYKIApAQCAtODgsNyArODgsNyBAQCB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIAogdHlwZWRlZiBIYXNoTWFwPEd0a1dpZGdldCosIEludFJlY3Q+IFdlYktp dFdlYlZpZXdDaGlsZHJlbk1hcDsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBV U0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkgJiYgZGVmaW5lZChHREtfV0lO RE9XSU5HX1gxMSkKIHZvaWQgcmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRDYWxsYmFjayh2b2lkKiBk YXRhKTsKICNlbmRpZgogCkBAIC0xMzMsNyArMTMzLDcgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3 QmFzZVByaXZhdGUgewogICAgIFdlYkZ1bGxTY3JlZW5DbGllbnRHdGsgZnVsbFNjcmVlbkNsaWVu dDsKICNlbmRpZgogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFVTRShURVhUVVJF X01BUFBFUl9HTCkgJiYgUExBVEZPUk0oWDExKSAmJiBkZWZpbmVkKEdES19XSU5ET1dJTkdfWDEx KQogICAgIE93blB0cjxSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdz4gcmVkaXJlY3RlZFdpbmRv dzsKICNlbmRpZgogfTsKQEAgLTQxNCw3ICs0MTQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJW aWV3QmFzZUNvbnN0cnVjdGVkCiAgICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBs OjpjcmVhdGUodmlld1dpZGdldCk7CiAgICAgcHJpdi0+ZHJhZ0FuZERyb3BIZWxwZXIuc2V0V2lk Z2V0KHZpZXdXaWRnZXQpOwogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBkZWZpbmVk KEdES19XSU5ET1dJTkdfWDExKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZP Uk0oWDExKSAmJiBkZWZpbmVkKEdES19XSU5ET1dJTkdfWDExKQogICAgIEdka0Rpc3BsYXkqIGRp c3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0X2Rpc3BsYXkoZ2RrX2Rpc3Bs YXlfbWFuYWdlcl9nZXQoKSk7CiAgICAgaWYgKEdES19JU19YMTFfRElTUExBWShkaXNwbGF5KSkg ewogICAgICAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93ID0gUmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3c6OmNyZWF0ZShJbnRTaXplKDEsIDEpLCBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6 RG9Ob3RDcmVhdGVHTENvbnRleHQpOwpAQCAtNDMyLDYgKzQzMiw3IEBAIHN0YXRpYyBib29sIHdl YmtpdFdlYlZpZXdSZW5kZXJBY2NlbGVyYXQKICAgICBpZiAoIWRyYXdpbmdBcmVhLT5pc0luQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisjaWYg UExBVEZPUk0oWDExKSAmJiBkZWZpbmVkKEdES19XSU5ET1dJTkdfWDExKQogICAgIC8vIFRvIGF2 b2lkIGZsYXNoZXMgd2hlbiBpbml0aWFsaXppbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZm9y IHRoZSBmaXJzdAogICAgIC8vIHRpbWUsIHdlIHdhaXQgdW50aWwgd2Uga25vdyB0aGVyZSdzIGEg ZnJhbWUgcmVhZHkgYmVmb3JlIHJlbmRlcmluZy4KICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZh dGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJpdjsKQEAgLTQ0Myw2ICs0NDQsOSBAQCBzdGF0aWMg Ym9vbCB3ZWJraXRXZWJWaWV3UmVuZGVyQWNjZWxlcmF0CiAgICAgY2Fpcm9fc2V0X3NvdXJjZV9z dXJmYWNlKGNyLCBzdXJmYWNlLCAwLCAwKTsKICAgICBjYWlyb19maWxsKGNyKTsKICAgICByZXR1 cm4gdHJ1ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiB9CiAjZW5kaWYKIApA QCAtNTM0LDcgKzUzOCw3IEBAIHN0YXRpYyB2b2lkIHJlc2l6ZVdlYktpdFdlYlZpZXdCYXNlRnJv bUEKICAgICAgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKHByaXYtPmF1dGhlbnRpY2F0aW9u RGlhbG9nLCAmY2hpbGRBbGxvY2F0aW9uKTsKICAgICB9CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQ RVJfR0wpCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpICYmIGRl ZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCiAgICAgaWYgKHNpemVDaGFuZ2VkICYmIHdlYlZpZXdC YXNlLT5wcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAgICAgICB3ZWJWaWV3QmFzZS0+cHJpdi0+ cmVkaXJlY3RlZFdpbmRvdy0+cmVzaXplKHZpZXdSZWN0LnNpemUoKSk7CiAjZW5kaWYKQEAgLTk2 Miw3ICs5NjYsNyBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVXBkYXRlUHJlZmVyZW5jZXMoCiB7 CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2Ut PnByaXY7CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisjaWYgVVNFKFRFWFRVUkVfTUFQ UEVSX0dMKSAmJiBQTEFURk9STShYMTEpICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCiAg ICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgpA QCAtOTg3LDcgKzk5MSw3IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKFdl YksKICAgICBwcml2LT5wYWdlUHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKCpwcml2LT5w YWdlQ2xpZW50LCBzdGQ6Om1vdmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBwcml2LT5w YWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJf R0wpCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpICYmIGRlZmlu ZWQoR0RLX1dJTkRPV0lOR19YMTEpCiAgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCiAg ICAgICAgIHByaXYtPnBhZ2VQcm94eS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1dpbmRvd0lk KHByaXYtPnJlZGlyZWN0ZWRXaW5kb3ctPndpbmRvd0lkKCkpOwogI2VuZGlmCkBAIC0xMTI5LDcg KzExMzMsNyBAQCBHZGtFdmVudCogd2Via2l0V2ViVmlld0Jhc2VUYWtlQ29udGV4dE1lCiAgICAg cmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5jb250ZXh0TWVudUV2ZW50LnJlbGVhc2Uo KTsKIH0KIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQ RVJfR0wpICYmIFBMQVRGT1JNKFgxMSkgJiYgZGVmaW5lZChHREtfV0lORE9XSU5HX1gxMSkKIHZv aWQgcmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRDYWxsYmFjayh2b2lkKiBkYXRhKQogewogICAgIGd0 a193aWRnZXRfcXVldWVfZHJhdyhHVEtfV0lER0VUKGRhdGEpKTsK 234551 2014-07-08 00:12:22 -0700 2014-07-08 09:35:08 -0700 Patch bug-133871-20140708001203.patch text/plain 5145 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMmNkZjY4MDFjNjdiMjAx ZjRiYzAwNjgyY2QwNzhiNGZhMWZhMTE2Ni4uM2Q1YWUyZDAzNzI1MzJlNzZkZmI3ZTJkMWEyNDYw OTliMTRjMGNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA3LTA3ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBHdWFyZCB1 c2VzIG9mIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93IGluIFdlYktpdFdlYlZpZXdCYXNlIHdp dGggUExBVEZPUk0oWDExKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzODcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgR3VhcmQgdXNlcyBvZiB0aGUgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgb2Jq ZWN0IGluIFdlYktpdFdlYlZpZXdCYXNlIHdpdGggdGhlCisgICAgICAgIFBMQVRGT1JNKFgxMSkg YnVpbGQgZ3VhcmQuIFRoaXMgaXMgcmVxdWlyZWQgdG8gcHJvcGVybHkgc3VwcG9ydCBidWlsZGlu ZyB0aGUgR1RLCisgICAgICAgIHBvcnQgb25seSBmb3IgdGhlIFdheWxhbmQgdGFyZ2V0LgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAg ICAod2Via2l0V2ViVmlld0Jhc2VDb25zdHJ1Y3RlZCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3 UmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMpOgorICAgICAgICAocmVzaXplV2Vi S2l0V2ViVmlld0Jhc2VGcm9tQWxsb2NhdGlvbik6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZVVwZGF0ZVByZWZlcmVuY2VzKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2Vi UGFnZSk6CisKIDIwMTQtMDctMDcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgVHVybiBvbiBhY2NlbGVyYXRlZCBkcmF3aW5nIGZvciBXZWJLaXQyIGJ5 IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCAzZGVjYmZmMTJlNTQ5Y2RjZDFiMDAxOGE1ZGI1MzRj YTllY2Y1MTk1Li43ZTZmZmViNzc0YzAxM2RjZGY0NWJiMGIwMzdiYWMyNjZiN2MyNDZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll d0Jhc2UuY3BwCkBAIC02Myw3ICs2Myw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4K ICNpbmNsdWRlIDxnZGsvZ2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KLSNpZmRl ZiBHREtfV0lORE9XSU5HX1gxMQorI2lmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCiAjaW5j bHVkZSA8Z2RrL2dka3guaD4KICNlbmRpZgogI2luY2x1ZGUgPG1lbW9yeT4KQEAgLTc1LDcgKzc1 LDcgQEAKICNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjZW5kaWYKIAot I2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgZGVmaW5lZChHREtfV0lORE9XSU5HX1gxMSkK KyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkKICNpbmNsdWRlIDxX ZWJDb3JlL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93Lmg+CiAjZW5kaWYKIApAQCAtODgsNyAr ODgsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogdHlwZWRlZiBIYXNoTWFwPEd0a1dp ZGdldCosIEludFJlY3Q+IFdlYktpdFdlYlZpZXdDaGlsZHJlbk1hcDsKIAotI2lmIFVTRShURVhU VVJFX01BUFBFUl9HTCkKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgx MSkKIHZvaWQgcmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRDYWxsYmFjayh2b2lkKiBkYXRhKTsKICNl bmRpZgogCkBAIC0xMzMsNyArMTMzLDcgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3QmFzZVByaXZh dGUgewogICAgIFdlYkZ1bGxTY3JlZW5DbGllbnRHdGsgZnVsbFNjcmVlbkNsaWVudDsKICNlbmRp ZgogCi0jaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9H TCkgJiYgUExBVEZPUk0oWDExKQogICAgIE93blB0cjxSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRv dz4gcmVkaXJlY3RlZFdpbmRvdzsKICNlbmRpZgogfTsKQEAgLTQxNCw3ICs0MTQsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKICAg ICBwcml2LT5wYWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh2aWV3V2lkZ2V0KTsK ICAgICBwcml2LT5kcmFnQW5kRHJvcEhlbHBlci5zZXRXaWRnZXQodmlld1dpZGdldCk7CiAKLSNp ZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCisj aWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCiAgICAgR2RrRGlzcGxh eSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFnZXJfZ2V0X2RlZmF1bHRfZGlzcGxheShnZGtf ZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKICAgICBpZiAoR0RLX0lTX1gxMV9ESVNQTEFZKGRpc3Bs YXkpKSB7CiAgICAgICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cgPSBSZWRpcmVjdGVkWENvbXBv c2l0ZVdpbmRvdzo6Y3JlYXRlKEludFNpemUoMSwgMSksIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2lu ZG93OjpEb05vdENyZWF0ZUdMQ29udGV4dCk7CkBAIC00MzIsNiArNDMyLDcgQEAgc3RhdGljIGJv b2wgd2Via2l0V2ViVmlld1JlbmRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSZXN1bHRzKFdlYktp dFdlYlZpZXdCYXNlKgogICAgIGlmICghZHJhd2luZ0FyZWEtPmlzSW5BY2NlbGVyYXRlZENvbXBv c2l0aW5nTW9kZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyNpZiBQTEFURk9STShYMTEp CiAgICAgLy8gVG8gYXZvaWQgZmxhc2hlcyB3aGVuIGluaXRpYWxpemluZyBhY2NlbGVyYXRlZCBj b21wb3NpdGluZyBmb3IgdGhlIGZpcnN0CiAgICAgLy8gdGltZSwgd2Ugd2FpdCB1bnRpbCB3ZSBr bm93IHRoZXJlJ3MgYSBmcmFtZSByZWFkeSBiZWZvcmUgcmVuZGVyaW5nLgogICAgIFdlYktpdFdl YlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwpAQCAtNDQzLDYgKzQ0 NCw5IEBAIHN0YXRpYyBib29sIHdlYmtpdFdlYlZpZXdSZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nUmVzdWx0cyhXZWJLaXRXZWJWaWV3QmFzZSoKICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZh Y2UoY3IsIHN1cmZhY2UsIDAsIDApOwogICAgIGNhaXJvX2ZpbGwoY3IpOwogICAgIHJldHVybiB0 cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKIH0KICNlbmRpZgogCkBAIC01 MzQsNyArNTM4LDcgQEAgc3RhdGljIHZvaWQgcmVzaXplV2ViS2l0V2ViVmlld0Jhc2VGcm9tQWxs b2NhdGlvbihXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UKICAgICAgICAgZ3RrX3dpZGdl dF9zaXplX2FsbG9jYXRlKHByaXYtPmF1dGhlbnRpY2F0aW9uRGlhbG9nLCAmY2hpbGRBbGxvY2F0 aW9uKTsKICAgICB9CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisjaWYgVVNFKFRFWFRV UkVfTUFQUEVSX0dMKSAmJiBQTEFURk9STShYMTEpCiAgICAgaWYgKHNpemVDaGFuZ2VkICYmIHdl YlZpZXdCYXNlLT5wcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAgICAgICB3ZWJWaWV3QmFzZS0+ cHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+cmVzaXplKHZpZXdSZWN0LnNpemUoKSk7CiAjZW5kaWYK QEAgLTk2Miw3ICs5NjYsNyBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVXBkYXRlUHJlZmVyZW5j ZXMoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQogewogICAgIFdlYktpdFdl YlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2OwogCi0jaWYg VVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExB VEZPUk0oWDExKQogICAgIGlmIChwcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAgICAgICByZXR1 cm47CiAjZW5kaWYKQEAgLTk4Nyw3ICs5OTEsNyBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ3Jl YXRlV2ViUGFnZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIFdlYkNvbgog ICAgIHByaXYtPnBhZ2VQcm94eSA9IGNvbnRleHQtPmNyZWF0ZVdlYlBhZ2UoKnByaXYtPnBhZ2VD bGllbnQsIFdURjo6bW92ZSh3ZWJQYWdlQ29uZmlndXJhdGlvbikpOwogICAgIHByaXYtPnBhZ2VQ cm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkK KyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkKICAgICBpZiAocHJp di0+cmVkaXJlY3RlZFdpbmRvdykKICAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5zZXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nV2luZG93SWQocHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+d2luZG93SWQo KSk7CiAjZW5kaWYKQEAgLTExMjksNyArMTEzMyw3IEBAIEdka0V2ZW50KiB3ZWJraXRXZWJWaWV3 QmFzZVRha2VDb250ZXh0TWVudUV2ZW50KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3 CiAgICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5jb250ZXh0TWVudUV2ZW50LnJl bGVhc2UoKTsKIH0KIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyNpZiBVU0UoVEVYVFVS RV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKFgxMSkKIHZvaWQgcmVkaXJlY3RlZFdpbmRvd0RhbWFn ZWRDYWxsYmFjayh2b2lkKiBkYXRhKQogewogICAgIGd0a193aWRnZXRfcXVldWVfZHJhdyhHVEtf V0lER0VUKGRhdGEpKTsK