120762 2013-09-05 02:05:15 -0700 [WK2] [GTK] Remove the test to disable AC under Wayland from WebKitWebViewGroup 2013-09-05 10:09:21 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto berto cgarcia commit-queue gustavo mrobinson oldest_to_newest 924931 0 berto 2013-09-05 02:05:15 -0700 We recently added code to disable accelerated compositing under Wayland (bug 120347). However that code is located in WebKitWebViewGroup, which is not used by WebKitTestRunner. One option would be to move it to webkitWebViewBaseUpdatePreferences(). But I think it would be better to just disable AC in all cases unless we actually support it, something like: #if USE(TEXTURE_MAPPER_GL) if (priv->redirectedWindow) return; #endif setAcceleratedCompositingEnabled(false); 924936 1 210590 berto 2013-09-05 02:12:02 -0700 Created attachment 210590 Patch 924937 2 commit-queue 2013-09-05 02:14:50 -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 925042 3 210590 gustavo 2013-09-05 08:27:14 -0700 Comment on attachment 210590 Patch Makes sense to me. It's a bit weird conceptually that we set a pagegroup-wide policy in each view, but it seems to be the most practical way of handling this issue, and we were already doing that anyway. 925092 4 berto 2013-09-05 10:09:21 -0700 Committed r155125: <http://trac.webkit.org/changeset/155125> 210590 2013-09-05 02:12:02 -0700 2013-09-05 08:27:13 -0700 Patch 120762.diff text/plain 3178 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlM2YzZjc4Li5lMjA3YzA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTMtMDktMDUgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KKworICAg ICAgICBbV0syXSBbR1RLXSBSZW1vdmUgdGhlIHRlc3QgdG8gZGlzYWJsZSBBQyB1bmRlciBXYXls YW5kIGZyb20gV2ViS2l0V2ViVmlld0dyb3VwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA3NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgY29kZSB0byBkaXNhYmxlIEFDIHVuZGVyIFdheWxhbmQg aXMgbm90IHJ1biBpZiB3ZSdyZSB1c2luZworICAgICAgICBXZWJLaXRUZXN0UnVubmVyLCBzbyBp dCB3b3VsZCBiZSBiZXR0ZXIgdG8gbW92ZSBpdCB0bworICAgICAgICBXZWJLaXRXZWJWaWV3QmFz ZS4KKworICAgICAgICBIb3dldmVyIGl0J3Mgbm90IHJlYWxseSBuZWNlc3NhcnkgdG8gZG8gdGhh dCwgaW5zdGVhZCBpdCdzIG11Y2gKKyAgICAgICAgc2ltcGxlciB0byBkaXNhYmxlIGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIGluIGFsbCBjYXNlcyB1bmxlc3Mgd2UKKyAgICAgICAga25vdyB3ZSBj YW4gc3VwcG9ydCBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVXBkYXRlUHJlZmVyZW5jZXMp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHcm91cC5jcHA6Cisg ICAgICAgICh3ZWJraXRXZWJWaWV3R3JvdXBBdHRhY2hTZXR0aW5nc1RvUGFnZUdyb3VwKToKKwog MjAxMy0wOS0wNCAgQWxiZXJ0byBHYXJjaWEgIDxiZXJ0b0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFtXSzJdW0dUS10gQVNTRVJUSU9OIGluIFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6aW52YWxp ZGF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwCmluZGV4IGJkYzhkNWYuLjFiNmI5NDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAg LTg5NiwxMiArODk2LDE0IEBAIFdlYlBhZ2VQcm94eSogd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdl KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIAogdm9pZCB3ZWJraXRXZWJW aWV3QmFzZVVwZGF0ZVByZWZlcmVuY2VzKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3 QmFzZSkKIHsKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCiAgICAgV2ViS2l0V2ViVmlld0Jh c2VQcml2YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2UtPnByaXY7CiAKLSAgICBpZiAoIXBy aXYtPnJlZGlyZWN0ZWRXaW5kb3cpCi0gICAgICAgIHByaXYtPnBhZ2VQcm94eS0+cGFnZUdyb3Vw KCktPnByZWZlcmVuY2VzKCktPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKGZhbHNl KTsKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRX aW5kb3cpCisgICAgICAgIHJldHVybjsKICNlbmRpZgorCisgICAgcHJpdi0+cGFnZVByb3h5LT5w YWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQoZmFsc2UpOwogfQogCiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJL aXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIFdlYkNvbnRleHQqIGNvbnRleHQsIFdl YlBhZ2VHcm91cCogcGFnZUdyb3VwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0dyb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHcm91cC5jcHAKaW5kZXggMjI5YzViYi4uOTk4YzVj MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0dyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3R3JvdXAuY3BwCkBAIC0yOCwxMCArMjgsNiBAQAogI2luY2x1ZGUgPHd0Zi9nb2Jq ZWN0L0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKLSNpZmRlZiBH REtfV0lORE9XSU5HX1dBWUxBTkQKLSNpbmNsdWRlIDxnZGsvZ2Rrd2F5bGFuZC5oPgotI2VuZGlm Ci0KIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIC8qKgpAQCAtMTMwLDEyICsxMjYsNiBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfZ3JvdXBfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3 R3JvdXBDbGFzcyogaGl0VGVzdFJlcwogc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0dyb3VwQXR0 YWNoU2V0dGluZ3NUb1BhZ2VHcm91cChXZWJLaXRXZWJWaWV3R3JvdXAqIGdyb3VwKQogewogICAg IGdyb3VwLT5wcml2LT5wYWdlR3JvdXAtPnNldFByZWZlcmVuY2VzKHdlYmtpdFNldHRpbmdzR2V0 UHJlZmVyZW5jZXMoZ3JvdXAtPnByaXYtPnNldHRpbmdzLmdldCgpKSk7Ci0KLSNpZmRlZiBHREtf V0lORE9XSU5HX1dBWUxBTkQKLSAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3BsYXlf bWFuYWdlcl9nZXRfZGVmYXVsdF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFnZXJfZ2V0KCkpOwot ICAgIGlmIChHREtfSVNfV0FZTEFORF9ESVNQTEFZKGRpc3BsYXkpKQotICAgICAgICBncm91cC0+ cHJpdi0+cGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5n RW5hYmxlZChmYWxzZSk7Ci0jZW5kaWYKIH0KIAogV2ViS2l0V2ViVmlld0dyb3VwKiB3ZWJraXRX ZWJWaWV3R3JvdXBDcmVhdGUoV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXApCg==