diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 03:27:39 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 03:27:39 +0000 |
| commit | 84dba8ca0f9963becc9a114f4a116ae870f59c3e (patch) | |
| tree | 9f987830e329eff324f56aca7c395a3d290a7706 /content/browser/renderer_host/render_widget_host_view_win.h | |
| parent | cf42beaf3ad64f2e907ba4a8eaf52511afc7d9cc (diff) | |
| download | chromium_src-84dba8ca0f9963becc9a114f4a116ae870f59c3e.zip chromium_src-84dba8ca0f9963becc9a114f4a116ae870f59c3e.tar.gz chromium_src-84dba8ca0f9963becc9a114f4a116ae870f59c3e.tar.bz2 | |
Reland r131452: Add GLHelper::AsyncCopyTextureTo and make thumbnail generation asynchronous.
BUG=118547
TEST=Manually checked that UI thread is not blocked by the thumbnailer
TBR=brettw,piman
Review URL: http://codereview.chromium.org/10033008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131529 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.h | 10 |
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; |