Diff
Modified: trunk/Source/WebCore/ChangeLog (152093 => 152094)
--- trunk/Source/WebCore/ChangeLog 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebCore/ChangeLog 2013-06-27 13:31:31 UTC (rev 152094)
@@ -1,3 +1,22 @@
+2013-06-27 Iago Toral Quiroga <ito...@igalia.com>
+
+ Use consistent file names for WidgetBackingStoreGtkX11 class
+ https://bugs.webkit.org/show_bug.cgi?id=118124
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.list.am:
+ * PlatformGTK.cmake:
+ * platform/gtk/GtkWidgetBackingStoreX11.cpp: Removed.
+ * platform/gtk/GtkWidgetBackingStoreX11.h: Removed.
+ * platform/gtk/WidgetBackingStoreGtkX11.cpp: Added.
+ (WebCore::WidgetBackingStoreGtkX11::create):
+ (WebCore::WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11):
+ (WebCore::WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11):
+ (WebCore::WidgetBackingStoreGtkX11::cairoSurface):
+ (WebCore::WidgetBackingStoreGtkX11::scroll):
+ * platform/gtk/WidgetBackingStoreGtkX11.h: Added.
+
2013-06-27 Zoltan Arvai <zar...@inf.u-szeged.hu>
Buildfix for !ENABLE(SVG) builds.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (152093 => 152094)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-06-27 13:31:31 UTC (rev 152094)
@@ -6269,8 +6269,8 @@
Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
Source/WebCore/plugins/gtk/xembed.h
platformgtk_sources += \
- Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h \
- Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
+ Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h \
+ Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp \
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
if USE_OPENGL
Modified: trunk/Source/WebCore/PlatformGTK.cmake (152093 => 152094)
--- trunk/Source/WebCore/PlatformGTK.cmake 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-06-27 13:31:31 UTC (rev 152094)
@@ -78,7 +78,6 @@
platform/gtk/GtkPopupMenu.cpp
platform/gtk/GtkUtilities.cpp
platform/gtk/GtkVersioning.c
- platform/gtk/GtkWidgetBackingStoreX11.cpp
platform/gtk/KeyBindingTranslator.cpp
platform/gtk/LanguageGtk.cpp
platform/gtk/LocalizedStringsGtk.cpp
@@ -108,6 +107,7 @@
platform/gtk/TemporaryLinkStubs.cpp
platform/gtk/UserAgentGtk.cpp
platform/gtk/WebKitAuthenticationWidget.cpp
+ platform/gtk/WidgetBackingStoreGtkX11.cpp
platform/gtk/WidgetGtk.cpp
platform/gtk/WidgetRenderingContext.cpp
Deleted: trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp (152093 => 152094)
--- trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp 2013-06-27 13:31:31 UTC (rev 152094)
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2011, 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
- */
-
-#include "config.h"
-#include "GtkWidgetBackingStoreX11.h"
-
-#include "GtkVersioning.h"
-#include "RefPtrCairo.h"
-#include <cairo-xlib.h>
-#include <cairo.h>
-#include <gdk/gdkx.h>
-
-namespace WebCore {
-
-PassOwnPtr<WidgetBackingStore> WidgetBackingStoreGtkX11::create(GtkWidget* widget, const IntSize& size)
-{
- return adoptPtr(new WidgetBackingStoreGtkX11(widget, 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()));
-}
-
-WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11()
-{
- XFreePixmap(m_display, m_pixmap);
- XFreeGC(m_display, m_gc);
-}
-
-cairo_surface_t* WidgetBackingStoreGtkX11::cairoSurface()
-{
- return m_surface.get();
-}
-
-void WidgetBackingStoreGtkX11::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
-{
- IntRect targetRect(scrollRect);
- targetRect.move(scrollOffset);
- targetRect.intersect(scrollRect);
- if (targetRect.isEmpty())
- return;
-
- 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_surface.get(),
- targetRect.x(), targetRect.y(),
- targetRect.width(), targetRect.height());
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h (152093 => 152094)
--- trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h 2013-06-27 13:31:31 UTC (rev 152094)
@@ -1,46 +0,0 @@
-/*
- * 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
Copied: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (from rev 152093, trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp) (0 => 152094)
--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (rev 0)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp 2013-06-27 13:31:31 UTC (rev 152094)
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2011, 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
+ */
+
+#include "config.h"
+#include "WidgetBackingStoreGtkX11.h"
+
+#include "GtkVersioning.h"
+#include "RefPtrCairo.h"
+#include <cairo-xlib.h>
+#include <cairo.h>
+#include <gdk/gdkx.h>
+
+namespace WebCore {
+
+PassOwnPtr<WidgetBackingStore> WidgetBackingStoreGtkX11::create(GtkWidget* widget, const IntSize& size)
+{
+ return adoptPtr(new WidgetBackingStoreGtkX11(widget, 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()));
+}
+
+WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11()
+{
+ XFreePixmap(m_display, m_pixmap);
+ XFreeGC(m_display, m_gc);
+}
+
+cairo_surface_t* WidgetBackingStoreGtkX11::cairoSurface()
+{
+ return m_surface.get();
+}
+
+void WidgetBackingStoreGtkX11::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
+{
+ IntRect targetRect(scrollRect);
+ targetRect.move(scrollOffset);
+ targetRect.intersect(scrollRect);
+ if (targetRect.isEmpty())
+ return;
+
+ 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_surface.get(),
+ targetRect.x(), targetRect.y(),
+ targetRect.width(), targetRect.height());
+}
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (from rev 152093, trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h) (0 => 152094)
--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (rev 0)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2013-06-27 13:31:31 UTC (rev 152094)
@@ -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 WidgetBackingStoreGtkX11_h
+#define WidgetBackingStoreGtkX11_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 (152093 => 152094)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-06-27 13:31:31 UTC (rev 152094)
@@ -1,3 +1,12 @@
+2013-06-27 Iago Toral Quiroga <ito...@igalia.com>
+
+ Use consistent file names for WidgetBackingStoreGtkX11 class
+ https://bugs.webkit.org/show_bug.cgi?id=118124
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+
2013-06-21 Christophe Dumez <ch.du...@sisa.samsung.com>
REGRESSION (r150663): Using webkitAudioContext in Inspector makes it undefined everywhere
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (152093 => 152094)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-06-27 13:31:31 UTC (rev 152094)
@@ -96,7 +96,7 @@
#endif
#ifdef GDK_WINDOWING_X11
-#include "GtkWidgetBackingStoreX11.h"
+#include "WidgetBackingStoreGtkX11.h"
#endif
#include "WidgetBackingStoreCairo.h"
Modified: trunk/Source/WebKit2/ChangeLog (152093 => 152094)
--- trunk/Source/WebKit2/ChangeLog 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-27 13:31:31 UTC (rev 152094)
@@ -1,3 +1,12 @@
+2013-06-27 Iago Toral Quiroga <ito...@igalia.com>
+
+ Use consistent file names for WidgetBackingStoreGtkX11 class
+ https://bugs.webkit.org/show_bug.cgi?id=118124
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+
2013-06-27 Alberto Garcia <agar...@igalia.com>
[GTK] [WK2] Check value of WEBKIT_INJECTED_BUNDLE_PATH
Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (152093 => 152094)
--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2013-06-27 12:46:38 UTC (rev 152093)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2013-06-27 13:31:31 UTC (rev 152094)
@@ -35,7 +35,7 @@
#include <cairo.h>
#if PLATFORM(GTK) && defined(GDK_WINDOWING_X11)
-#include <WebCore/GtkWidgetBackingStoreX11.h>
+#include <WebCore/WidgetBackingStoreGtkX11.h>
#include <gdk/gdkx.h>
#endif
