| 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/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "content/browser/browser_plugin/browser_plugin_guest.h" | 8 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
| 9 #include "content/browser/renderer_host/render_view_host_impl.h" | 9 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 10 #include "content/browser/renderer_host/render_widget_host_view_guest.h" | 10 #include "content/browser/renderer_host/render_widget_host_view_guest.h" |
| 11 #include "content/browser/web_contents/web_contents_impl.h" | |
| 12 #include "content/common/browser_plugin_messages.h" | 11 #include "content/common/browser_plugin_messages.h" |
| 13 #include "content/common/gpu/gpu_messages.h" | 12 #include "content/common/gpu/gpu_messages.h" |
| 14 #include "content/common/view_messages.h" | 13 #include "content/common/view_messages.h" |
| 15 #include "skia/ext/platform_canvas.h" | 14 #include "skia/ext/platform_canvas.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 17 #include "webkit/plugins/npapi/webplugin.h" | 16 #include "webkit/plugins/npapi/webplugin.h" |
| 18 | 17 |
| 19 namespace content { | 18 namespace content { |
| 20 | 19 |
| 21 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest( | 20 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest( |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 NOTREACHED(); | 151 NOTREACHED(); |
| 153 } | 152 } |
| 154 | 153 |
| 155 void RenderWidgetHostViewGuest::InitAsFullscreen( | 154 void RenderWidgetHostViewGuest::InitAsFullscreen( |
| 156 RenderWidgetHostView* reference_host_view) { | 155 RenderWidgetHostView* reference_host_view) { |
| 157 // This should never get called. | 156 // This should never get called. |
| 158 NOTREACHED(); | 157 NOTREACHED(); |
| 159 } | 158 } |
| 160 | 159 |
| 161 gfx::NativeView RenderWidgetHostViewGuest::GetNativeView() const { | 160 gfx::NativeView RenderWidgetHostViewGuest::GetNativeView() const { |
| 162 return guest_->embedder_web_contents()->GetRenderWidgetHostView()-> | 161 return guest_->GetEmbedderRenderWidgetHostView()->GetNativeView(); |
| 163 GetNativeView(); | |
| 164 } | 162 } |
| 165 | 163 |
| 166 gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { | 164 gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { |
| 167 return guest_->embedder_web_contents()->GetRenderWidgetHostView()-> | 165 return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId(); |
| 168 GetNativeViewId(); | |
| 169 } | 166 } |
| 170 | 167 |
| 171 gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() { | 168 gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() { |
| 172 return guest_->embedder_web_contents()->GetRenderWidgetHostView()-> | 169 return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewAccessible(); |
| 173 GetNativeViewAccessible(); | |
| 174 } | 170 } |
| 175 | 171 |
| 176 void RenderWidgetHostViewGuest::MovePluginWindows( | 172 void RenderWidgetHostViewGuest::MovePluginWindows( |
| 177 const gfx::Vector2d& scroll_offset, | 173 const gfx::Vector2d& scroll_offset, |
| 178 const std::vector<webkit::npapi::WebPluginGeometry>& moves) { | 174 const std::vector<webkit::npapi::WebPluginGeometry>& moves) { |
| 179 platform_view_->MovePluginWindows(scroll_offset, moves); | 175 platform_view_->MovePluginWindows(scroll_offset, moves); |
| 180 } | 176 } |
| 181 | 177 |
| 182 void RenderWidgetHostViewGuest::Focus() { | 178 void RenderWidgetHostViewGuest::Focus() { |
| 183 } | 179 } |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 void RenderWidgetHostViewGuest::WillWmDestroy() { | 392 void RenderWidgetHostViewGuest::WillWmDestroy() { |
| 397 } | 393 } |
| 398 #endif | 394 #endif |
| 399 | 395 |
| 400 void RenderWidgetHostViewGuest::DestroyGuestView() { | 396 void RenderWidgetHostViewGuest::DestroyGuestView() { |
| 401 host_ = NULL; | 397 host_ = NULL; |
| 402 MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 398 MessageLoop::current()->DeleteSoon(FROM_HERE, this); |
| 403 } | 399 } |
| 404 | 400 |
| 405 } // namespace content | 401 } // namespace content |
| OLD | NEW |