summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 10:05:08 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 10:05:08 +0000
commit3739e58b0a7fc9462bc4363fef0608a34dcf5346 (patch)
tree055eb056bd88de415bd73138b1f7b76f6664e2b5 /content/browser
parent7c519ab53d98ed696d6b8f9b9eedb0ff1bcd47b6 (diff)
downloadchromium_src-3739e58b0a7fc9462bc4363fef0608a34dcf5346.zip
chromium_src-3739e58b0a7fc9462bc4363fef0608a34dcf5346.tar.gz
chromium_src-3739e58b0a7fc9462bc4363fef0608a34dcf5346.tar.bz2
Use the asynchronous version CopyFromBackingStore in AeroPeekManager
I plan to consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore. This is a preparation for that work. AeroPeekManager is not used by default. It is used only when Chrome is launched with "--enable-aero-peek-tabs" option on Windows 7 with Aero enabled in non-application mode. This change uses WaitableEvent::Wait to adapt AsyncCopyFromBackingStore for the synchronous usage. I'd like to add suppression for the thread restriction for now in order to make the consolidation work progress. BUG=120003 TEST=Manual Review URL: http://codereview.chromium.org/10303002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index fcfeac8..e4796c8 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -926,9 +926,7 @@ void RenderWidgetHostViewWin::AsyncCopyFromCompositingSurface(
const gfx::Size& size,
skia::PlatformCanvas* output,
base::Callback<void(bool)> callback) {
- // TODO(mazda): Implement this.
- NOTIMPLEMENTED();
- callback.Run(false);
+ callback.Run(CopyFromCompositingSurface(size, output));
}
void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) {