Changeset 104192 in webkit

Timestamp:

Jan 5, 2012 12:02:19 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Remove style warning in GraphicsContext3DOpenGL.cpp
​https://bugs.webkit.org/show_bug.cgi?id=75466

Patch by ChangSeok Oh <ChangSeok Oh> on 2012-01-05
Reviewed by Kenneth Russell.

Relocated some headers according to alphabetical order & modified indentation.
And used OwnArrayPtr to deal with character array.

No new tests required.

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::getString):
(WebCore::GraphicsContext3D::releaseShaderCompiler):
(WebCore::GraphicsContext3D::getProgramInfoLog):
(WebCore::GraphicsContext3D::getShaderiv):
(WebCore::GraphicsContext3D::getShaderInfoLog):
(WebCore::GraphicsContext3D::getShaderSource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-05  ChangSeok Oh  <shivamidow@gmail.com>
+
+        Remove style warning in GraphicsContext3DOpenGL.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=75466
+
+        Reviewed by Kenneth Russell.
+
+        Relocated some headers according to alphabetical order & modified indentation.
+        And used OwnArrayPtr to deal with character array.
+
+        No new tests required. 
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getString):
+        (WebCore::GraphicsContext3D::releaseShaderCompiler):
+        (WebCore::GraphicsContext3D::getProgramInfoLog):
+        (WebCore::GraphicsContext3D::getShaderiv):
+        (WebCore::GraphicsContext3D::getShaderInfoLog):
+        (WebCore::GraphicsContext3D::getShaderSource):
+
 2012-01-05  Ken Buchanan <kenrb@chromium.org>
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if PLATFORM(QT)
-#include <QtGlobal>
-#endif
-
 #if ENABLE(WEBGL)
 
 #include "GraphicsContext3D.h"
 
-#include "WebGLObject.h"
 #include "CanvasRenderingContext.h"
 #include "Extensions3DOpenGL.h"
@@ -42 +37 @@
 #include "ImageData.h"
 #include "NotImplemented.h"
+#include "WebGLObject.h"
 #include <cstring>
 #include <wtf/ArrayBuffer.h>
@@ -56 +52 @@
 #include "OpenGLShims.h"
 #elif PLATFORM(QT)
+#include <QtGlobal>
 #include <cairo/OpenGLShims.h>
 #endif
@@ -774 +771 @@
 {
     makeContextCurrent();
-    return String((const char*) ::glGetString(name));
+    return String(reinterpret_cast<const char*>(::glGetString(name)));
 }
 
@@ -888 +885 @@
 void GraphicsContext3D::releaseShaderCompiler()
 {
-    // FIXME: This is not implemented on desktop OpenGL. We need to have ifdefs for the different GL variants
-    makeContextCurrent();
-    //::glReleaseShaderCompiler();
+    // FIXME: This is not implemented on desktop OpenGL. We need to have ifdefs for the different GL variants.
+    makeContextCurrent();
+    notImplemented();
 }
 
@@ -1246 +1243 @@
 
     makeContextCurrent();
-    GLint length;
+    GLint length = 0;
     ::glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length);
     if (!length)
-        return "";
-
-    GLsizei size;
-    GLchar* info = (GLchar*) fastMalloc(length);
-
-    ::glGetProgramInfoLog(program, length, &size, info);
-    String s(info);
-    fastFree(info);
-    return s;
+        return String(); 
+
+    GLsizei size = 0;
+    OwnArrayPtr<GLchar> info = adoptArrayPtr(static_cast<GLchar*>(fastMalloc(length)));
+    ::glGetProgramInfoLog(program, length, &size, info.get());
+
+    return String(info.get());
 }
 
@@ -1275 +1270 @@
     
     switch (pname) {
-        case DELETE_STATUS:
-        case SHADER_TYPE:
-            // Let OpenGL handle these.
-        
-            ::glGetShaderiv(shader, pname, value);
-            break;
-        
-        case COMPILE_STATUS:
-            if (result == m_shaderSourceMap.end()) {
-                (*value) = static_cast<int>(false);
-                return;
-            }
-        
-            (*value) = static_cast<int>(result->second.isValid);
-            break;
-        
-        case INFO_LOG_LENGTH:
-            if (result == m_shaderSourceMap.end()) {
-                (*value) = 0;
-                return;
-            }
-        
-            (*value) = getShaderInfoLog(shader).length();
-            break;
-        
-        case SHADER_SOURCE_LENGTH:
-            (*value) = getShaderSource(shader).length();
-            break;
-        
-        default:
-            synthesizeGLError(INVALID_ENUM);
+    case DELETE_STATUS:
+    case SHADER_TYPE:
+        ::glGetShaderiv(shader, pname, value);
+        break;
+    case COMPILE_STATUS:
+        if (result == m_shaderSourceMap.end()) {
+            *value = static_cast<int>(false);
+            return;
+        }
+        *value = static_cast<int>(result->second.isValid);
+        break;
+    case INFO_LOG_LENGTH:
+        if (result == m_shaderSourceMap.end()) {
+            *value = 0;
+            return;
+        }
+        *value = getShaderInfoLog(shader).length();
+        break;
+    case SHADER_SOURCE_LENGTH:
+        *value = getShaderSource(shader).length();
+        break;
+    default:
+        synthesizeGLError(INVALID_ENUM);
     }
 }
@@ -1316 +1303 @@
 
     HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
-
     if (result == m_shaderSourceMap.end())
-         return "";
-
-     ShaderSourceEntry entry = result->second;
-
-     if (entry.isValid) {
-         GLint length;
-         ::glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
-         if (!length)
-             return "";
-
-         GLsizei size;
-         GLchar* info = (GLchar*) fastMalloc(length);
-
-         ::glGetShaderInfoLog(shader, length, &size, info);
-
-         String s(info);
-         fastFree(info);
-         return s;
-     } else
-         return entry.log;
+        return String(); 
+
+    ShaderSourceEntry entry = result->second;
+    if (!entry.isValid)
+        return entry.log;
+
+    GLint length = 0;
+    ::glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
+    if (!length)
+        return String(); 
+
+    GLsizei size = 0;
+    OwnArrayPtr<GLchar> info = adoptArrayPtr(static_cast<GLchar*>(fastMalloc(length)));
+    ::glGetShaderInfoLog(shader, length, &size, info.get());
+
+    return String(info.get());
 }
 
@@ -1347 +1329 @@
 
     HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
-
     if (result == m_shaderSourceMap.end())
-        return "";
+        return String(); 
 
     return result->second.source;