Title: [129450] trunk/Source
- Revision
- 129450
- Author
- [email protected]
- Date
- 2012-09-24 20:55:25 -0700 (Mon, 24 Sep 2012)
Log Message
Source/WebCore: [GTK][EFL] Remove cairo prefix from include statements
https://bugs.webkit.org/show_bug.cgi?id=97509
Patch by Laszlo Gombos <[email protected]> on 2012-09-24
Reviewed by Gyuyoung Kim.
Make the build system consistent by always assuming that directory
that includes the cairo headers is included in the include path.
No new tests as there is no new functionality.
* platform/cairo/WidgetBackingStoreCairo.cpp:
* platform/gtk/GtkWidgetBackingStoreX11.cpp:
* plugins/gtk/PluginViewGtk.cpp:
Source/WebKit2: [GTK][EFL] Remove cairo prefix from include statements
https://bugs.webkit.org/show_bug.cgi?id=97509
Patch by Laszlo Gombos <[email protected]> on 2012-09-24
Reviewed by Gyuyoung Kim.
Make the build system consistent by always assuming that directory
that includes the cairo headers is included in the include path.
* UIProcess/cairo/BackingStoreCairo.cpp:
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129449 => 129450)
--- trunk/Source/WebCore/ChangeLog 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebCore/ChangeLog 2012-09-25 03:55:25 UTC (rev 129450)
@@ -1,3 +1,19 @@
+2012-09-24 Laszlo Gombos <[email protected]>
+
+ [GTK][EFL] Remove cairo prefix from include statements
+ https://bugs.webkit.org/show_bug.cgi?id=97509
+
+ Reviewed by Gyuyoung Kim.
+
+ Make the build system consistent by always assuming that directory
+ that includes the cairo headers is included in the include path.
+
+ No new tests as there is no new functionality.
+
+ * platform/cairo/WidgetBackingStoreCairo.cpp:
+ * platform/gtk/GtkWidgetBackingStoreX11.cpp:
+ * plugins/gtk/PluginViewGtk.cpp:
+
2012-09-24 Yoshifumi Inoue <[email protected]>
Document::adoptNode for multiple fields time input UI should not crash
Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp (129449 => 129450)
--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp 2012-09-25 03:55:25 UTC (rev 129450)
@@ -22,7 +22,7 @@
#include "CairoUtilities.h"
#include "RefPtrCairo.h"
-#include <cairo/cairo.h>
+#include <cairo.h>
#if PLATFORM(GTK)
#include "GtkVersioning.h"
Modified: trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp (129449 => 129450)
--- trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp 2012-09-25 03:55:25 UTC (rev 129450)
@@ -22,8 +22,8 @@
#include "GtkVersioning.h"
#include "RefPtrCairo.h"
#include <X11/Xlib.h>
-#include <cairo/cairo-xlib.h>
-#include <cairo/cairo.h>
+#include <cairo-xlib.h>
+#include <cairo.h>
#include <gdk/gdkx.h>
namespace WebCore {
Modified: trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp (129449 => 129450)
--- trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-09-25 03:55:25 UTC (rev 129450)
@@ -76,7 +76,7 @@
#define Bool int // this got undefined somewhere
#define Status int // ditto
#include <X11/extensions/Xrender.h>
-#include <cairo/cairo-xlib.h>
+#include <cairo-xlib.h>
#include <gdk/gdkx.h>
using JSC::ExecState;
Modified: trunk/Source/WebKit2/ChangeLog (129449 => 129450)
--- trunk/Source/WebKit2/ChangeLog 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-25 03:55:25 UTC (rev 129450)
@@ -1,3 +1,16 @@
+2012-09-24 Laszlo Gombos <[email protected]>
+
+ [GTK][EFL] Remove cairo prefix from include statements
+ https://bugs.webkit.org/show_bug.cgi?id=97509
+
+ Reviewed by Gyuyoung Kim.
+
+ Make the build system consistent by always assuming that directory
+ that includes the cairo headers is included in the include path.
+
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+
2012-09-24 Sheriff Bot <[email protected]>
Unreviewed, rolling out r129388.
Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (129449 => 129450)
--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2012-09-25 03:55:25 UTC (rev 129450)
@@ -31,7 +31,7 @@
#include "UpdateInfo.h"
#include "WebPageProxy.h"
#include <WebCore/GraphicsContext.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
#if PLATFORM(EFL)
#include "ewk_view_private.h"
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (129449 => 129450)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-09-25 03:53:12 UTC (rev 129449)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-09-25 03:55:25 UTC (rev 129450)
@@ -39,7 +39,7 @@
#elif PLATFORM(GTK)
#include "PlatformContextCairo.h"
#include "RefPtrCairo.h"
-#include <cairo/cairo-xlib.h>
+#include <cairo-xlib.h>
#include <gtk/gtk.h>
#ifndef GTK_API_VERSION_2
#include <gtk/gtkx.h>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
