[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cmarrin at apple.com
cmarrin at apple.com
Wed Dec 22 12:10:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6ba347e7d1333fe9c09284a081ef04b3d2cde2ed
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 21:21:18 2010 +0000
Put ANGLE include inside PLATFORM(MAC) to fix Chrome and Qt builds
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65450 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index 165f197..016e7a5 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -26,7 +26,9 @@
#ifndef GraphicsContext3D_h
#define GraphicsContext3D_h
+#if PLATFORM(MAC)
#include "ANGLEWebKitBridge.h"
+#endif
#include "GraphicsLayer.h"
#include "PlatformString.h"
@@ -820,9 +822,9 @@ public:
} ShaderSourceEntry;
HashMap<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap;
+#if PLATFORM(MAC)
ANGLEWebKitBridge m_compiler;
-#if PLATFORM(MAC)
Attributes m_attrs;
Vector<Vector<float> > m_vertexArray;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list