| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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.h" | 8 #include "base/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/renderer_host/render_view_host_impl.h" | 10 #include "content/browser/renderer_host/render_view_host_impl.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 guest_->GetEmbedderRenderWidgetHostView()); | 130 guest_->GetEmbedderRenderWidgetHostView()); |
| 131 gfx::Rect embedder_bounds; | 131 gfx::Rect embedder_bounds; |
| 132 if (rwhv) | 132 if (rwhv) |
| 133 embedder_bounds = rwhv->GetViewBounds(); | 133 embedder_bounds = rwhv->GetViewBounds(); |
| 134 gfx::Rect shifted_rect = guest_->ToGuestRect(embedder_bounds); | 134 gfx::Rect shifted_rect = guest_->ToGuestRect(embedder_bounds); |
| 135 shifted_rect.set_width(size_.width()); | 135 shifted_rect.set_width(size_.width()); |
| 136 shifted_rect.set_height(size_.height()); | 136 shifted_rect.set_height(size_.height()); |
| 137 return shifted_rect; | 137 return shifted_rect; |
| 138 } | 138 } |
| 139 | 139 |
| 140 void RenderWidgetHostViewGuest::RenderViewGone(base::TerminationStatus status, | 140 void RenderWidgetHostViewGuest::RenderProcessGone( |
| 141 int error_code) { | 141 base::TerminationStatus status, |
| 142 platform_view_->RenderViewGone(status, error_code); | 142 int error_code) { |
| 143 platform_view_->RenderProcessGone(status, error_code); |
| 143 // Destroy the guest view instance only, so we don't end up calling | 144 // Destroy the guest view instance only, so we don't end up calling |
| 144 // platform_view_->Destroy(). | 145 // platform_view_->Destroy(). |
| 145 DestroyGuestView(); | 146 DestroyGuestView(); |
| 146 } | 147 } |
| 147 | 148 |
| 148 void RenderWidgetHostViewGuest::Destroy() { | 149 void RenderWidgetHostViewGuest::Destroy() { |
| 149 platform_view_->Destroy(); | 150 platform_view_->Destroy(); |
| 150 // The RenderWidgetHost's destruction led here, so don't call it. | 151 // The RenderWidgetHost's destruction led here, so don't call it. |
| 151 DestroyGuestView(); | 152 DestroyGuestView(); |
| 152 } | 153 } |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 return; | 535 return; |
| 535 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin(); | 536 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin(); |
| 536 g_it != gestures->end(); | 537 g_it != gestures->end(); |
| 537 ++g_it) { | 538 ++g_it) { |
| 538 ForwardGestureEventToRenderer(*g_it); | 539 ForwardGestureEventToRenderer(*g_it); |
| 539 } | 540 } |
| 540 } | 541 } |
| 541 | 542 |
| 542 | 543 |
| 543 } // namespace content | 544 } // namespace content |
| OLD | NEW |