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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest.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 "base/bind_helpers.h" 5 #include "base/bind_helpers.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/browser/browser_plugin/browser_plugin_guest.h" 9 #include "content/browser/browser_plugin/browser_plugin_guest.h"
10 #include "content/browser/frame_host/render_widget_host_view_guest.h" 10 #include "content/browser/frame_host/render_widget_host_view_guest.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 ViewHostMsg_SelectionBounds_Params guest_params(params); 347 ViewHostMsg_SelectionBounds_Params guest_params(params);
348 guest_params.anchor_rect = guest_->ToGuestRect(params.anchor_rect); 348 guest_params.anchor_rect = guest_->ToGuestRect(params.anchor_rect);
349 guest_params.focus_rect = guest_->ToGuestRect(params.focus_rect); 349 guest_params.focus_rect = guest_->ToGuestRect(params.focus_rect);
350 rwhv->SelectionBoundsChanged(guest_params); 350 rwhv->SelectionBoundsChanged(guest_params);
351 } 351 }
352 352
353 void RenderWidgetHostViewGuest::CopyFromCompositingSurface( 353 void RenderWidgetHostViewGuest::CopyFromCompositingSurface(
354 const gfx::Rect& src_subrect, 354 const gfx::Rect& src_subrect,
355 const gfx::Size& dst_size, 355 const gfx::Size& dst_size,
356 const base::Callback<void(bool, const SkBitmap&)>& callback, 356 const base::Callback<void(bool, const SkBitmap&)>& callback,
357 const SkBitmap::Config config) { 357 const SkColorType color_type) {
358 CHECK(guest_); 358 CHECK(guest_);
359 guest_->CopyFromCompositingSurface(src_subrect, dst_size, callback); 359 guest_->CopyFromCompositingSurface(src_subrect, dst_size, callback);
360 } 360 }
361 361
362 void RenderWidgetHostViewGuest::SetBackgroundOpaque(bool opaque) { 362 void RenderWidgetHostViewGuest::SetBackgroundOpaque(bool opaque) {
363 platform_view_->SetBackgroundOpaque(opaque); 363 platform_view_->SetBackgroundOpaque(opaque);
364 } 364 }
365 365
366 bool RenderWidgetHostViewGuest::LockMouse() { 366 bool RenderWidgetHostViewGuest::LockMouse() {
367 return platform_view_->LockMouse(); 367 return platform_view_->LockMouse();
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 ui::GestureRecognizer::Gestures* gestures) { 537 ui::GestureRecognizer::Gestures* gestures) {
538 if ((gestures == NULL) || gestures->empty()) 538 if ((gestures == NULL) || gestures->empty())
539 return; 539 return;
540 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin(); 540 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin();
541 g_it != gestures->end(); 541 g_it != gestures->end();
542 ++g_it) { 542 ++g_it) {
543 ForwardGestureEventToRenderer(*g_it); 543 ForwardGestureEventToRenderer(*g_it);
544 } 544 }
545 } 545 }
546 546
547 SkBitmap::Config RenderWidgetHostViewGuest::PreferredReadbackFormat() { 547 SkColorType RenderWidgetHostViewGuest::PreferredReadbackFormat() {
548 return SkBitmap::kARGB_8888_Config; 548 return kN32_SkColorType;
549 } 549 }
550 550
551 RenderWidgetHostViewBase* 551 RenderWidgetHostViewBase*
552 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { 552 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const {
553 return static_cast<RenderWidgetHostViewBase*>( 553 return static_cast<RenderWidgetHostViewBase*>(
554 guest_->GetEmbedderRenderWidgetHostView()); 554 guest_->GetEmbedderRenderWidgetHostView());
555 } 555 }
556 556
557 } // namespace content 557 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698