| Index: content/public/renderer/render_frame.h
|
| diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
|
| index dc055ef24ade5f75e7bb16908ddf43a312cdc3b0..2011c4e694752e658a26e4f7a9c0c2feb724a7d6 100644
|
| --- a/content/public/renderer/render_frame.h
|
| +++ b/content/public/renderer/render_frame.h
|
| @@ -29,7 +29,6 @@
|
|
|
| namespace gfx {
|
| class Range;
|
| -class Size;
|
| }
|
|
|
| namespace url {
|
| @@ -57,24 +56,6 @@
|
| class CONTENT_EXPORT RenderFrame : public IPC::Listener,
|
| public IPC::Sender {
|
| public:
|
| - // These numeric values are used in UMA logs; do not change them.
|
| - enum PeripheralContentStatus {
|
| - // Content is peripheral because it doesn't meet any of the below criteria.
|
| - CONTENT_STATUS_PERIPHERAL = 0,
|
| - // Content is essential because it's same-origin with the top-level frame.
|
| - CONTENT_STATUS_ESSENTIAL_SAME_ORIGIN = 1,
|
| - // Content is essential even though it's cross-origin, because it's large.
|
| - CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_BIG = 2,
|
| - // Content is essential because there's large content from the same origin.
|
| - CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_WHITELISTED = 3,
|
| - // Content is essential because it's tiny in size.
|
| - CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_TINY = 4,
|
| - // Content is essential because it has an unknown size.
|
| - CONTENT_STATUS_ESSENTIAL_UNKNOWN_SIZE = 5,
|
| - // Must be last.
|
| - CONTENT_STATUS_NUM_ITEMS
|
| - };
|
| -
|
| // Returns the RenderFrame given a WebFrame.
|
| static RenderFrame* FromWebFrame(blink::WebFrame* web_frame);
|
|
|
| @@ -150,7 +131,7 @@
|
| const url::Origin& content_origin,
|
| const base::Closure& unthrottle_callback) = 0;
|
|
|
| - // Returns the peripheral content heuristic decision.
|
| + // Returns true if this plugin should have power saver enabled.
|
| //
|
| // Power Saver is enabled for plugin content that are cross-origin and
|
| // heuristically determined to be not essential to the web page content.
|
| @@ -165,11 +146,15 @@
|
| //
|
| // |content_origin| is the origin of the plugin content.
|
| //
|
| - // |unobscured_size| are zoom and device scale independent logical pixels.
|
| - virtual PeripheralContentStatus GetPeripheralContentStatus(
|
| - const url::Origin& main_frame_origin,
|
| - const url::Origin& content_origin,
|
| - const gfx::Size& unobscured_size) const = 0;
|
| + // |width| and |height| are zoom and device scale independent logical pixels.
|
| + //
|
| + // |cross_origin_main_content| may be NULL. It is set to true if the
|
| + // plugin content is cross-origin but still the "main attraction" of the page.
|
| + virtual bool ShouldThrottleContent(const url::Origin& main_frame_origin,
|
| + const url::Origin& content_origin,
|
| + int width,
|
| + int height,
|
| + bool* cross_origin_main_content) const = 0;
|
|
|
| // Whitelists a |content_origin| so its content will never be throttled in
|
| // this RenderFrame. Whitelist is cleared by top level navigation.
|
|
|