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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 374633002: SkBitmap::Config is deprecated, use SkColorType instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index fdc2fb1af42fdd0c4987c6f97b2b283215964bc3..9f845dc13eaef32d8519e4ed69bb93c2d0de9208 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -678,14 +678,14 @@ void RenderWidgetHostImpl::CopyFromBackingStore(
const gfx::Rect& src_subrect,
const gfx::Size& accelerated_dst_size,
const base::Callback<void(bool, const SkBitmap&)>& callback,
- const SkBitmap::Config& bitmap_config) {
+ const SkColorType color_type) {
if (view_) {
TRACE_EVENT0("browser",
"RenderWidgetHostImpl::CopyFromBackingStore::FromCompositingSurface");
gfx::Rect accelerated_copy_rect = src_subrect.IsEmpty() ?
gfx::Rect(view_->GetViewBounds().size()) : src_subrect;
view_->CopyFromCompositingSurface(
- accelerated_copy_rect, accelerated_dst_size, callback, bitmap_config);
+ accelerated_copy_rect, accelerated_dst_size, callback, color_type);
return;
}
@@ -2367,10 +2367,10 @@ void RenderWidgetHostImpl::AddLatencyInfoComponentIds(
}
}
-SkBitmap::Config RenderWidgetHostImpl::PreferredReadbackFormat() {
+SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() {
if (view_)
return view_->PreferredReadbackFormat();
- return SkBitmap::kARGB_8888_Config;
+ return kN32_SkColorType;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698