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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 1113573002: Maintain minimal error response. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 180e0f0e986040d44a9bfe19ba85652d4fc73ba4..e2e8181c9b26b2c8fdf73de009c1049397aba36f 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -125,10 +125,11 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void AcceleratedSurfaceInitialized(int route_id) override;
bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
void SetBackgroundColor(SkColor color) override;
- void CopyFromCompositingSurface(const gfx::Rect& src_subrect,
- const gfx::Size& dst_size,
- ReadbackRequestCallback& callback,
- const SkColorType color_type) override;
+ void CopyFromCompositingSurface(
+ const gfx::Rect& src_subrect,
+ const gfx::Size& dst_size,
+ ReadbackRequestCallback& callback,
+ const SkColorType preferred_color_type) override;
void CopyFromCompositingSurfaceToVideoFrame(
const gfx::Rect& src_subrect,
const scoped_refptr<media::VideoFrame>& target,
@@ -225,7 +226,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void WasResized();
void GetScaledContentBitmap(float scale,
- SkColorType color_type,
+ SkColorType preferred_color_type,
gfx::Rect src_subrect,
ReadbackRequestCallback& result_callback);

Powered by Google App Engine
This is Rietveld 408576698