| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 return; | 716 return; |
| 717 SyncSelectionIfRequired(); | 717 SyncSelectionIfRequired(); |
| 718 } | 718 } |
| 719 | 719 |
| 720 RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer( | 720 RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer( |
| 721 PepperPluginInstanceImpl* plugin) { | 721 PepperPluginInstanceImpl* plugin) { |
| 722 GURL active_url; | 722 GURL active_url; |
| 723 if (render_view_->webview() && render_view_->webview()->mainFrame()) | 723 if (render_view_->webview() && render_view_->webview()->mainFrame()) |
| 724 active_url = GURL(render_view_->webview()->mainFrame()->document().url()); | 724 active_url = GURL(render_view_->webview()->mainFrame()->document().url()); |
| 725 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( | 725 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( |
| 726 GetRenderWidget()->routing_id(), plugin, active_url, | 726 GetRenderWidget()->routing_id(), GetRenderWidget()->compositor_deps(), |
| 727 GetRenderWidget()->screenInfo()); | 727 plugin, active_url, GetRenderWidget()->screenInfo()); |
| 728 widget->show(blink::WebNavigationPolicyIgnore); | 728 widget->show(blink::WebNavigationPolicyIgnore); |
| 729 return widget; | 729 return widget; |
| 730 } | 730 } |
| 731 | 731 |
| 732 bool RenderFrameImpl::IsPepperAcceptingCompositionEvents() const { | 732 bool RenderFrameImpl::IsPepperAcceptingCompositionEvents() const { |
| 733 if (!render_view_->focused_pepper_plugin()) | 733 if (!render_view_->focused_pepper_plugin()) |
| 734 return false; | 734 return false; |
| 735 return render_view_->focused_pepper_plugin()-> | 735 return render_view_->focused_pepper_plugin()-> |
| 736 IsPluginAcceptingCompositionEvents(); | 736 IsPluginAcceptingCompositionEvents(); |
| 737 } | 737 } |
| (...skipping 3550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4288 | 4288 |
| 4289 #if defined(ENABLE_BROWSER_CDMS) | 4289 #if defined(ENABLE_BROWSER_CDMS) |
| 4290 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4290 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4291 if (!cdm_manager_) | 4291 if (!cdm_manager_) |
| 4292 cdm_manager_ = new RendererCdmManager(this); | 4292 cdm_manager_ = new RendererCdmManager(this); |
| 4293 return cdm_manager_; | 4293 return cdm_manager_; |
| 4294 } | 4294 } |
| 4295 #endif // defined(ENABLE_BROWSER_CDMS) | 4295 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4296 | 4296 |
| 4297 } // namespace content | 4297 } // namespace content |
| OLD | NEW |