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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit a9101d32bd05501fa1db09adce902f0e53782ad0
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 31 00:39:47 2010 +0000

    2010-07-30  James Robinson  <jamesr at chromium.org>
    
            Compile fix. Put GLES2 functions behind USE(GLES2_RENDERING) instead of
            USE(ACCELERATED_COMPOSITING) to match WebCore.  Fixes the compile when
            USE(GLES2_RENDERING) is true and USE(ACCELERATED_COMPOSITING) is false.
    
            * src/ChromeClientImpl.cpp:
            * src/ChromeClientImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index de8ee7a..d2fdf3c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-30  James Robinson  <jamesr at chromium.org>
+
+        Compile fix. Put GLES2 functions behind USE(GLES2_RENDERING) instead of
+        USE(ACCELERATED_COMPOSITING) to match WebCore.  Fixes the compile when
+        USE(GLES2_RENDERING) is true and USE(ACCELERATED_COMPOSITING) is false.
+
+        * src/ChromeClientImpl.cpp:
+        * src/ChromeClientImpl.h:
+
 2010-07-27  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Brady Eidson.
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index d43d88a..59d54fb 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -734,7 +734,9 @@ void ChromeClientImpl::scheduleCompositingLayerSync()
 {
     m_webView->setRootLayerNeedsDisplay();
 }
+#endif
 
+#if USE(GLES2_RENDERING)
 PassOwnPtr<GLES2Context> ChromeClientImpl::getOnscreenGLES2Context()
 {
     return m_webView->getOnscreenGLES2Context();
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index e824381..2500753 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -145,7 +145,9 @@ public:
     // Sets a flag to specify that the view needs to be updated, so we need
     // to do an eager layout before the drawing.
     virtual void scheduleCompositingLayerSync();
+#endif
 
+#if USE(GLES2_RENDERING)
     virtual PassOwnPtr<WebCore::GLES2Context> getOnscreenGLES2Context();
     virtual PassOwnPtr<WebCore::GLES2Context> getOffscreenGLES2Context();
 #endif

-- 
WebKit Debian packaging