[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 da06f606b54d938ed5514cf7154680a7e9e4a2e3
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 22:48:20 2010 +0000

    fix build
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 87cdadd..e172174 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-16  James Robinson  <jamesr at chromium.org>
+
+        Compile fix. Remove ANGLEWebKitBridge classes from Chromium build.  They are unused.
+
+        * WebCore.gypi:
+
 2010-08-16  Vincent Scheib  <scheib at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 270a4cd..5632656 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2487,8 +2487,6 @@
             'platform/graphics/wx/PenWx.cpp',
             'platform/graphics/wx/SimpleFontDataWx.cpp',
             'platform/graphics/wx/TransformationMatrixWx.cpp',
-            'platform/graphics/ANGLEWebkitBridge.cpp',
-            'platform/graphics/ANGLEWebkitBridge.h',
             'platform/graphics/BitmapImage.cpp',
             'platform/graphics/BitmapImage.h',
             'platform/graphics/Color.cpp',
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4e6404b..5e2a56d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16  James Robinson  <jamesr at chromium.org>
+
+        Compile fix.  Fix up paintsIntoCanvasBuffer impl.
+
+        * src/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::paintsIntoCanvasBuffer):
+
 2010-08-16  Vincent Scheib  <scheib at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index 407469f..0f672a3 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -1217,7 +1217,11 @@ DELEGATE_TO_INTERNAL_6(vertexAttribPointer, unsigned long, int, int, bool, unsig
 DELEGATE_TO_INTERNAL_4(viewport, long, long, unsigned long, unsigned long)
 
 DELEGATE_TO_INTERNAL_1(paintRenderingResultsToCanvas, CanvasRenderingContext*)
-DELEGATE_TO_INTERNAL(paintsIntoCanvasBuffer)
+
+bool GraphicsContext3D::paintsIntoCanvasBuffer() const
+{
+    return m_internal->paintsIntoCanvasBuffer();
+}
 
 DELEGATE_TO_INTERNAL_R(createBuffer, unsigned)
 DELEGATE_TO_INTERNAL_R(createFramebuffer, unsigned)

-- 
WebKit Debian packaging