From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 16:25:10 +0100
Subject: Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
---
 Source/WebCore/platform/graphics/ANGLEWebKitBridge.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'Source/WebCore/platform/graphics/ANGLEWebKitBridge.h')

diff --git a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
index d01de8f..7bddbf4 100644
--- a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
+++ b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
@@ -34,8 +34,8 @@
 namespace WebCore {
 
 enum ANGLEShaderType {
-    SHADER_TYPE_VERTEX = EShLangVertex,
-    SHADER_TYPE_FRAGMENT = EShLangFragment
+    SHADER_TYPE_VERTEX = SH_VERTEX_SHADER,
+    SHADER_TYPE_FRAGMENT = SH_FRAGMENT_SHADER,
 };
 
 class ANGLEWebKitBridge {
@@ -44,18 +44,21 @@ public:
     ANGLEWebKitBridge();
     ~ANGLEWebKitBridge();
     
-    void setResources(TBuiltInResource resources) { m_resources = resources; }
+    ShBuiltInResources getResources() { return m_resources; }
+    void setResources(ShBuiltInResources);
     
     bool validateShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog);
 
 private:
 
-    ShHandle m_fragmentCompiler;
-    ShHandle m_vertexCompiler;
+    void cleanupCompilers();
 
     bool builtCompilers;
+    
+    ShHandle m_fragmentCompiler;
+    ShHandle m_vertexCompiler;
 
-    TBuiltInResource m_resources;
+    ShBuiltInResources m_resources;
 };
 
 } // namespace WebCore
-- 
cgit v1.1