[GTK] Build fix for Accelerated Compositing with OpenGL
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jun 2012 07:29:35 +0000 (07:29 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jun 2012 07:29:35 +0000 (07:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=88292

Patch by Joone Hur <joone.hur@intel.com> on 2012-06-06
Reviewed by Martin Robinson.

Build fix after r119247.
Do not include GraphicsSurface.h when not building
with GRAPHICS_SURFACE.

No new tests. This is only a build fix.

* platform/graphics/texmap/TextureMapperBackingStore.cpp:
* platform/graphics/texmap/TextureMapperBackingStore.h:
* platform/graphics/texmap/TextureMapperGL.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@119567 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h
Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

index ed44710..ace5096 100644 (file)
@@ -1,3 +1,20 @@
+2012-06-06  Joone Hur  <joone.hur@intel.com>
+
+        [GTK] Build fix for Accelerated Compositing with OpenGL
+        https://bugs.webkit.org/show_bug.cgi?id=88292
+
+        Reviewed by Martin Robinson.
+
+        Build fix after r119247.
+        Do not include GraphicsSurface.h when not building
+        with GRAPHICS_SURFACE.
+
+        No new tests. This is only a build fix.
+
+        * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperBackingStore.h:
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+
 2012-06-05  Joe Thomas  <joethomas@motorola.com>
 
         ASSERTION FAILED: ASSERT(!isPercentageIntrinsicSize) in RenderReplaced::computeIntrinsicRatioInformationForRenderBox
index 0ea3360..b03be0a 100644 (file)
 #include "TextureMapperBackingStore.h"
 
 #include "GraphicsLayer.h"
-#include "GraphicsSurface.h"
 #include "ImageBuffer.h"
 #include "TextureMapper.h"
 
 #if USE(GRAPHICS_SURFACE)
+#include "GraphicsSurface.h"
 #include "TextureMapperGL.h"
 #endif
 
index 691cc9a..95abe53 100644 (file)
 #define TextureMapperBackingStore_h
 
 #include "FloatRect.h"
-#include "GraphicsSurface.h"
 #include "Image.h"
 #include "TextureMapper.h"
 #include "TextureMapperPlatformLayer.h"
-
 #include <wtf/RefPtr.h>
 
+#if USE(GRAPHICS_SURFACE)
+#include "GraphicsSurface.h"
+#endif
+
 namespace WebCore {
 
 class GraphicsLayer;
index e27a6da..658de48 100644 (file)
@@ -21,7 +21,6 @@
 #include "TextureMapperGL.h"
 
 #include "GraphicsContext.h"
-#include "GraphicsSurface.h"
 #include "Image.h"
 #include "TextureMapperShaderManager.h"
 #include "Timer.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
+#if USE(GRAPHICS_SURFACE)
+#include "GraphicsSurface.h"
+#endif
+
 #if PLATFORM(QT)
 #if QT_VERSION >= 0x050000
 #include <QOpenGLContext>