Modified: trunk/Source/WebCore/ChangeLog (151804 => 151805)
--- trunk/Source/WebCore/ChangeLog 2013-06-20 21:28:20 UTC (rev 151804)
+++ trunk/Source/WebCore/ChangeLog 2013-06-20 21:37:10 UTC (rev 151805)
@@ -1,3 +1,17 @@
+2013-06-20 Alex Christensen <achristen...@apple.com>
+
+ Fixed WebGL compile errors on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=117805
+
+ Reviewed by Brent Fulgham.
+
+ * html/canvas/WebGLRenderingContext.cpp: Included CString.h.
+ Added PLATFORM(WIN) to existing lists of platform macros.
+ * platform/graphics/ANGLEWebKitBridge.h:
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::ShaderSourceEntry::symbolMap):
+ * platform/graphics/OpenGLESShims.h:
+
2013-06-20 Simon Fraser <simon.fra...@apple.com>
FrameView needs to initialize paintsEntireContents on creation
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (151804 => 151805)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-06-20 21:28:20 UTC (rev 151804)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-06-20 21:37:10 UTC (rev 151805)
@@ -79,6 +79,7 @@
#include <wtf/PassOwnArrayPtr.h>
#include <wtf/Uint16Array.h>
#include <wtf/Uint32Array.h>
+#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
#if PLATFORM(QT)
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (151804 => 151805)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2013-06-20 21:28:20 UTC (rev 151804)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2013-06-20 21:37:10 UTC (rev 151805)
@@ -29,7 +29,7 @@
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(QT)
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(QT) && !PLATFORM(WIN)
#include "ANGLE/ShaderLang.h"
#else
#include "ShaderLang.h"
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (151804 => 151805)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2013-06-20 21:28:20 UTC (rev 151804)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2013-06-20 21:37:10 UTC (rev 151805)
@@ -47,7 +47,7 @@
#undef VERSION
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
#include "ANGLEWebKitBridge.h"
#endif
@@ -498,7 +498,7 @@
bool makeContextCurrent();
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
// With multisampling on, blit from multisampleFBO to regular FBO.
void prepareTexture();
#endif
@@ -774,7 +774,7 @@
void reshape(int width, int height);
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK) || PLATFORM(EFL) || USE(CAIRO)
void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
int canvasWidth, int canvasHeight, PlatformContextCairo* context);
#elif PLATFORM(QT)
@@ -923,7 +923,7 @@
// Destination data will have no gaps between rows.
static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
// Take into account the user's requested context creation attributes,
// in particular stencil and antialias, and determine which could or
// could not be honored based on the capabilities of the OpenGL
@@ -961,7 +961,7 @@
void* m_context;
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
struct SymbolInfo {
SymbolInfo()
: type(0)
@@ -1002,7 +1002,7 @@
{
}
- ShaderSymbolMap& symbolMap(ANGLEShaderSymbolType symbolType)
+ ShaderSymbolMap& symbolMap(enum ANGLEShaderSymbolType symbolType)
{
ASSERT(symbolType == SHADER_SYMBOL_TYPE_ATTRIBUTE || symbolType == SHADER_SYMBOL_TYPE_UNIFORM);
if (symbolType == SHADER_SYMBOL_TYPE_ATTRIBUTE)
Modified: trunk/Source/WebCore/platform/graphics/OpenGLESShims.h (151804 => 151805)
--- trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2013-06-20 21:28:20 UTC (rev 151804)
+++ trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2013-06-20 21:37:10 UTC (rev 151805)
@@ -26,7 +26,7 @@
#ifndef OpenGLESShims_h
#define OpenGLESShims_h
-#if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
#define glBindFramebufferEXT glBindFramebuffer
#define glFramebufferTexture2DEXT glFramebufferTexture2D
#define glBindRenderbufferEXT glBindRenderbuffer
