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

Unified Diff: content/renderer/pepper/content_renderer_pepper_host_factory.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/content_renderer_pepper_host_factory.cc
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
index 67f49ad97877bf8cdcd6603a406e8da1d184b3e3..9d7fae63416eac0a78a9103e428f67e4b6c1ca13 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "content/common/content_switches_internal.h"
#include "content/public/common/content_client.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/pepper/pepper_audio_input_host.h"
@@ -35,9 +36,7 @@
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#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::host::ResourceHost;
@@ -145,10 +144,8 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost(
// 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())
image_type = ppapi::PPB_ImageData_Shared::SIMPLE;
- }
#endif
scoped_refptr<PPB_ImageData_Impl> image_data(new PPB_ImageData_Impl(
instance, image_type));

Powered by Google App Engine
This is Rietveld 408576698