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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include "content/browser/frame_host/cross_process_frame_connector.h" 7 #include "content/browser/frame_host/cross_process_frame_connector.h"
8 #include "content/browser/renderer_host/render_widget_host_impl.h" 8 #include "content/browser/renderer_host/render_widget_host_impl.h"
9 #include "content/common/gpu/gpu_messages.h" 9 #include "content/common/gpu/gpu_messages.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 bool RenderWidgetHostViewChildFrame::PostProcessEventForPluginIme( 282 bool RenderWidgetHostViewChildFrame::PostProcessEventForPluginIme(
283 const NativeWebKeyboardEvent& event) { 283 const NativeWebKeyboardEvent& event) {
284 return false; 284 return false;
285 } 285 }
286 #endif // defined(OS_MACOSX) 286 #endif // defined(OS_MACOSX)
287 287
288 void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface( 288 void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface(
289 const gfx::Rect& src_subrect, 289 const gfx::Rect& src_subrect,
290 const gfx::Size& /* dst_size */, 290 const gfx::Size& /* dst_size */,
291 const base::Callback<void(bool, const SkBitmap&)>& callback, 291 const base::Callback<void(bool, const SkBitmap&)>& callback,
292 const SkBitmap::Config config) { 292 const SkColorType color_type) {
293 callback.Run(false, SkBitmap()); 293 callback.Run(false, SkBitmap());
294 } 294 }
295 295
296 void RenderWidgetHostViewChildFrame::CopyFromCompositingSurfaceToVideoFrame( 296 void RenderWidgetHostViewChildFrame::CopyFromCompositingSurfaceToVideoFrame(
297 const gfx::Rect& src_subrect, 297 const gfx::Rect& src_subrect,
298 const scoped_refptr<media::VideoFrame>& target, 298 const scoped_refptr<media::VideoFrame>& target,
299 const base::Callback<void(bool)>& callback) { 299 const base::Callback<void(bool)>& callback) {
300 NOTIMPLEMENTED(); 300 NOTIMPLEMENTED();
301 callback.Run(false); 301 callback.Run(false);
302 } 302 }
(...skipping 22 matching lines...) Expand all
325 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible( 325 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible(
326 gfx::NativeViewAccessible accessible_parent) { 326 gfx::NativeViewAccessible accessible_parent) {
327 } 327 }
328 328
329 gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin() 329 gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin()
330 const { 330 const {
331 return NULL; 331 return NULL;
332 } 332 }
333 #endif // defined(OS_WIN) 333 #endif // defined(OS_WIN)
334 334
335 SkBitmap::Config RenderWidgetHostViewChildFrame::PreferredReadbackFormat() { 335 SkColorType RenderWidgetHostViewChildFrame::PreferredReadbackFormat() {
336 return SkBitmap::kARGB_8888_Config; 336 return kN32_SkColorType;
337 } 337 }
338 338
339 } // namespace content 339 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698