diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:43:15 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:43:15 +0000 |
| commit | 0b537a44c49a3ce217d7e21befd84224d089d588 (patch) | |
| tree | d674da2bfd5189f1b23fe359dd760e9188ba7299 /content | |
| parent | bb837f9287259862c94155cc59cfc9e1bdfe1258 (diff) | |
| download | chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.zip chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.gz chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.bz2 | |
Revert 76840 - Removed GPU plugin.
Pepper 3D v2 does not use the GPU plugin. It is integrated with the accelerated compositor.
TEST=PPAPI 3D v2 still works, trybots
BUG=none
Review URL: http://codereview.chromium.org/6588090
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6614030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 1 | ||||
| -rw-r--r-- | content/browser/plugin_service.cc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 83cf193..4d1301a 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -221,6 +221,7 @@ bool PluginProcessHost::Init(const webkit::npapi::WebPluginInfo& info, switches::kSilentDumpOnDCHECK, switches::kMemoryProfiling, switches::kEnableStatsTable, + switches::kEnableGPUPlugin, switches::kUseGL, #if defined(OS_CHROMEOS) switches::kLoginProfile, diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 2c775ed..78f994e 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -23,6 +23,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/default_plugin.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/gpu_plugin.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/notification_type.h" #include "chrome/common/notification_service.h" @@ -133,6 +134,8 @@ PluginService::PluginService() plugin_selection_policy_->StartInit(); #endif + chrome::RegisterInternalGPUPlugin(); + // Start watching for changes in the plugin list. This means watching // for changes in the Windows registry keys and on both Windows and POSIX // watch for changes in the paths that are expected to contain plugins. |