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

Side by Side Diff: content/browser/plugin_process_host.cc

Issue 6614030: Revert 76840 - Removed GPU plugin.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/pepper_uitest.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/plugin_process_host.h" 5 #include "content/browser/plugin_process_host.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #elif defined(OS_POSIX) 9 #elif defined(OS_POSIX)
10 #include <utility> // for pair<> 10 #include <utility> // for pair<>
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 switches::kFullMemoryCrashReport, 214 switches::kFullMemoryCrashReport,
215 switches::kEnableLogging, 215 switches::kEnableLogging,
216 switches::kDisableLogging, 216 switches::kDisableLogging,
217 switches::kLoggingLevel, 217 switches::kLoggingLevel,
218 switches::kLogPluginMessages, 218 switches::kLogPluginMessages,
219 switches::kUserDataDir, 219 switches::kUserDataDir,
220 switches::kEnableDCHECK, 220 switches::kEnableDCHECK,
221 switches::kSilentDumpOnDCHECK, 221 switches::kSilentDumpOnDCHECK,
222 switches::kMemoryProfiling, 222 switches::kMemoryProfiling,
223 switches::kEnableStatsTable, 223 switches::kEnableStatsTable,
224 switches::kEnableGPUPlugin,
224 switches::kUseGL, 225 switches::kUseGL,
225 #if defined(OS_CHROMEOS) 226 #if defined(OS_CHROMEOS)
226 switches::kLoginProfile, 227 switches::kLoginProfile,
227 #endif 228 #endif
228 }; 229 };
229 230
230 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 231 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
231 arraysize(kSwitchNames)); 232 arraysize(kSwitchNames));
232 233
233 // If specified, prepend a launcher program to the command line. 234 // If specified, prepend a launcher program to the command line.
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 const std::vector<uint8>& data) { 474 const std::vector<uint8>& data) {
474 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 475 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
475 476
476 ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path); 477 ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path);
477 if (chrome_plugin) { 478 if (chrome_plugin) {
478 void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0])); 479 void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
479 uint32 data_len = static_cast<uint32>(data.size()); 480 uint32 data_len = static_cast<uint32>(data.size());
480 chrome_plugin->functions().on_message(data_ptr, data_len); 481 chrome_plugin->functions().on_message(data_ptr, data_len);
481 } 482 }
482 } 483 }
OLDNEW
« no previous file with comments | « chrome/test/ui/pepper_uitest.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698