summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.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/glue/webkit_glue.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/glue/webkit_glue.cc')
-rw-r--r--webkit/glue/webkit_glue.cc15
1 files changed, 14 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 1952c27..4fd1626 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.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.
@@ -34,6 +34,7 @@
#include "base/string_util.h"
#include "base/sys_info.h"
#include "base/sys_string_conversions.h"
+#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "webkit/api/public/WebHistoryItem.h"
#include "webkit/api/public/WebString.h"
@@ -48,6 +49,7 @@
#include "webkit_version.h" // Generated
+using WebKit::WebCanvas;
using WebKit::WebFrame;
using WebKit::WebHistoryItem;
using WebKit::WebString;
@@ -437,4 +439,15 @@ bool ShouldForcefullyTerminatePluginProcess() {
return g_forcefully_terminate_plugin_process;
}
+WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) {
+#if WEBKIT_USING_SKIA
+ return canvas;
+#elif WEBKIT_USING_CG
+ return canvas->getTopPlatformDevice().GetBitmapContext();
+#else
+ NOTIMPLEMENTED();
+ return NULL;
+#endif
+}
+
} // namespace webkit_glue