summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/html
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-06 11:19:34 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-01-06 11:19:34 (GMT)
commit53817ebe67158d642fd5d85dfdcf4d96e91b093b (patch)
treeecf5fe6233bbac4e5db86f51919cb5eeb7ec8595 /src/3rdparty/webkit/WebCore/html
parentb13ede364f15a7237dbc67491c9edf65546ad01d (diff)
downloadQt-53817ebe67158d642fd5d85dfdcf4d96e91b093b.zip
Qt-53817ebe67158d642fd5d85dfdcf4d96e91b093b.tar.gz
Qt-53817ebe67158d642fd5d85dfdcf4d96e91b093b.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe )
Changes in WebKit/qt since the last update:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html')
-rw-r--r--src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 3341901..848771b 100644
--- a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/src/3rdparty/webkit/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"