Changeset 106873 in webkit

Timestamp:

Feb 6, 2012 4:38:43 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebGL conformance test misc/functions-returning-strings.html fails
​https://bugs.webkit.org/show_bug.cgi?id=77149

Source/WebCore:

Make sure that WebGL methods returning strings don't return null when
they run successfully.

Patch by Ehsan Akhgari <​ehsan.akhgari@gmail.com> on 2012-02-06
Reviewed by Kenneth Russell.

Test: fast/canvas/webgl/functions-returning-strings.html

• html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::getProgramInfoLog):
(WebCore::WebGLRenderingContext::getShaderInfoLog):
(WebCore::WebGLRenderingContext::getShaderSource):
(WebCore::WebGLRenderingContext::ensureNotNull):

• html/canvas/WebGLRenderingContext.h:

(WebGLRenderingContext):

LayoutTests:

Imported the WebGL conformance test related to this.

Patch by Ehsan Akhgari <​ehsan.akhgari@gmail.com> on 2012-02-06
Reviewed by Kenneth Russell.

• fast/canvas/webgl/functions-returning-strings-expected.txt: Added.
• fast/canvas/webgl/functions-returning-strings.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/functions-returning-strings-expected.txt (added)
• LayoutTests/fast/canvas/webgl/functions-returning-strings.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (4 diffs)
• Source/WebCore/html/canvas/WebGLRenderingContext.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  Ehsan Akhgari  <ehsan.akhgari@gmail.com>
+
+        WebGL conformance test misc/functions-returning-strings.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=77149
+
+        Imported the WebGL conformance test related to this.
+
+        Reviewed by Kenneth Russell.
+
+        * fast/canvas/webgl/functions-returning-strings-expected.txt: Added.
+        * fast/canvas/webgl/functions-returning-strings.html: Added.
+
 2012-02-06  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Ehsan Akhgari  <ehsan.akhgari@gmail.com>
+
+        WebGL conformance test misc/functions-returning-strings.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=77149
+
+        Make sure that WebGL methods returning strings don't return null when
+        they run successfully.
+
+        Reviewed by Kenneth Russell.
+
+        Test: fast/canvas/webgl/functions-returning-strings.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::getProgramInfoLog):
+        (WebCore::WebGLRenderingContext::getShaderInfoLog):
+        (WebCore::WebGLRenderingContext::getShaderSource):
+        (WebCore::WebGLRenderingContext::ensureNotNull):
+        * html/canvas/WebGLRenderingContext.h:
+        (WebGLRenderingContext):
+
 2012-02-06  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -2514 +2514 @@
         return "";
     WebGLStateRestorer(this, false);
-    return m_context->getProgramInfoLog(objectOrZero(program));
+    return ensureNotNull(m_context->getProgramInfoLog(objectOrZero(program)));
 }
 
@@ -2614 +2614 @@
         return "";
     WebGLStateRestorer(this, false);
-    return m_context->getShaderInfoLog(objectOrZero(shader));
+    return ensureNotNull(m_context->getShaderInfoLog(objectOrZero(shader)));
 }
 
@@ -2624 +2624 @@
     if (!validateWebGLObject("getShaderSource", shader))
         return "";
-    return shader->getSource();
+    return ensureNotNull(shader->getSource());
 }
 
@@ -5124 +5124 @@
 }
 
+String WebGLRenderingContext::ensureNotNull(const String& text) const
+{
+    if (text.isNull())
+        return WTF::emptyString();
+    return text;
+}
+
 WebGLRenderingContext::LRUImageBufferCache::LRUImageBufferCache(int capacity)
     : m_buffers(adoptArrayPtr(new OwnPtr<ImageBuffer>[capacity]))

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h

@@ -663 +663 @@
     void synthesizeGLError(GC3Denum, const char* functionName, const char* description);
 
+    String ensureNotNull(const String&) const;
+
     friend class WebGLStateRestorer;
 };