[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3857d2bcb8e7e9b43a5776b2be6d30efbe8f71be
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 31 18:07:03 2009 +0000

    2009-12-31  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Do not include Frame.h under WebCore/html/canvas
            https://bugs.webkit.org/show_bug.cgi?id=33082
    
            No new tests, as there is no new functionality.
    
            * html/canvas/CanvasRenderingContext2D.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0082d4e..2fdade9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-31  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Do not include Frame.h under WebCore/html/canvas
+        https://bugs.webkit.org/show_bug.cgi?id=33082
+
+        No new tests, as there is no new functionality.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+
 2009-12-30  Darin Fisher  <darin at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 1ae9f75..1e09534 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -42,7 +42,6 @@
 #include "Document.h"
 #include "ExceptionCode.h"
 #include "FloatConversion.h"
-#include "Frame.h"
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
 #include "HTMLImageElement.h"

-- 
WebKit Debian packaging