Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 669703003: Plugin Power Saver: Restrict Power Saver to cross-origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 blink::WebFrame* frame, 1528 blink::WebFrame* frame,
1529 const WebPluginInfo& info, 1529 const WebPluginInfo& info,
1530 const blink::WebPluginParams& params) { 1530 const blink::WebPluginParams& params) {
1531 DCHECK_EQ(frame_, frame); 1531 DCHECK_EQ(frame_, frame);
1532 #if defined(ENABLE_PLUGINS) 1532 #if defined(ENABLE_PLUGINS)
1533 bool pepper_plugin_was_registered = false; 1533 bool pepper_plugin_was_registered = false;
1534 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( 1534 scoped_refptr<PluginModule> pepper_module(PluginModule::Create(
1535 this, info, &pepper_plugin_was_registered)); 1535 this, info, &pepper_plugin_was_registered));
1536 if (pepper_plugin_was_registered) { 1536 if (pepper_plugin_was_registered) {
1537 if (pepper_module.get()) { 1537 if (pepper_module.get()) {
1538 return new PepperWebPluginImpl(pepper_module.get(), params, this); 1538 return new PepperWebPluginImpl(pepper_module.get(), params, this,
1539 frame->top()->document().url());
groby-ooo-7-16 2014/10/23 00:17:22 Question: We already pass in the RenderFrameImpl (
tommycli 2014/10/23 00:46:12 You are totally right. I totally missed the existe
1539 } 1540 }
1540 } 1541 }
1541 #if defined(OS_CHROMEOS) 1542 #if defined(OS_CHROMEOS)
1542 LOG(WARNING) << "Pepper module/plugin creation failed."; 1543 LOG(WARNING) << "Pepper module/plugin creation failed.";
1543 return NULL; 1544 return NULL;
1544 #else 1545 #else
1545 // TODO(jam): change to take RenderFrame. 1546 // TODO(jam): change to take RenderFrame.
1546 return new WebPluginImpl(frame, params, info.path, render_view_, this); 1547 return new WebPluginImpl(frame, params, info.path, render_view_, this);
1547 #endif 1548 #endif
1548 #else 1549 #else
(...skipping 2563 matching lines...) Expand 10 before | Expand all | Expand 10 after
4112 4113
4113 #if defined(ENABLE_BROWSER_CDMS) 4114 #if defined(ENABLE_BROWSER_CDMS)
4114 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4115 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4115 if (!cdm_manager_) 4116 if (!cdm_manager_)
4116 cdm_manager_ = new RendererCdmManager(this); 4117 cdm_manager_ = new RendererCdmManager(this);
4117 return cdm_manager_; 4118 return cdm_manager_;
4118 } 4119 }
4119 #endif // defined(ENABLE_BROWSER_CDMS) 4120 #endif // defined(ENABLE_BROWSER_CDMS)
4120 4121
4121 } // namespace content 4122 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698