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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 374633002: SkBitmap::Config is deprecated, use SkColorType instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments from #4 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_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 5fd0b1b2e23be0b57cb740280dfa3cab11645c7b..fd61f61576c4ab9a12b1cdd78d3cf9c18dc957a1 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1211,14 +1211,14 @@ void RenderWidgetHostViewMac::CopyFromCompositingSurface(
const gfx::Rect& src_subrect,
const gfx::Size& dst_size,
const base::Callback<void(bool, const SkBitmap&)>& callback,
- const SkBitmap::Config config) {
+ const SkColorType color_type) {
if (delegated_frame_host_) {
delegated_frame_host_->CopyFromCompositingSurface(
- src_subrect, dst_size, callback, config);
+ src_subrect, dst_size, callback, color_type);
return;
}
- if (config != SkBitmap::kARGB_8888_Config) {
+ if (color_type != kN32_SkColorType) {
NOTIMPLEMENTED();
callback.Run(false, SkBitmap());
}
@@ -2258,8 +2258,8 @@ void RenderWidgetHostViewMac::LayoutLayers() {
}
}
-SkBitmap::Config RenderWidgetHostViewMac::PreferredReadbackFormat() {
- return SkBitmap::kARGB_8888_Config;
+SkColorType RenderWidgetHostViewMac::PreferredReadbackFormat() {
+ return kN32_SkColorType;
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698