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

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

Issue 1141793002: Reland: Fix WebViewPlugin::scheduleAnimation crash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: filepath windows issue Created 5 years, 7 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
Index: content/renderer/pepper/plugin_power_saver_helper.cc
diff --git a/content/renderer/pepper/plugin_power_saver_helper.cc b/content/renderer/pepper/plugin_power_saver_helper.cc
index e0c1176ca97d9e016bee9492cf245acb84d4c382..8d4fdd757af5137e4d49a8e7a55f6233236abc81 100644
--- a/content/renderer/pepper/plugin_power_saver_helper.cc
+++ b/content/renderer/pepper/plugin_power_saver_helper.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/plugin_power_saver_helper.h"
+#include <string>
+
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "content/common/frame_messages.h"
@@ -121,6 +123,9 @@ bool PluginPowerSaverHelper::ShouldThrottleContent(
if (cross_origin_main_content)
*cross_origin_main_content = false;
+ if (plugin_module_name == content::kAlwaysThrottleTestPluginName)
jam 2015/05/18 15:44:04 we shouldn't have knowledge of this test plugin na
+ return true;
+
// This feature has only been tested throughly with Flash thus far.
// It is also enabled for the Power Saver test plugin for browser tests.
if (plugin_module_name != content::kFlashPluginName &&

Powered by Google App Engine
This is Rietveld 408576698