Title: [182532] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 182532
- Author
- [email protected]
- Date
- 2015-04-08 01:44:18 -0700 (Wed, 08 Apr 2015)
Log Message
Merge r175087 - Do not build WidgetBackingStoreGtkX11 when not used.
<https://webkit.org/b/137972>.
Patch by Milan Crha <[email protected]> on 2014-10-22
Reviewed by Carlos Garcia Campos.
* platform/gtk/WidgetBackingStoreGtkX11.cpp:
* platform/gtk/WidgetBackingStoreGtkX11.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (182531 => 182532)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-08 08:20:01 UTC (rev 182531)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-08 08:44:18 UTC (rev 182532)
@@ -1,3 +1,13 @@
+2014-10-22 Milan Crha <[email protected]>
+
+ Do not build WidgetBackingStoreGtkX11 when not used.
+ <https://webkit.org/b/137972>.
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/gtk/WidgetBackingStoreGtkX11.cpp:
+ * platform/gtk/WidgetBackingStoreGtkX11.h:
+
2014-10-17 Jeffrey Pfau <[email protected]>
Ensure attached frame count doesn't exceed the maximum allowed frames
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (182531 => 182532)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp 2015-04-08 08:20:01 UTC (rev 182531)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp 2015-04-08 08:44:18 UTC (rev 182532)
@@ -19,6 +19,8 @@
#include "config.h"
#include "WidgetBackingStoreGtkX11.h"
+#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
+
#include "GtkVersioning.h"
#include "RefPtrCairo.h"
#include <cairo-xlib.h>
@@ -81,3 +83,5 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (182531 => 182532)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2015-04-08 08:20:01 UTC (rev 182531)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2015-04-08 08:44:18 UTC (rev 182532)
@@ -21,6 +21,7 @@
#include "WidgetBackingStore.h"
+#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
#include <X11/Xlib.h>
namespace WebCore {
@@ -43,4 +44,6 @@
} // namespace WebCore
+#endif // PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
+
#endif // GtkWidgetBackingStoreX11_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
