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

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 71808b3c2a1223cd1c04e9a726dbc914c44de521
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 23:00:15 2010 +0000

    2010-08-17  Stephen White  <senorblanco at chromium.org>
    
            Reviewed by David Levin.
    
            Allow non-Skia ports to compile with ENABLE(ACCELERATED_2D_CANVAS).
            https://bugs.webkit.org/show_bug.cgi?id=44130
    
            No tests; if it compiles, it's good.
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D):
            Fix a warning (treated as error).
            * platform/graphics/GraphicsContext.cpp:
            (WebCore::GraphicsContext::setGraphicsContext3D):
            (WebCore::GraphicsContext::syncSoftwareCanvas):
            * platform/graphics/GraphicsContext.h:
            Make setGraphicsContext3D() and syncSoftwareCanvas() stubbed out,
            but still present in non-Skia ports.  This allows Chrome Mac to
            compile with ENABLE(ACCELERATED_2D_CANVAS) (although it isn't hooked
            up yet, it should at least compile).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf8e422..cb603d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-17  Stephen White  <senorblanco at chromium.org>
+
+        Reviewed by David Levin.
+
+        Allow non-Skia ports to compile with ENABLE(ACCELERATED_2D_CANVAS).
+        https://bugs.webkit.org/show_bug.cgi?id=44130
+
+        No tests; if it compiles, it's good.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D):
+        Fix a warning (treated as error).
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::setGraphicsContext3D):
+        (WebCore::GraphicsContext::syncSoftwareCanvas):
+        * platform/graphics/GraphicsContext.h:
+        Make setGraphicsContext3D() and syncSoftwareCanvas() stubbed out,
+        but still present in non-Skia ports.  This allows Chrome Mac to
+        compile with ENABLE(ACCELERATED_2D_CANVAS) (although it isn't hooked
+        up yet, it should at least compile).
+
 2010-08-17  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 59249aa..5ff9a72 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -126,7 +126,7 @@ CanvasRenderingContext2D::CanvasRenderingContext2D(HTMLCanvasElement* canvas, bo
         return;
     if (FrameView* view = canvas->document()->view()) {
         if (ScrollView* rootView = view->root()) {
-            if (HostWindow* hostWindow = view->root()->hostWindow()) {
+            if (HostWindow* hostWindow = rootView->hostWindow()) {
                 // Set up our context
                 GraphicsContext3D::Attributes attr;
                 attr.stencil = true;
diff --git a/WebCore/platform/graphics/GraphicsContext.cpp b/WebCore/platform/graphics/GraphicsContext.cpp
index 67a35ec..b51141a 100644
--- a/WebCore/platform/graphics/GraphicsContext.cpp
+++ b/WebCore/platform/graphics/GraphicsContext.cpp
@@ -600,4 +600,14 @@ void GraphicsContext::adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2
     }
 }
 
+#if !PLATFORM(SKIA)
+void GraphicsContext::setGraphicsContext3D(GraphicsContext3D*, const IntSize&)
+{
+}
+
+void GraphicsContext::syncSoftwareCanvas()
+{
+}
+#endif
+
 }
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index 7059a50..d514b11 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -408,10 +408,8 @@ namespace WebCore {
         pattern getHaikuStrokeStyle();
 #endif
 
-#if PLATFORM(SKIA)
         void setGraphicsContext3D(GraphicsContext3D*, const IntSize&);
         void syncSoftwareCanvas();
-#endif
 
     private:
         void savePlatformState();

-- 
WebKit Debian packaging