120321 2013-08-26 11:27:43 -0700 [GTK][WK2] Only set up a RedirectedXCompositeWindow if running under an X11 display 2013-09-02 05:18:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cgarcia commit-queue gustavo mrobinson oldest_to_newest 921103 0 zan 2013-08-26 11:27:43 -0700 [GTK][WK2] Only set up a RedirectedXCompositeWindow if running under an X11 display 921106 1 209667 zan 2013-08-26 11:34:50 -0700 Created attachment 209667 Patch 921107 2 commit-queue 2013-08-26 11:37:09 -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 921131 3 209667 gustavo 2013-08-26 12:41:10 -0700 Comment on attachment 209667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209667&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:60 > +#ifdef GDK_WINDOWING_X11 I've been pondering that we should probably have a macro that tests that both PLATFORM(X11) and GDK_WINDOWING_X11 are present for these, what do you think? > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:387 > + GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); > + if (GDK_IS_X11_DISPLAY(display)) { > + priv->redirectedWindow = RedirectedXCompositeWindow::create(IntSize(1, 1), RedirectedXCompositeWindow::DoNotCreateGLContext); > + if (priv->redirectedWindow) > + priv->redirectedWindow->setDamageNotifyCallback(redirectedWindowDamagedCallback, object); > + } Need the preprocessor check here as well. 921372 4 209667 zan 2013-08-27 01:38:47 -0700 Comment on attachment 209667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209667&action=review >> Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:60 >> +#ifdef GDK_WINDOWING_X11 > > I've been pondering that we should probably have a macro that tests that both PLATFORM(X11) and GDK_WINDOWING_X11 are present for these, what do you think? I think we could test for PLATFORM(X11) instead of GDK_WINDOWING_X11 if we explicitly test for gdk-x11-3.0.pc when building for the X11 target. I believe that finding the gdk-x11 package indirectly assures that GDK_WINDOWING_X11 is defined, though we can add additional checks for this in the configuration step. I'd rather be using PLATFORM(X11) than GDK_WINDOWING_X11 simply because it's more WebKit-like. I know that PLATFORM(X11) is also applicable to other ports, but the `#ifdef GDK_WINDOWING_X11` checks are still GTK-specific, so using PLATFORM(X11) in their place shouldn't break anything. Similar would apply for GDK_WINDOWING_WAYLAND and PLATFORM(WAYLAND). 921392 5 zan 2013-08-27 02:17:04 -0700 This patch enables running UIProcesses under Wayland even when building with accelerated compositing enabled - before, the process would assert due to an invalid cast from GdkWaylandDisplay to GdkX11Display. The accelerated compositing is enabled by default in WK2 though, so page rendering under Wayland goes wrong whenever it switches to the accelerated compositing mode. To avoid that, I'm at the moment disabling accelerated compositing under Wayland displays in webkitWebViewGroupAttachSettingsToPageGroup. Is that feasible/sane? It works, and it's needed, but it's kind of a dirty hack. Bug #120347 has the patch. 921896 6 zan 2013-08-28 02:44:08 -0700 Committed r154729: <http://trac.webkit.org/changeset/154729> 923664 7 gustavo 2013-09-02 05:18:10 -0700 (In reply to comment #4) > I think we could test for PLATFORM(X11) instead of GDK_WINDOWING_X11 if we explicitly test for gdk-x11-3.0.pc when building for the X11 target. I believe that finding the gdk-x11 package indirectly assures that GDK_WINDOWING_X11 is defined, though we can add additional checks for this in the configuration step. > I think that would be better, I'm thinking about a flying-cars future where X is disabled and only wayland is enabled, though. I guess we can cross that bridge when we get to it, anyway. 209667 2013-08-26 11:34:50 -0700 2013-08-27 01:38:46 -0700 Patch bug-120321-20130826113450.patch text/plain 3173 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjEyNmUxZTNmZmVhYzUy YTFmMTU0N2UzOTA3ZmQ5NzcyYTI0OTkzMy4uMThhZjNlMzNhODI0M2ZiYmM2OTFlOTRmMzMwNWFh NDU0MTAzNDExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA4LTI2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXSzJdIE9u bHkgc2V0IHVwIGEgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgaWYgcnVubmluZyB1bmRlciBh biBYMTEgZGlzcGxheQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTIwMzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT25seSBzZXQgdXAgdGhlIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93IG1lbWJlciBv ZiB0aGUgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlIHN0cnVjdAorICAgICAgICBpZiB3ZSdyZSBy dW5uaW5nIHVuZGVyIGFuIFgxMSBkaXNwbGF5LiBUaGlzIGlzIG5vdyBkb25lIGluIHRoZSB3ZWJr aXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkCisgICAgICAgIGZ1bmN0aW9uIHJhdGhlciB0aGFuIHRo ZSBjb25zdHJ1Y3Rvciwgd2hpY2ggaXMgcmVtb3ZlZC4KKworICAgICAgICBUaGlzIGFsbG93cyBm b3IgdGhlIFVJUHJvY2VzcyB0byBydW4gaW4gYSBXYXlsYW5kIGVudmlyb25tZW50IGV2ZW4gd2hl biBidWlsdCB3aXRoIGFjY2VsZXJhdGVkCisgICAgICAgIGNvbXBvc2l0aW5nIGVuYWJsZWQuIE9m IGNvdXJzZSwgYXQgdGhlIG1vbWVudCB0aGVyZSdzIG5vIHN1cHBvcnQgeWV0IGZvciBhY2NlbGVy YXRlZCBjb21wb3NpdGluZworICAgICAgICB1bmRlciBXYXlsYW5kLCBzbyB3ZSBmYWxsIGJhY2sg dG8gcmVuZGVyaW5nIHRoZSBiYWNraW5nIHN0b3JlLiBObyBjaGFuZ2VzIGFyZSBpbnRyb2R1Y2Vk IHRvCisgICAgICAgIHRoZSBiZWhhdmlvciB1bmRlciBYMTEgLSBhY2NlbGVyYXRlZCBjb21wb3Np dGluZyB3aWxsIGJlIHVzZWQgd2hlcmUgcG9zc2libGUsIGlmIHN1cHBvcnRlZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl YmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQpOgorCiAyMDEzLTA4LTI2ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgbWlzc2lu ZyBpbml0aWFsaXplciBmb3IgcGx1Z2luTG9hZFBvbGljeSBpbiBXS1BhZ2VMb2FkZXJDbGllbnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcAppbmRleCBhNDE0OTIwYjEwMTY2M2RhZDJiYzk4MGM1ODM4NDU0NWM5ODAwMzli Li45MjM0ZmE5Y2ZkZjNjNmYyZWEyODEyMjBiNTQ1YWJhY2JhY2Y5Yjg2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3Bw CkBAIC01Nyw2ICs1Nyw5IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4KICNpbmNsdWRl IDxnZGsvZ2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KKyNpZmRlZiBHREtfV0lO RE9XSU5HX1gxMQorI2luY2x1ZGUgPGdkay9nZGt4Lmg+CisjZW5kaWYKICNpbmNsdWRlIDx3dGYv SGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KICNpbmNsdWRlIDx3 dGYvZ29iamVjdC9HUmVmUHRyLmg+CkBAIC04MCwxMyArODMsNiBAQCB2b2lkIHJlZGlyZWN0ZWRX aW5kb3dEYW1hZ2VkQ2FsbGJhY2sodm9pZCogZGF0YSk7CiAjZW5kaWYKIAogc3RydWN0IF9XZWJL aXRXZWJWaWV3QmFzZVByaXZhdGUgewotICAgIF9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUoKQot I2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKLSAgICAgICAgOiByZWRpcmVjdGVkV2luZG93KFJl ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93OjpjcmVhdGUoSW50U2l6ZSgxLCAxKSwgUmVkaXJlY3Rl ZFhDb21wb3NpdGVXaW5kb3c6OkRvTm90Q3JlYXRlR0xDb250ZXh0KSkKLSNlbmRpZgotICAgIHsK LSAgICB9Ci0KICAgICB+X1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSgpCiAgICAgewogICAgICAg ICBwYWdlUHJveHktPmNsb3NlKCk7CkBAIC0zODMsOCArMzc5LDEyIEBAIHN0YXRpYyB2b2lkIHdl YmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIHByaXYtPmRy YWdBbmREcm9wSGVscGVyLnNldFdpZGdldCh2aWV3V2lkZ2V0KTsKIAogI2lmIFVTRShURVhUVVJF X01BUFBFUl9HTCkKLSAgICBpZiAocHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKLSAgICAgICAgcHJp di0+cmVkaXJlY3RlZFdpbmRvdy0+c2V0RGFtYWdlTm90aWZ5Q2FsbGJhY2socmVkaXJlY3RlZFdp bmRvd0RhbWFnZWRDYWxsYmFjaywgb2JqZWN0KTsKKyAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0g Z2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXRfZGVmYXVsdF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFn ZXJfZ2V0KCkpOworICAgIGlmIChHREtfSVNfWDExX0RJU1BMQVkoZGlzcGxheSkpIHsKKyAgICAg ICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdyA9IFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93Ojpj cmVhdGUoSW50U2l6ZSgxLCAxKSwgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OkRvTm90Q3Jl YXRlR0xDb250ZXh0KTsKKyAgICAgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cpCisgICAg ICAgICAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5zZXREYW1hZ2VOb3RpZnlDYWxsYmFjayhy ZWRpcmVjdGVkV2luZG93RGFtYWdlZENhbGxiYWNrLCBvYmplY3QpOworICAgIH0KICNlbmRpZgog CiAgICAgcHJpdi0+YXV0aGVudGljYXRpb25EaWFsb2cgPSAwOwo=