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

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

Issue 872673002: Do not use win32k renderer lockdown if DirectWrite is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move IsWin32kRendererLockdownEnabled to content/common Created 5 years, 11 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/resource_creation_impl.cc
diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc
index 967092ef0a4799d52b2fed7f191083ae2696d535..b5eaa51d9cc5eafcf26b20f07c1ac870d513f42d 100644
--- a/content/renderer/pepper/resource_creation_impl.cc
+++ b/content/renderer/pepper/resource_creation_impl.cc
@@ -4,6 +4,7 @@
#include "content/renderer/pepper/resource_creation_impl.h"
+#include "content/common/content_switches_internal.h"
#include "content/renderer/pepper/ppb_audio_impl.h"
#include "content/renderer/pepper/ppb_broker_impl.h"
#include "content/renderer/pepper/ppb_buffer_impl.h"
@@ -24,7 +25,6 @@
#if defined(OS_WIN)
#include "base/command_line.h"
#include "base/win/windows_version.h"
-#include "content/public/common/content_switches.h"
#endif
using ppapi::InputEventData;
@@ -140,10 +140,8 @@ PP_Resource ResourceCreationImpl::CreateImageData(PP_Instance instance,
// TODO(ananta)
// Look into whether this causes a loss of functionality. From cursory
// testing things seem to work well.
- if (switches::IsWin32kRendererLockdownEnabled() &&
- base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ if (IsWin32kRendererLockdownEnabled())
return CreateImageDataSimple(instance, format, size, init_to_zero);
- }
#endif
return PPB_ImageData_Impl::Create(instance,
ppapi::PPB_ImageData_Shared::PLATFORM,

Powered by Google App Engine
This is Rietveld 408576698