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

Side by Side Diff: content/ppapi_plugin/ppapi_thread.cc

Issue 228783003: Remove AMD family check for the flapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ppapi_plugin/ppapi_thread.h" 5 #include "content/ppapi_plugin/ppapi_thread.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/cpu.h" 10 #include "base/cpu.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 // Let Flash load DXVA before lockdown on Vista+. 341 // Let Flash load DXVA before lockdown on Vista+.
342 if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) { 342 if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) {
343 if (base::win::OSInfo::GetInstance()->version() >= 343 if (base::win::OSInfo::GetInstance()->version() >=
344 base::win::VERSION_VISTA) { 344 base::win::VERSION_VISTA) {
345 LoadLibraryA("dxva2.dll"); 345 LoadLibraryA("dxva2.dll");
346 } 346 }
347 347
348 if (base::win::OSInfo::GetInstance()->version() >= 348 if (base::win::OSInfo::GetInstance()->version() >=
349 base::win::VERSION_WIN7) { 349 base::win::VERSION_WIN7) {
350 base::CPU cpu; 350 base::CPU cpu;
351 if ((cpu.vendor_name() == "AuthenticAMD") && (cpu.family() > 0x14)) { 351 if (cpu.vendor_name() == "AuthenticAMD") {
352 // The AMD crypto acceleration is only AMD Bulldozer and above. 352 // The AMD crypto acceleration is only AMD Bulldozer and above.
353 #if defined(_WIN64) 353 #if defined(_WIN64)
354 LoadLibraryA("amdhcp64.dll"); 354 LoadLibraryA("amdhcp64.dll");
355 #else 355 #else
356 LoadLibraryA("amdhcp32.dll"); 356 LoadLibraryA("amdhcp32.dll");
357 #endif 357 #endif
358 } 358 }
359 } 359 }
360 } 360 }
361 361
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 std::string("Plugin.Ppapi") + (is_broker_ ? "Broker" : "Plugin") + 548 std::string("Plugin.Ppapi") + (is_broker_ ? "Broker" : "Plugin") +
549 "LoadErrorCode_" + path.BaseName().MaybeAsASCII(); 549 "LoadErrorCode_" + path.BaseName().MaybeAsASCII();
550 550
551 // For sparse histograms, we can use the macro, as it does not incorporate a 551 // For sparse histograms, we can use the macro, as it does not incorporate a
552 // static. 552 // static.
553 UMA_HISTOGRAM_SPARSE_SLOWLY(histogram_name, error.code); 553 UMA_HISTOGRAM_SPARSE_SLOWLY(histogram_name, error.code);
554 #endif 554 #endif
555 } 555 }
556 556
557 } // namespace content 557 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698