summaryrefslogtreecommitdiffstats
path: root/chrome
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 /chrome
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 'chrome')
-rw-r--r--chrome/renderer/render_view.cc3
-rw-r--r--chrome/renderer/render_widget.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9efe2a3..5bd7c24 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -594,7 +594,8 @@ bool RenderView::CaptureThumbnail(WebView* view,
skia::PlatformCanvas canvas;
if (!canvas.initialize(size.width, size.height, true))
return false;
- 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());
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 3e11f4c8..863e73d 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -21,6 +21,7 @@
#include "webkit/api/public/WebRect.h"
#include "webkit/api/public/WebScreenInfo.h"
#include "webkit/api/public/WebSize.h"
+#include "webkit/glue/webkit_glue.h"
#if defined(OS_POSIX)
#include "third_party/skia/include/core/SkPixelRef.h"
@@ -356,7 +357,7 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
canvas->drawPaint(paint);
}
- webwidget_->paint(canvas, rect);
+ webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
// Flush to underlying bitmap. TODO(darin): is this needed?
canvas->getTopPlatformDevice().accessBitmap(false);