Title: [151398] trunk/Source
Revision
151398
Author
[email protected]
Date
2013-06-10 12:06:15 -0700 (Mon, 10 Jun 2013)

Log Message

Use Cairo implementation of the WidgetBackingStore instead of X11 when running on Wayland
https://bugs.webkit.org/show_bug.cgi?id=116717

Patch by Iago Toral Quiroga <[email protected]> on 2013-06-10
Reviewed by Martin Robinson.

Source/WebCore:

Refactored WidgetBackingStore to be an abstract base class and make
GtkWidgetBackingStoreX11 and WidgetBackingStoreCairo inherit from it.
GtkWidgetBackingStoreX11 renamed to WidgetBackingStoreGtkX11.

* GNUmakefile.list.am:
* platform/cairo/WidgetBackingStore.h:
(WebCore):
(WidgetBackingStore):
(WebCore::WidgetBackingStore::WidgetBackingStore):
(WebCore::WidgetBackingStore::~WidgetBackingStore):
* platform/cairo/WidgetBackingStoreCairo.cpp:
(WebCore::WidgetBackingStoreCairo::create):
(WebCore):
(WebCore::WidgetBackingStoreCairo::WidgetBackingStoreCairo):
(WebCore::WidgetBackingStoreCairo::~WidgetBackingStoreCairo):
(WebCore::WidgetBackingStoreCairo::cairoSurface):
(WebCore::WidgetBackingStoreCairo::scroll):
* platform/cairo/WidgetBackingStoreCairo.h: Added.
(WebCore):
(WidgetBackingStoreCairo):
* platform/gtk/GtkWidgetBackingStoreX11.cpp:
(WebCore::WidgetBackingStoreGtkX11::create):
(WebCore):
(WebCore::WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11):
(WebCore::WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11):
(WebCore::WidgetBackingStoreGtkX11::cairoSurface):
(WebCore::WidgetBackingStoreGtkX11::scroll):
* platform/gtk/GtkWidgetBackingStoreX11.h: Added.
(WebCore):
(WidgetBackingStoreGtkX11):

Source/WebKit/gtk:

Decide which implementation of WidgetBackingStore to use (X11 or Cairo)
depending on whether we are running on X11 or not. Select Cairo
implementation when not running in X11.

* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::createBackingStore):
(WebKit):
(WebKit::ChromeClient::widgetSizeChanged):
(WebKit::ChromeClient::attachRootGraphicsLayer):

Source/WebKit2:

Decide which implementation of WidgetBackingStore to use (X11 or Cairo)
depending on whether we are running on X11 or not. Select Cairo
implementation when not running in X11.

* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit):
(WebKit::createBackingStoreForGTK):
(WebKit::BackingStore::incorporateUpdate):

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151397 => 151398)


--- trunk/Source/WebCore/ChangeLog	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebCore/ChangeLog	2013-06-10 19:06:15 UTC (rev 151398)
@@ -1,3 +1,41 @@
+2013-06-10  Iago Toral Quiroga  <[email protected]>
+
+        Use Cairo implementation of the WidgetBackingStore instead of X11 when running on Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=116717
+
+        Reviewed by Martin Robinson.
+
+        Refactored WidgetBackingStore to be an abstract base class and make
+        GtkWidgetBackingStoreX11 and WidgetBackingStoreCairo inherit from it.
+        GtkWidgetBackingStoreX11 renamed to WidgetBackingStoreGtkX11.
+
+        * GNUmakefile.list.am:
+        * platform/cairo/WidgetBackingStore.h:
+        (WebCore):
+        (WidgetBackingStore):
+        (WebCore::WidgetBackingStore::WidgetBackingStore):
+        (WebCore::WidgetBackingStore::~WidgetBackingStore):
+        * platform/cairo/WidgetBackingStoreCairo.cpp:
+        (WebCore::WidgetBackingStoreCairo::create):
+        (WebCore):
+        (WebCore::WidgetBackingStoreCairo::WidgetBackingStoreCairo):
+        (WebCore::WidgetBackingStoreCairo::~WidgetBackingStoreCairo):
+        (WebCore::WidgetBackingStoreCairo::cairoSurface):
+        (WebCore::WidgetBackingStoreCairo::scroll):
+        * platform/cairo/WidgetBackingStoreCairo.h: Added.
+        (WebCore):
+        (WidgetBackingStoreCairo):
+        * platform/gtk/GtkWidgetBackingStoreX11.cpp:
+        (WebCore::WidgetBackingStoreGtkX11::create):
+        (WebCore):
+        (WebCore::WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11):
+        (WebCore::WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11):
+        (WebCore::WidgetBackingStoreGtkX11::cairoSurface):
+        (WebCore::WidgetBackingStoreGtkX11::scroll):
+        * platform/gtk/GtkWidgetBackingStoreX11.h: Added.
+        (WebCore):
+        (WidgetBackingStoreGtkX11):
+
 2013-06-10  Otto Derek Cheung  <[email protected]>
 
         [BlackBerry] Store ParsedCookies as RefPtrs instead of PassRefPtrs in CookieDatabaseBackingStore

Modified: trunk/Source/WebCore/GNUmakefile.list.am (151397 => 151398)


--- trunk/Source/WebCore/GNUmakefile.list.am	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2013-06-10 19:06:15 UTC (rev 151398)
@@ -6267,7 +6267,10 @@
 	Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
 	Source/WebCore/plugins/gtk/xembed.h
 platformgtk_sources += \
-	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp
+	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h \
+	Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
 if USE_OPENGL
 webcoregtk_sources += \
 	Source/WebCore/platform/graphics/cairo/GLContext.cpp \
@@ -6308,6 +6311,7 @@
 	Source/WebCore/plugins/win/PluginPackageWin.cpp
 webcoregtk_sources += \
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
 	Source/WebCore/plugins/win/PluginViewWin.cpp
 else
 webcore_sources += \

Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h (151397 => 151398)


--- trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h	2013-06-10 19:06:15 UTC (rev 151398)
@@ -35,8 +35,6 @@
 
 namespace WebCore {
 
-class WidgetBackingStorePrivate;
-
 #if PLATFORM(GTK)
 typedef GtkWidget* PlatformWidget;
 #elif PLATFORM(EFL)
@@ -48,17 +46,13 @@
     WTF_MAKE_FAST_ALLOCATED;
 
 public:
-    static PassOwnPtr<WidgetBackingStore> create(PlatformWidget, const IntSize&);
-
-    ~WidgetBackingStore();
-    cairo_surface_t* cairoSurface();
-    void scroll(const IntRect& scrollRect, const IntSize& scrollOffset);
+    virtual cairo_surface_t* cairoSurface() = 0;
+    virtual void scroll(const IntRect& scrollRect, const IntSize& scrollOffset) = 0;
     const IntSize& size() { return m_size; }
+    WidgetBackingStore(const IntSize& size) : m_size(size) { }
+    virtual ~WidgetBackingStore() { }
 
 private:
-    WidgetBackingStore(PlatformWidget, const IntSize&);
-
-    OwnPtr<WidgetBackingStorePrivate> m_private;
     IntSize m_size;
 };
 

Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp (151397 => 151398)


--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp	2013-06-10 19:06:15 UTC (rev 151398)
@@ -18,16 +18,12 @@
  */
 
 #include "config.h"
-#include "WidgetBackingStore.h"
+#include "WidgetBackingStoreCairo.h"
 
 #include "CairoUtilities.h"
 #include "RefPtrCairo.h"
 #include <cairo.h>
 
-#if PLATFORM(GTK)
-#include "GtkVersioning.h"
-#endif
-
 namespace WebCore {
 
 static PassRefPtr<cairo_surface_t> createSurfaceForBackingStore(PlatformWidget widget, const IntSize& size)
@@ -40,51 +36,32 @@
 #endif
 }
 
-class WidgetBackingStorePrivate {
-    WTF_MAKE_NONCOPYABLE(WidgetBackingStorePrivate);
-    WTF_MAKE_FAST_ALLOCATED;
-
-public:
-    RefPtr<cairo_surface_t> m_surface;
-    RefPtr<cairo_surface_t> m_scrollSurface;
-
-    static PassOwnPtr<WidgetBackingStorePrivate> create(PlatformWidget widget, const IntSize& size)
-    {
-        return adoptPtr(new WidgetBackingStorePrivate(widget, size));
-    }
-
-private:
-    // We keep two copies of the surface here, which will double the memory usage, but increase
-    // scrolling performance since we do not have to keep reallocating a memory region during
-    // quick scrolling requests.
-    WidgetBackingStorePrivate(PlatformWidget widget, const IntSize& size)
-        : m_surface(createSurfaceForBackingStore(widget, size))
-        , m_scrollSurface(createSurfaceForBackingStore(widget, size))
-    {
-    }
-};
-
-PassOwnPtr<WidgetBackingStore> WidgetBackingStore::create(PlatformWidget widget, const IntSize& size)
+PassOwnPtr<WidgetBackingStore> WidgetBackingStoreCairo::create(PlatformWidget widget, const IntSize& size)
 {
-    return adoptPtr(new WidgetBackingStore(widget, size));
+    return adoptPtr(new WidgetBackingStoreCairo(widget, size));
 }
 
-WidgetBackingStore::WidgetBackingStore(PlatformWidget widget, const IntSize& size)
-    : m_private(WidgetBackingStorePrivate::create(widget, size))
-    , m_size(size)
+// We keep two copies of the surface here, which will double the memory usage, but increase
+// scrolling performance since we do not have to keep reallocating a memory region during
+// quick scrolling requests.
+WidgetBackingStoreCairo::WidgetBackingStoreCairo(PlatformWidget widget, const IntSize& size)
+    : WidgetBackingStore(size)
+    , m_surface(createSurfaceForBackingStore(widget, size))
+    , m_scrollSurface(createSurfaceForBackingStore(widget, size))
+
 {
 }
 
-WidgetBackingStore::~WidgetBackingStore()
+WidgetBackingStoreCairo::~WidgetBackingStoreCairo()
 {
 }
 
-cairo_surface_t* WidgetBackingStore::cairoSurface()
+cairo_surface_t* WidgetBackingStoreCairo::cairoSurface()
 {
-    return m_private->m_surface.get();
+    return m_surface.get();
 }
 
-void WidgetBackingStore::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
+void WidgetBackingStoreCairo::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
 {
     IntRect targetRect(scrollRect);
     targetRect.move(scrollOffset);
@@ -93,9 +70,9 @@
     if (targetRect.isEmpty())
         return;
 
-    copyRectFromOneSurfaceToAnother(m_private->m_surface.get(), m_private->m_scrollSurface.get(),
+    copyRectFromOneSurfaceToAnother(m_surface.get(), m_scrollSurface.get(),
                                     scrollOffset, targetRect);
-    copyRectFromOneSurfaceToAnother(m_private->m_scrollSurface.get(), m_private->m_surface.get(),
+    copyRectFromOneSurfaceToAnother(m_scrollSurface.get(), m_surface.get(),
                                     IntSize(), targetRect);
 }
 

Copied: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h (from rev 151397, trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h) (0 => 151398)


--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h	                        (rev 0)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h	2013-06-10 19:06:15 UTC (rev 151398)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013, Igalia S.L.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef WidgetBackingStoreCairo_h
+#define WidgetBackingStoreCairo_h
+
+#include "WidgetBackingStore.h"
+
+namespace WebCore {
+
+class WidgetBackingStoreCairo : public WidgetBackingStore {
+
+public:
+    static PassOwnPtr<WidgetBackingStore> create(PlatformWidget, const IntSize&);
+    WidgetBackingStoreCairo(PlatformWidget, const IntSize&);
+    ~WidgetBackingStoreCairo();
+    cairo_surface_t* cairoSurface();
+    void scroll(const IntRect&, const IntSize&);
+
+private:
+    RefPtr<cairo_surface_t> m_surface;
+    RefPtr<cairo_surface_t> m_scrollSurface;
+};
+
+} // namespace WebCore
+
+#endif // WidgetBackingStoreCairo_h

Modified: trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp (151397 => 151398)


--- trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp	2013-06-10 19:06:15 UTC (rev 151398)
@@ -17,80 +17,50 @@
  */
 
 #include "config.h"
-#include "WidgetBackingStore.h"
+#include "GtkWidgetBackingStoreX11.h"
 
 #include "GtkVersioning.h"
 #include "RefPtrCairo.h"
-#include <X11/Xlib.h>
 #include <cairo-xlib.h>
 #include <cairo.h>
 #include <gdk/gdkx.h>
 
 namespace WebCore {
 
-class WidgetBackingStorePrivate {
-    WTF_MAKE_NONCOPYABLE(WidgetBackingStorePrivate);
-    WTF_MAKE_FAST_ALLOCATED;
-
-public:
-    Display* m_display;
-    Pixmap m_pixmap;
-    GC m_gc;
-    RefPtr<cairo_surface_t> m_surface;
-
-    static PassOwnPtr<WidgetBackingStorePrivate> create(GtkWidget* widget, const IntSize& size)
-    {
-        return adoptPtr(new WidgetBackingStorePrivate(widget, size));
-    }
-
-    ~WidgetBackingStorePrivate()
-    {
-        XFreePixmap(m_display, m_pixmap);
-        XFreeGC(m_display, m_gc);
-    }
-
-private:
-    // We keep two copies of the surface here, which will double the memory usage, but increase
-    // scrolling performance since we do not have to keep reallocating a memory region during
-    // quick scrolling requests.
-    WidgetBackingStorePrivate(GtkWidget* widget, const IntSize& size)
-    {
-        GdkVisual* visual = gtk_widget_get_visual(widget);
-        GdkScreen* screen = gdk_visual_get_screen(visual);
-        m_display = GDK_SCREEN_XDISPLAY(screen);
-        m_pixmap = XCreatePixmap(m_display,
-                                 GDK_WINDOW_XID(gdk_screen_get_root_window(screen)),
-                                 size.width(), size.height(),
-                                 gdk_visual_get_depth(visual));
-        m_gc = XCreateGC(m_display, m_pixmap, 0, 0);
-
-        m_surface = adoptRef(cairo_xlib_surface_create(m_display, m_pixmap,
-                                                       GDK_VISUAL_XVISUAL(visual),
-                                                       size.width(), size.height()));
-    }
-};
-
-PassOwnPtr<WidgetBackingStore> WidgetBackingStore::create(GtkWidget* widget, const IntSize& size)
+PassOwnPtr<WidgetBackingStore> WidgetBackingStoreGtkX11::create(GtkWidget* widget, const IntSize& size)
 {
-    return adoptPtr(new WidgetBackingStore(widget, size));
+    return adoptPtr(new WidgetBackingStoreGtkX11(widget, size));
 }
 
-WidgetBackingStore::WidgetBackingStore(GtkWidget* widget, const IntSize& size)
-    : m_private(WidgetBackingStorePrivate::create(widget, size))
-    , m_size(size)
+// We keep two copies of the surface here, which will double the memory usage, but increase
+// scrolling performance since we do not have to keep reallocating a memory region during
+// quick scrolling requests.
+WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11(GtkWidget* widget, const IntSize& size)
+    : WidgetBackingStore(size)
 {
+    GdkVisual* visual = gtk_widget_get_visual(widget);
+    GdkScreen* screen = gdk_visual_get_screen(visual);
+    m_display = GDK_SCREEN_XDISPLAY(screen);
+    m_pixmap = XCreatePixmap(m_display, GDK_WINDOW_XID(gdk_screen_get_root_window(screen)),
+        size.width(), size.height(), gdk_visual_get_depth(visual));
+    m_gc = XCreateGC(m_display, m_pixmap, 0, 0);
+
+    m_surface = adoptRef(cairo_xlib_surface_create(m_display, m_pixmap,
+        GDK_VISUAL_XVISUAL(visual), size.width(), size.height()));
 }
 
-WidgetBackingStore::~WidgetBackingStore()
+WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11()
 {
+    XFreePixmap(m_display, m_pixmap);
+    XFreeGC(m_display, m_gc);
 }
 
-cairo_surface_t* WidgetBackingStore::cairoSurface()
+cairo_surface_t* WidgetBackingStoreGtkX11::cairoSurface()
 {
-    return m_private->m_surface.get();
+    return m_surface.get();
 }
 
-void WidgetBackingStore::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
+void WidgetBackingStoreGtkX11::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
 {
     IntRect targetRect(scrollRect);
     targetRect.move(scrollOffset);
@@ -98,12 +68,12 @@
     if (targetRect.isEmpty())
         return;
 
-    cairo_surface_flush(m_private->m_surface.get());
-    XCopyArea(m_private->m_display, m_private->m_pixmap, m_private->m_pixmap, m_private->m_gc, 
+    cairo_surface_flush(m_surface.get());
+    XCopyArea(m_display, m_pixmap, m_pixmap, m_gc, 
               targetRect.x() - scrollOffset.width(), targetRect.y() - scrollOffset.height(),
               targetRect.width(), targetRect.height(),
               targetRect.x(), targetRect.y());
-    cairo_surface_mark_dirty_rectangle(m_private->m_surface.get(),
+    cairo_surface_mark_dirty_rectangle(m_surface.get(),
                                        targetRect.x(), targetRect.y(),
                                        targetRect.width(), targetRect.height());
 }

Copied: trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h (from rev 151397, trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h) (0 => 151398)


--- trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h	                        (rev 0)
+++ trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h	2013-06-10 19:06:15 UTC (rev 151398)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013, Igalia S.L.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef GtkWidgetBackingStoreX11_h
+#define GtkWidgetBackingStoreX11_h
+
+#include "WidgetBackingStore.h"
+
+#include <X11/Xlib.h>
+
+namespace WebCore {
+
+class WidgetBackingStoreGtkX11 : public WidgetBackingStore {
+
+public:
+    static PassOwnPtr<WidgetBackingStore> create(GtkWidget*, const IntSize&);
+    WidgetBackingStoreGtkX11(GtkWidget*, const IntSize&);
+    ~WidgetBackingStoreGtkX11();
+    cairo_surface_t* cairoSurface();
+    void scroll(const IntRect& scrollRect, const IntSize& scrollOffset);
+
+private:
+    Display* m_display;
+    Pixmap m_pixmap;
+    GC m_gc;
+    RefPtr<cairo_surface_t> m_surface;
+};
+
+} // namespace WebCore
+
+#endif // GtkWidgetBackingStoreX11_h

Modified: trunk/Source/WebKit/gtk/ChangeLog (151397 => 151398)


--- trunk/Source/WebKit/gtk/ChangeLog	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-06-10 19:06:15 UTC (rev 151398)
@@ -1,3 +1,20 @@
+2013-06-10  Iago Toral Quiroga  <[email protected]>
+
+        Use Cairo implementation of the WidgetBackingStore instead of X11 when running on Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=116717
+
+        Reviewed by Martin Robinson.
+
+        Decide which implementation of WidgetBackingStore to use (X11 or Cairo)
+        depending on whether we are running on X11 or not. Select Cairo
+        implementation when not running in X11.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::createBackingStore):
+        (WebKit):
+        (WebKit::ChromeClient::widgetSizeChanged):
+        (WebKit::ChromeClient::attachRootGraphicsLayer):
+
 2013-06-06  Diego Pino Garcia  <[email protected]>
 
         [GTK] Parameter 'refChild' from function 'webkit_dom_node_insert_before' should be allowed to be NULL

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (151397 => 151398)


--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp	2013-06-10 19:06:15 UTC (rev 151398)
@@ -75,6 +75,18 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
+#ifdef GDK_WINDOWING_X11
+#define Font XFont
+#define Cursor XCursor
+#define Region XRegion
+#include <gdk/gdkx.h>
+#undef Font
+#undef Cursor
+#undef Region
+#undef None
+#undef Status
+#endif
+
 #if ENABLE(SQL_DATABASE)
 #include "DatabaseManager.h"
 #endif
@@ -83,10 +95,25 @@
 #include "HTMLMediaElement.h"
 #endif
 
+#ifdef GDK_WINDOWING_X11
+#include "GtkWidgetBackingStoreX11.h"
+#endif
+#include "WidgetBackingStoreCairo.h"
+
 using namespace WebCore;
 
 namespace WebKit {
 
+static OwnPtr<WidgetBackingStore> createBackingStore(GtkWidget* widget, const IntSize& size)
+{
+#ifdef GDK_WINDOWING_X11
+    GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+    if (GDK_IS_X11_DISPLAY(display))
+        return WebCore::WidgetBackingStoreGtkX11::create(widget, size);
+#endif
+    return WebCore::WidgetBackingStoreCairo::create(widget, size);
+}
+
 ChromeClient::ChromeClient(WebKitWebView* webView)
     : m_webView(webView)
     , m_adjustmentWatcher(webView)
@@ -455,8 +482,7 @@
         || newSize.width() > backingStore->size().width()
         || newSize.height() > backingStore->size().height()) {
 
-        OwnPtr<WidgetBackingStore> newBackingStore =
-            WebCore::WidgetBackingStore::create(GTK_WIDGET(m_webView), newSize);
+        OwnPtr<WidgetBackingStore> newBackingStore = createBackingStore(GTK_WIDGET(m_webView), newSize);
         RefPtr<cairo_t> cr = adoptRef(cairo_create(newBackingStore->cairoSurface()));
 
         clearEverywhereInBackingStore(m_webView, cr.get());
@@ -1043,11 +1069,11 @@
 
     if (turningOnCompositing) {
         m_displayTimer.stop();
-        m_webView->priv->backingStore = WebCore::WidgetBackingStore::create(GTK_WIDGET(m_webView), IntSize(1, 1));
+        m_webView->priv->backingStore = createBackingStore(GTK_WIDGET(m_webView), IntSize(1, 1));
     }
 
     if (turningOffCompositing) {
-        m_webView->priv->backingStore = WebCore::WidgetBackingStore::create(GTK_WIDGET(m_webView), getWebViewRect(m_webView).size());
+        m_webView->priv->backingStore = createBackingStore(GTK_WIDGET(m_webView), getWebViewRect(m_webView).size());
         RefPtr<cairo_t> cr = adoptRef(cairo_create(m_webView->priv->backingStore->cairoSurface()));
         clearEverywhereInBackingStore(m_webView, cr.get());
     }

Modified: trunk/Source/WebKit2/ChangeLog (151397 => 151398)


--- trunk/Source/WebKit2/ChangeLog	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebKit2/ChangeLog	2013-06-10 19:06:15 UTC (rev 151398)
@@ -1,3 +1,19 @@
+2013-06-10  Iago Toral Quiroga  <[email protected]>
+
+        Use Cairo implementation of the WidgetBackingStore instead of X11 when running on Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=116717
+
+        Reviewed by Martin Robinson.
+
+        Decide which implementation of WidgetBackingStore to use (X11 or Cairo)
+        depending on whether we are running on X11 or not. Select Cairo
+        implementation when not running in X11.
+
+        * UIProcess/cairo/BackingStoreCairo.cpp:
+        (WebKit):
+        (WebKit::createBackingStoreForGTK):
+        (WebKit::BackingStore::incorporateUpdate):
+
 2013-06-09  Jae Hyun Park  <[email protected]>
 
         [CoordinatedGraphics] Typo in argument decoder for CoordinatedGraphicsState

Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (151397 => 151398)


--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp	2013-06-10 17:45:42 UTC (rev 151397)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp	2013-06-10 19:06:15 UTC (rev 151398)
@@ -31,8 +31,14 @@
 #include "UpdateInfo.h"
 #include "WebPageProxy.h"
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/WidgetBackingStoreCairo.h>
 #include <cairo.h>
 
+#if PLATFORM(GTK) && defined(GDK_WINDOWING_X11)
+#include <WebCore/GtkWidgetBackingStoreX11.h>
+#include <gdk/gdkx.h>
+#endif
+
 #if PLATFORM(EFL)
 #include "EwkView.h"
 #endif
@@ -41,6 +47,18 @@
 
 namespace WebKit {
 
+#if PLATFORM(GTK)
+static OwnPtr<WidgetBackingStore> createBackingStoreForGTK(GtkWidget* widget, const IntSize& size)
+{
+#ifdef GDK_WINDOWING_X11
+    GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+    if (GDK_IS_X11_DISPLAY(display))
+        return WebCore::WidgetBackingStoreGtkX11::create(widget, size);
+#endif
+    return WebCore::WidgetBackingStoreCairo::create(widget, size);
+}
+#endif
+
 void BackingStore::paint(cairo_t* context, const IntRect& rect)
 {
     ASSERT(m_backingStore);
@@ -55,9 +73,9 @@
 {
     if (!m_backingStore)
 #if PLATFORM(EFL)
-        m_backingStore = WidgetBackingStore::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size());
+        m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size());
 #else
-        m_backingStore = WidgetBackingStore::create(m_webPageProxy->viewWidget(), size());
+        m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size());
 #endif
 
     scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to