Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 571413002: Declare a new name for CompositingSurface completion callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 virtual void AcceleratedSurfacePostSubBuffer( 149 virtual void AcceleratedSurfacePostSubBuffer(
150 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 150 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
151 int gpu_host_id) OVERRIDE; 151 int gpu_host_id) OVERRIDE;
152 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 152 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
153 virtual void AcceleratedSurfaceRelease() OVERRIDE; 153 virtual void AcceleratedSurfaceRelease() OVERRIDE;
154 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 154 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
155 virtual void SetBackgroundOpaque(bool transparent) OVERRIDE; 155 virtual void SetBackgroundOpaque(bool transparent) OVERRIDE;
156 virtual void CopyFromCompositingSurface( 156 virtual void CopyFromCompositingSurface(
157 const gfx::Rect& src_subrect, 157 const gfx::Rect& src_subrect,
158 const gfx::Size& dst_size, 158 const gfx::Size& dst_size,
159 const base::Callback<void(bool, const SkBitmap&)>& callback, 159 CopyFromCompositingSurfaceCallback& callback,
160 const SkColorType color_type) OVERRIDE; 160 const SkColorType color_type) OVERRIDE;
161 virtual void CopyFromCompositingSurfaceToVideoFrame( 161 virtual void CopyFromCompositingSurfaceToVideoFrame(
162 const gfx::Rect& src_subrect, 162 const gfx::Rect& src_subrect,
163 const scoped_refptr<media::VideoFrame>& target, 163 const scoped_refptr<media::VideoFrame>& target,
164 const base::Callback<void(bool)>& callback) OVERRIDE; 164 const base::Callback<void(bool)>& callback) OVERRIDE;
165 virtual bool CanCopyToVideoFrame() const OVERRIDE; 165 virtual bool CanCopyToVideoFrame() const OVERRIDE;
166 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; 166 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
167 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 167 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
168 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 168 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
169 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, 169 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 gfx::Vector2dF last_scroll_offset_; 434 gfx::Vector2dF last_scroll_offset_;
435 435
436 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; 436 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
437 437
438 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 438 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
439 }; 439 };
440 440
441 } // namespace content 441 } // namespace content
442 442
443 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 443 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698