Changeset 152094 in webkit

Timestamp:

Jun 27, 2013 6:31:31 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Use consistent file names for WidgetBackingStoreGtkX11 class
​https://bugs.webkit.org/show_bug.cgi?id=118124

Patch by Iago Toral Quiroga <​itoral@igalia.com> on 2013-06-27
Reviewed by Carlos Garcia Campos.

Source/WebCore:

• 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.

Source/WebKit/gtk:

• WebCoreSupport/ChromeClientGtk.cpp:

Source/WebKit2:

• UIProcess/cairo/BackingStoreCairo.cpp:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.list.am (modified) (1 diff)
• WebCore/PlatformGTK.cmake (modified) (2 diffs)
• WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (moved) (moved from trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp) (2 diffs)
• WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (moved) (moved from trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.h) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Iago Toral Quiroga  <itoral@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  <zarvai@inf.u-szeged.hu>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -6270 +6270 @@
         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

trunk/Source/WebCore/PlatformGTK.cmake

@@ -79 +79 @@
     platform/gtk/GtkUtilities.cpp
     platform/gtk/GtkVersioning.c
-    platform/gtk/GtkWidgetBackingStoreX11.cpp
     platform/gtk/KeyBindingTranslator.cpp
     platform/gtk/LanguageGtk.cpp
@@ -109 +108 @@
     platform/gtk/UserAgentGtk.cpp
     platform/gtk/WebKitAuthenticationWidget.cpp
+    platform/gtk/WidgetBackingStoreGtkX11.cpp
     platform/gtk/WidgetGtk.cpp
     platform/gtk/WidgetRenderingContext.cpp

trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp

@@ -18 +18 @@
 
 #include "config.h"
-#include "GtkWidgetBackingStoreX11.h"
+#include "WidgetBackingStoreGtkX11.h"
 
 #include "GtkVersioning.h"
@@ -71 +71 @@
     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());
+        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());
+        targetRect.x(), targetRect.y(),
+        targetRect.width(), targetRect.height());
 }
 

trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h

@@ -17 +17 @@
  */
 
-#ifndef GtkWidgetBackingStoreX11_h
-#define GtkWidgetBackingStoreX11_h
+#ifndef WidgetBackingStoreGtkX11_h
+#define WidgetBackingStoreGtkX11_h
 
 #include "WidgetBackingStore.h"

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-06-27  Iago Toral Quiroga  <itoral@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.dumez@sisa.samsung.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -97 +97 @@
 
 #ifdef GDK_WINDOWING_X11
-#include "GtkWidgetBackingStoreX11.h"
+#include "WidgetBackingStoreGtkX11.h"
 #endif
 #include "WidgetBackingStoreCairo.h"

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-27  Iago Toral Quiroga  <itoral@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  <agarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp

@@ -36 +36 @@
 
 #if PLATFORM(GTK) && defined(GDK_WINDOWING_X11)
-#include <WebCore/GtkWidgetBackingStoreX11.h>
+#include <WebCore/WidgetBackingStoreGtkX11.h>
 #include <gdk/gdkx.h>
 #endif