[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1a53b359e200d7b7ef6a742d71759225a1c8202d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 01:23:39 2010 +0000

    2010-10-12  Alok priyadarshi  <alokp at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            Remove support for ANGLE SH_VERSION <= 100
            https://bugs.webkit.org/show_bug.cgi?id=47307
    
            * src/WebGraphicsContext3DDefaultImpl.cpp:
            (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers):
            (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index cbd7bfa..835577c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-12  Alok priyadarshi  <alokp at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Remove support for ANGLE SH_VERSION <= 100
+        https://bugs.webkit.org/show_bug.cgi?id=47307
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers):
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource):
+
 2010-10-12  James Robinson  <jamesr at chromium.org>
 
         Unreviewed chromium compile fixes for http://trac.webkit.org/changeset/69619.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 4ff76fc..12d43fd 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -1478,13 +1478,8 @@ bool WebGraphicsContext3DDefaultImpl::angleCreateCompilers()
     if (!ShInitialize())
         return false;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     ShBuiltInResources resources;
     ShInitBuiltInResources(&resources);
-#else
-    TBuiltInResource resources;
-    ShInitBuiltInResource(&resources);
-#endif // SH_VERSION
     getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs);
     getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors);
     getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors);
@@ -1495,13 +1490,8 @@ bool WebGraphicsContext3DDefaultImpl::angleCreateCompilers()
     // Always set to 1 for OpenGL ES.
     resources.MaxDrawBuffers = 1;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_WEBGL_SPEC, &resources);
     m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, SH_WEBGL_SPEC, &resources);
-#else
-    m_fragmentCompiler = ShConstructCompiler(EShLangFragment, EShSpecWebGL, &resources);
-    m_vertexCompiler = ShConstructCompiler(EShLangVertex, EShSpecWebGL, &resources);
-#endif // SH_VERSION
     return (m_fragmentCompiler && m_vertexCompiler);
 }
 
@@ -1541,11 +1531,7 @@ bool WebGraphicsContext3DDefaultImpl::angleValidateShaderSource(ShaderSourceEntr
     if (!compiler)
         return false;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     if (!ShCompile(compiler, &entry.source, 1, SH_OBJECT_CODE)) {
-#else
-    if (!ShCompile(compiler, &entry.source, 1, EShOptObjectCode)) {
-#endif // SH_VERSION
         int logSize = 0;
         ShGetInfo(compiler, SH_INFO_LOG_LENGTH, &logSize);
         if (logSize > 1 && tryFastMalloc(logSize * sizeof(char)).getValue(entry.log))

-- 
WebKit Debian packaging