[CherryPick] [WEBGL] Rename WEBKIT_WEBGL_compressed_texture_s3tc to WEBGL_compressed_...

[Title]  [WEBGL] Rename WEBKIT_WEBGL_compressed_texture_s3tc to WEBGL_compressed_texture_s3tc
[Problem] N/A
[Cause] N/A
[Solution] N/A
[Cherry-Picker] Karol Swiniarski

https://bugs.webkit.org/show_bug.cgi?id=108866

Change-Id: I3a273f699fcac4df51ba42b5eb3c2945988d9134

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 80467bd..6f17c1b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2013-02-04 Nayan Kumar K <nayankk@motorola.com>
+
+        [WEBGL] Rename WEBKIT_WEBGL_compressed_texture_s3tc to WEBGL_compressed_texture_s3tc
+        https://bugs.webkit.org/show_bug.cgi?id=108866
+
+        Reviewed by NOBODY (OOPS!).
+
+        WEBGL_compressed_texture_s3tc is one of the community approved WebGL extension.
+        Hence remove the vendor prefix from WEBKIT_WEBGL_compressed_texture_s3tc.
+        Specification: http://www.khronos.org/registry/webgl/extensions/WEBGL_compressed_texture_s3tc/
+
+        No tests currently present to test WEBKIT_WEBGL_compressed_texture_s3tc.
+
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        (WebCore::toJS):
+        * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
+        (WebCore::toV8Object):
+        * html/canvas/WebGLCompressedTextureS3TC.cpp:
+        (WebCore::WebGLCompressedTextureS3TC::getName):
+        * html/canvas/WebGLExtension.h:
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::getExtension):
+
 2013-02-01 Nayan Kumar K <nayankk@motorola.com>
 
         [WEBGL] Rename WEBKIT_WEBGL_lose_context to WEBGL_lose_context.

diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
index 60f6e64..c8592e1 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -204,7 +204,7 @@ static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, WebGLExten
         return toJS(exec, globalObject, static_cast<WebGLDebugRendererInfo*>(extension));
     case WebGLExtension::WebGLDebugShadersName:
         return toJS(exec, globalObject, static_cast<WebGLDebugShaders*>(extension));
-    case WebGLExtension::WebKitWebGLCompressedTextureS3TCName:
+    case WebGLExtension::WebGLCompressedTextureS3TCName:
         return toJS(exec, globalObject, static_cast<WebGLCompressedTextureS3TC*>(extension));
     case WebGLExtension::WebKitWebGLDepthTextureName:
         return toJS(exec, globalObject, static_cast<WebGLDepthTexture*>(extension));

diff --git a/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
index a3d7a92..05d2cc4 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
@@ -201,9 +201,9 @@ static v8::Handle<v8::Value> toV8Object(WebGLExtension* extension, v8::Handle<v8
         extensionObject = toV8(static_cast<WebGLDebugShaders*>(extension), isolate);
         referenceName = "webGLDebugShadersName";
         break;
-    case WebGLExtension::WebKitWebGLCompressedTextureS3TCName:
+    case WebGLExtension::WebGLCompressedTextureS3TCName:
         extensionObject = toV8(static_cast<WebGLCompressedTextureS3TC*>(extension), isolate);
-        referenceName = "webKitWebGLCompressedTextureS3TCName";
+        referenceName = "webGLCompressedTextureS3TCName";
         break;
     case WebGLExtension::WebKitWebGLDepthTextureName:
         extensionObject = toV8(static_cast<WebGLDepthTexture*>(extension), isolate);

diff --git a/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp b/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp
index 02357ef..1877bd5 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp
+++ b/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp
@@ -52,7 +52,7 @@ WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC()
 
 WebGLExtension::ExtensionName WebGLCompressedTextureS3TC::getName() const
 {
-    return WebKitWebGLCompressedTextureS3TCName;
+    return WebGLCompressedTextureS3TCName;
 }
 
 PassOwnPtr<WebGLCompressedTextureS3TC> WebGLCompressedTextureS3TC::create(WebGLRenderingContext* context)

diff --git a/Source/WebCore/html/canvas/WebGLExtension.h b/Source/WebCore/html/canvas/WebGLExtension.h
index 8dddda6..7032e85 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLExtension.h
+++ b/Source/WebCore/html/canvas/WebGLExtension.h
@@ -41,7 +41,7 @@ public:
         OESVertexArrayObjectName,
         WebGLDebugRendererInfoName,
         WebGLDebugShadersName,
-        WebKitWebGLCompressedTextureS3TCName, // WEBKIT_ prefix until extension is official
+        WebGLCompressedTextureS3TCName,
         WebKitWebGLDepthTextureName, // WEBKIT_ prefix until extension is official
     };
 

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index 06deb23..7e2bf63 100755 (executable)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -2331,8 +2331,7 @@ WebGLExtension* WebGLRenderingContext::getExtension(const String& name)
             m_webglLoseContext = WebGLLoseContext::create(this);
         return m_webglLoseContext.get();
     }
-    if (equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc")) {
-        // Use WEBKIT_ prefix until extension is official.
+    if (equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")) {
         if (!m_webglCompressedTextureS3TC)
             m_webglCompressedTextureS3TC = WebGLCompressedTextureS3TC::create(this);
         return m_webglCompressedTextureS3TC.get();