summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 21:18:34 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 21:18:34 +0000
commit8c89e779666552bdfc748989f9870b6c7cf94cfd (patch)
treeaa10b38ba18cebc73e8e0445320e37aaaacd6551 /webkit/tools/test_shell/test_shell.cc
parent5b5251300453200903df3967d79f89a07ecb2a7d (diff)
downloadchromium_src-8c89e779666552bdfc748989f9870b6c7cf94cfd.zip
chromium_src-8c89e779666552bdfc748989f9870b6c7cf94cfd.tar.gz
chromium_src-8c89e779666552bdfc748989f9870b6c7cf94cfd.tar.bz2
Change WebCanvas to be a CGContext on Mac.
This change removes the code that previously existed to render HTML5 video on Mac. That code was already broken (video doesn't work at all on tip-of-tree), and so instead of trying to translate broken code, I just removed it. Andrew approved this. R=amanda,scherkus BUG=none TEST=none Review URL: http://codereview.chromium.org/174022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
-rw-r--r--webkit/tools/test_shell/test_shell.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 41fc582..fa6c46e 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -47,6 +47,7 @@
#include "webkit/tools/test_shell/test_navigation_controller.h"
#include "webkit/tools/test_shell/test_shell_switches.h"
+using WebKit::WebCanvas;
using WebKit::WebFrame;
using WebKit::WebNavigationPolicy;
using WebKit::WebRect;
@@ -259,7 +260,8 @@ std::string TestShell::DumpImage(WebView* view,
skia::PlatformCanvas canvas;
if (!canvas.initialize(size.width, size.height, true))
return std::string();
- view->paint(&canvas, WebRect(0, 0, size.width, size.height));
+ view->paint(webkit_glue::ToWebCanvas(&canvas),
+ WebRect(0, 0, size.width, size.height));
skia::BitmapPlatformDevice& device =
static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());