content/renderer/pepper/plugin_instance_throttler_impl.cc - Issue 1341563002: Plugin Power Saver: Improve origin handling esp. with OOPIF.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/plugin_instance_throttler_impl.cc

Issue 1341563002: Plugin Power Saver: Improve origin handling esp. with OOPIF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/pepper/plugin_instance_throttler_impl.h ('k') | content/renderer/pepper/plugin_instance_throttler_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/plugin_instance_throttler_impl.cc

diff --git a/content/renderer/pepper/plugin_instance_throttler_impl.cc b/content/renderer/pepper/plugin_instance_throttler_impl.cc

index 00eecbb80dc94f9a8ba0b3b53f54bb5d2b5f3471..2b836ccb1085da79624443dd8a7b7106addeecec 100644

--- a/content/renderer/pepper/plugin_instance_throttler_impl.cc

+++ b/content/renderer/pepper/plugin_instance_throttler_impl.cc

@@ -15,10 +15,12 @@

#include "ppapi/shared_impl/ppapi_constants.h"

#include "third_party/WebKit/public/platform/WebRect.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

+#include "third_party/WebKit/public/web/WebLocalFrame.h"

#include "third_party/WebKit/public/web/WebPluginContainer.h"

#include "third_party/WebKit/public/web/WebPluginParams.h"

+#include "third_party/WebKit/public/web/WebView.h"

#include "ui/gfx/color_utils.h"

-#include "url/gurl.h"

+#include "url/origin.h"

namespace content {

@@ -158,7 +160,7 @@ void PluginInstanceThrottlerImpl::SetWebPlugin(

void PluginInstanceThrottlerImpl::Initialize(

RenderFrameImpl* frame,

- const GURL& content_origin,

+ const url::Origin& content_origin,

const std::string& plugin_module_name,

const gfx::Size& unobscured_size) {

DCHECK(unobscured_size_.IsEmpty());

@@ -170,8 +172,8 @@ void PluginInstanceThrottlerImpl::Initialize(

bool cross_origin_main_content = false;

float zoom_factor = GetWebPlugin()->container()->pageZoomFactor();

if (!helper->ShouldThrottleContent(

- content_origin, plugin_module_name,

- roundf(unobscured_size.width() / zoom_factor),

+ frame->GetWebFrame()->top()->securityOrigin(), content_origin,

+ plugin_module_name, roundf(unobscured_size.width() / zoom_factor),

roundf(unobscured_size.height() / zoom_factor),

&cross_origin_main_content)) {

DCHECK_NE(THROTTLER_STATE_MARKED_ESSENTIAL, state_);