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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 92b3b45c2e95edf2647ece58e8b25c6d0a9aeb83
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 03:09:41 2010 +0000

    2010-11-10  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            [chromium] Clean up gfx::GetGLImplementation calls in WebGraphicsContext3DDefaultImpl
            https://bugs.webkit.org/show_bug.cgi?id=49336
    
            * src/WebGraphicsContext3DDefaultImpl.cpp:
            (WebKit::WebGraphicsContext3DDefaultImpl::initialize):
            (WebKit::WebGraphicsContext3DDefaultImpl::reshape):
            (WebKit::WebGraphicsContext3DDefaultImpl::readBackFramebuffer):
            (WebKit::WebGraphicsContext3DDefaultImpl::getIntegerv):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7c462ea..bf07f67 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-10  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Clean up gfx::GetGLImplementation calls in WebGraphicsContext3DDefaultImpl
+        https://bugs.webkit.org/show_bug.cgi?id=49336
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::initialize):
+        (WebKit::WebGraphicsContext3DDefaultImpl::reshape):
+        (WebKit::WebGraphicsContext3DDefaultImpl::readBackFramebuffer):
+        (WebKit::WebGraphicsContext3DDefaultImpl::getIntegerv):
+
 2010-11-10  Evan Stade  <estade at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 0e26ae9..c164104 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -170,7 +170,9 @@ bool WebGraphicsContext3DDefaultImpl::initialize(WebGraphicsContext3D::Attribute
 
     validateAttributes();
 
-    if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
+    m_isGLES2 = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
+
+    if (m_isGLES2) {
         glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
         glEnable(GL_POINT_SPRITE);
     }
@@ -183,7 +185,6 @@ bool WebGraphicsContext3DDefaultImpl::initialize(WebGraphicsContext3D::Attribute
     glGenFramebuffersEXT(1, &m_copyTextureToParentTextureFBO);
 
     m_initialized = true;
-    m_isGLES2 = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
     return true;
 }
 
@@ -360,7 +361,7 @@ void WebGraphicsContext3DDefaultImpl::reshape(int width, int height)
         if (m_attributes.stencil && m_attributes.depth)
             internalDepthStencilFormat = GL_DEPTH24_STENCIL8_EXT;
         else {
-            if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2)
+            if (m_isGLES2)
                 internalDepthStencilFormat = GL_DEPTH_COMPONENT16;
             else
                 internalDepthStencilFormat = GL_DEPTH_COMPONENT;
@@ -540,7 +541,7 @@ bool WebGraphicsContext3DDefaultImpl::readBackFramebuffer(unsigned char* pixels,
         mustRestorePackAlignment = true;
     }
 
-    if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) {
+    if (m_isGLES2) {
         // FIXME: consider testing for presence of GL_OES_read_format
         // and GL_EXT_read_format_bgra, and using GL_BGRA_EXT here
         // directly.
@@ -990,7 +991,7 @@ void WebGraphicsContext3DDefaultImpl::getFramebufferAttachmentParameteriv(unsign
 void WebGraphicsContext3DDefaultImpl::getIntegerv(unsigned long pname, int* value)
 {
     makeContextCurrent();
-    if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) {
+    if (m_isGLES2) {
         glGetIntegerv(pname, value);
         return;
     }

-- 
WebKit Debian packaging