summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/render_widget_host_view_win.h
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 21:56:01 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 21:56:01 +0000
commitea2ac588744f3ac413f822a1bd507488d73739a2 (patch)
treed43c880f285454163c9649f34a843421a5f39cd4 /content/browser/renderer_host/render_widget_host_view_win.h
parentd9c7427af6a3915a4484ad9b0d6c9051bd04aefe (diff)
downloadchromium_src-ea2ac588744f3ac413f822a1bd507488d73739a2.zip
chromium_src-ea2ac588744f3ac413f822a1bd507488d73739a2.tar.gz
chromium_src-ea2ac588744f3ac413f822a1bd507488d73739a2.tar.bz2
Add GLHelper::AsyncCopyTextureTo and make thumbnail generation asynchronous.
BUG=118547 TEST=Manually checked that UI thread is not blocked by the thumbnailer Review URL: http://codereview.chromium.org/9791031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_win.h')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h
index 08829ad..44dbfcb 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.h
+++ b/content/browser/renderer_host/render_widget_host_view_win.h
@@ -169,9 +169,6 @@ class RenderWidgetHostViewWin
virtual bool IsShowing() OVERRIDE;
virtual gfx::Rect GetViewBounds() const OVERRIDE;
virtual void SetBackground(const SkBitmap& background) OVERRIDE;
- virtual bool CopyFromCompositingSurface(
- const gfx::Size& size,
- skia::PlatformCanvas* output) OVERRIDE;
// Implementation of RenderWidgetHostViewPort.
virtual void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
@@ -202,6 +199,13 @@ class RenderWidgetHostViewWin
virtual void Destroy() OVERRIDE;
virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
+ virtual bool CopyFromCompositingSurface(
+ const gfx::Size& size,
+ skia::PlatformCanvas* output) OVERRIDE;
+ virtual void AsyncCopyFromCompositingSurface(
+ const gfx::Size& size,
+ skia::PlatformCanvas* output,
+ base::Callback<void(bool)> callback) OVERRIDE;
virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type,
bool processed) OVERRIDE;