[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[agl at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 34be5c4e21722519d75131d63f4b0f4b305d6d26
Author: agl at chromium.org <agl at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 23 01:34:28 2009 +0000

    2009-12-22  Adam Langley  <agl at google.com>
    
            Build fix: not reviewed.
    
            r52504 (https://bugs.webkit.org/show_bug.cgi?id=32845) broke the
            Chromium build on Windows and Mac due to a misplaced #endif. The
            buildbot didn't find the problem because it runs on Linux.
    
            Have verified this patch with the author of the above.
    
            * src/GraphicsContext3D.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 883abd5..9ddeada 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-22  Adam Langley  <agl at google.com>
+
+        Build fix: not reviewed.
+
+        r52504 (https://bugs.webkit.org/show_bug.cgi?id=32845) broke the
+        Chromium build on Windows and Mac due to a misplaced #endif. The
+        buildbot didn't find the problem because it runs on Linux.
+
+        Have verified this patch with the author of the above.
+
+        * src/GraphicsContext3D.cpp:
+
 2009-12-22  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index 557eb98..6440552 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -289,9 +289,9 @@ private:
 };
 
 bool GraphicsContext3DInternal::s_initializedGLEW = false;
+
 #if PLATFORM(LINUX)
 GraphicsContext3DInternal::GLConnection* GraphicsContext3DInternal::s_gl = 0;
-#endif
 
 GraphicsContext3DInternal::GLConnection* GraphicsContext3DInternal::GLConnection::create()
 {
@@ -352,6 +352,8 @@ GraphicsContext3DInternal::GLConnection::~GLConnection()
     dlclose(m_libGL);
 }
 
+#endif  // PLATFORM(LINUX)
+
 GraphicsContext3DInternal::VertexAttribPointerState::VertexAttribPointerState()
     : enabled(false)
     , buffer(0)

-- 
WebKit Debian packaging