Changeset 142567 in webkit

Timestamp:

Feb 11, 2013 6:38:54 PM (11 years ago)

Author:

kbr@google.com

Message:

Add temporary typedef to ANGLEWebKitBridge to support incompatible API upgrade
​https://bugs.webkit.org/show_bug.cgi?id=109127

Reviewed by Dean Jackson.

No new tests. Built and tested WebKit and Chromium with this change.

• platform/graphics/ANGLEWebKitBridge.cpp:

(WebCore):

Define temporary typedef spanning int -> size_t change.

(WebCore::getValidationResultValue):
(WebCore::getSymbolInfo):

Use temporary typedef.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ANGLEWebKitBridge.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  Kenneth Russell  <kbr@google.com>
+
+        Add temporary typedef to ANGLEWebKitBridge to support incompatible API upgrade
+        https://bugs.webkit.org/show_bug.cgi?id=109127
+
+        Reviewed by Dean Jackson.
+
+        No new tests. Built and tested WebKit and Chromium with this change.
+
+        * platform/graphics/ANGLEWebKitBridge.cpp:
+        (WebCore):
+            Define temporary typedef spanning int -> size_t change.
+        (WebCore::getValidationResultValue):
+        (WebCore::getSymbolInfo):
+            Use temporary typedef.
+
 2013-02-11  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp

@@ -33 +33 @@
 namespace WebCore {
 
-inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
-{
-    int value = -1;
+// Temporary typedef to support an incompatible change in the ANGLE API.
+#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
+typedef int ANGLEGetInfoType;
+#else
+typedef size_t ANGLEGetInfoType;
+#endif
+
+inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
+{
+    ANGLEGetInfoType value = 0;
     ShGetInfo(compiler, shaderInfo, &value);
     return value;
@@ -56 +63 @@
     }
 
-    int numSymbols = getValidationResultValue(compiler, symbolType);
-    if (numSymbols < 0)
-        return false;
-
-    int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
+    ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType);
+
+    ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
     if (maxNameLength <= 1)
         return false;
 
-    int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
+    ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
     if (maxMappedNameLength <= 1)
         return false;
@@ -72 +77 @@
     Vector<char, 256> mappedNameBuffer(maxMappedNameLength);
     
-    for (int i = 0; i < numSymbols; ++i) {
+    for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {
         ANGLEShaderSymbol symbol;
-        int nameLength = -1;
+        ANGLEGetInfoType nameLength = 0;
         switch (symbolType) {
         case SH_ACTIVE_ATTRIBUTES:
@@ -88 +93 @@
             return false;
         }
-        if (nameLength <= 0)
+        if (!nameLength)
             return false;