summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-11 09:43:24 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-11 09:43:24 +0200
commit1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch)
tree87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebKit/chromium/src/WebContentLayerImpl.cpp
parent2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff)
downloadqtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebKit/chromium/src/WebContentLayerImpl.cpp')
-rw-r--r--Source/WebKit/chromium/src/WebContentLayerImpl.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/WebContentLayerImpl.cpp b/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
index 4f64d5471..4d476095d 100644
--- a/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
+++ b/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
@@ -30,9 +30,7 @@
#include "platform/WebRect.h"
#include "GraphicsContext.h"
#include "platform/WebCanvas.h"
-#if WEBKIT_USING_SKIA
#include "PlatformContextSkia.h"
-#endif
using namespace WebCore;
@@ -64,11 +62,7 @@ void WebContentLayerImpl::paintContents(GraphicsContext& gc, const IntRect& clip
{
if (!m_contentClient)
return;
-#if WEBKIT_USING_SKIA
WebCanvas* canvas = gc.platformContext()->canvas();
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = gc.platformContext();
-#endif
m_contentClient->paintContents(canvas, WebRect(clip));
}