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 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1609 } | 1609 } |
1610 | 1610 |
1611 blink::WebNode RenderFrameImpl::GetContextMenuNode() const { | 1611 blink::WebNode RenderFrameImpl::GetContextMenuNode() const { |
1612 return context_menu_node_; | 1612 return context_menu_node_; |
1613 } | 1613 } |
1614 | 1614 |
1615 blink::WebPlugin* RenderFrameImpl::CreatePlugin( | 1615 blink::WebPlugin* RenderFrameImpl::CreatePlugin( |
1616 blink::WebFrame* frame, | 1616 blink::WebFrame* frame, |
1617 const WebPluginInfo& info, | 1617 const WebPluginInfo& info, |
1618 const blink::WebPluginParams& params, | 1618 const blink::WebPluginParams& params, |
1619 PluginPowerSaverMode power_saver_mode) { | 1619 scoped_ptr<content::PluginInstanceThrottler> throttler) { |
1620 DCHECK_EQ(frame_, frame); | 1620 DCHECK_EQ(frame_, frame); |
1621 #if defined(ENABLE_PLUGINS) | 1621 #if defined(ENABLE_PLUGINS) |
1622 bool pepper_plugin_was_registered = false; | 1622 bool pepper_plugin_was_registered = false; |
1623 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( | 1623 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( |
1624 this, info, &pepper_plugin_was_registered)); | 1624 this, info, &pepper_plugin_was_registered)); |
1625 if (pepper_plugin_was_registered) { | 1625 if (pepper_plugin_was_registered) { |
1626 if (pepper_module.get()) { | 1626 if (pepper_module.get()) { |
1627 return new PepperWebPluginImpl(pepper_module.get(), params, this, | 1627 return new PepperWebPluginImpl(pepper_module.get(), params, this, |
1628 power_saver_mode); | 1628 throttler.Pass()); |
1629 } | 1629 } |
1630 } | 1630 } |
1631 #if defined(OS_CHROMEOS) | 1631 #if defined(OS_CHROMEOS) |
1632 LOG(WARNING) << "Pepper module/plugin creation failed."; | 1632 LOG(WARNING) << "Pepper module/plugin creation failed."; |
1633 return NULL; | 1633 return NULL; |
1634 #else | 1634 #else |
1635 // TODO(jam): change to take RenderFrame. | 1635 // TODO(jam): change to take RenderFrame. |
1636 return new WebPluginImpl(frame, params, info.path, render_view_, this); | 1636 return new WebPluginImpl(frame, params, info.path, render_view_, this); |
1637 #endif | 1637 #endif |
1638 #else | 1638 #else |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1764 scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate( | 1764 scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate( |
1765 GetContentClient()->renderer()->CreateBrowserPluginDelegate( | 1765 GetContentClient()->renderer()->CreateBrowserPluginDelegate( |
1766 this, mime_type, GURL(params.url))); | 1766 this, mime_type, GURL(params.url))); |
1767 return BrowserPluginManager::Get()->CreateBrowserPlugin( | 1767 return BrowserPluginManager::Get()->CreateBrowserPlugin( |
1768 this, browser_plugin_delegate.Pass()); | 1768 this, browser_plugin_delegate.Pass()); |
1769 } | 1769 } |
1770 | 1770 |
1771 | 1771 |
1772 WebPluginParams params_to_use = params; | 1772 WebPluginParams params_to_use = params; |
1773 params_to_use.mimeType = WebString::fromUTF8(mime_type); | 1773 params_to_use.mimeType = WebString::fromUTF8(mime_type); |
1774 return CreatePlugin(frame, info, params_to_use, POWER_SAVER_MODE_ESSENTIAL); | 1774 return CreatePlugin(frame, info, params_to_use, nullptr /* throttler */); |
1775 #else | 1775 #else |
1776 return NULL; | 1776 return NULL; |
1777 #endif // defined(ENABLE_PLUGINS) | 1777 #endif // defined(ENABLE_PLUGINS) |
1778 } | 1778 } |
1779 | 1779 |
1780 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | 1780 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
1781 blink::WebLocalFrame* frame, | 1781 blink::WebLocalFrame* frame, |
1782 const blink::WebURL& url, | 1782 const blink::WebURL& url, |
1783 blink::WebMediaPlayerClient* client) { | 1783 blink::WebMediaPlayerClient* client) { |
1784 return createMediaPlayer(frame, url, client, NULL); | 1784 return createMediaPlayer(frame, url, client, NULL); |
(...skipping 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4331 | 4331 |
4332 #if defined(ENABLE_BROWSER_CDMS) | 4332 #if defined(ENABLE_BROWSER_CDMS) |
4333 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4333 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4334 if (!cdm_manager_) | 4334 if (!cdm_manager_) |
4335 cdm_manager_ = new RendererCdmManager(this); | 4335 cdm_manager_ = new RendererCdmManager(this); |
4336 return cdm_manager_; | 4336 return cdm_manager_; |
4337 } | 4337 } |
4338 #endif // defined(ENABLE_BROWSER_CDMS) | 4338 #endif // defined(ENABLE_BROWSER_CDMS) |
4339 | 4339 |
4340 } // namespace content | 4340 } // namespace content |
OLD | NEW |