| OLD | NEW |
| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 CopyFromCompositingSurfaceCallback& callback, | 356 CopyFromCompositingSurfaceCallback& callback, |
| 357 const SkColorType color_type) { | 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::SetBackgroundColor(SkColor color) { |
| 363 // Content embedders can toggle opaque backgrounds through this API. | 363 // Content embedders can toggle opaque backgrounds through this API. |
| 364 // We plumb the value here so that BrowserPlugin updates its compositing | 364 // We plumb the value here so that BrowserPlugin updates its compositing |
| 365 // state in response to this change. We also want to preserve this flag | 365 // state in response to this change. We also want to preserve this flag |
| 366 // after recovering from a crash so we let BrowserPluginGuest store it. | 366 // after recovering from a crash so we let BrowserPluginGuest store it. |
| 367 if (!guest_) | 367 if (!guest_) |
| 368 return; | 368 return; |
| 369 RenderWidgetHostViewBase::SetBackgroundOpaque(opaque); | 369 RenderWidgetHostViewBase::SetBackgroundColor(color); |
| 370 bool opaque = GetBackgroundOpaque(); |
| 370 host_->SetBackgroundOpaque(opaque); | 371 host_->SetBackgroundOpaque(opaque); |
| 371 guest_->SetContentsOpaque(opaque); | 372 guest_->SetContentsOpaque(opaque); |
| 372 } | 373 } |
| 373 | 374 |
| 374 bool RenderWidgetHostViewGuest::LockMouse() { | 375 bool RenderWidgetHostViewGuest::LockMouse() { |
| 375 return platform_view_->LockMouse(); | 376 return platform_view_->LockMouse(); |
| 376 } | 377 } |
| 377 | 378 |
| 378 void RenderWidgetHostViewGuest::UnlockMouse() { | 379 void RenderWidgetHostViewGuest::UnlockMouse() { |
| 379 return platform_view_->UnlockMouse(); | 380 return platform_view_->UnlockMouse(); |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 } | 598 } |
| 598 | 599 |
| 599 if (blink::WebInputEvent::isGestureEventType(event->type)) { | 600 if (blink::WebInputEvent::isGestureEventType(event->type)) { |
| 600 host_->ForwardGestureEvent( | 601 host_->ForwardGestureEvent( |
| 601 *static_cast<const blink::WebGestureEvent*>(event)); | 602 *static_cast<const blink::WebGestureEvent*>(event)); |
| 602 return; | 603 return; |
| 603 } | 604 } |
| 604 } | 605 } |
| 605 | 606 |
| 606 } // namespace content | 607 } // namespace content |
| OLD | NEW |