Do not use win32k renderer lockdown if DirectWrite is disabled.

content/renderer/pepper/resource_creation_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "content/renderer/pepper/ppb_flash_message_loop_impl.h"
 #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
 #include "content/renderer/pepper/ppb_image_data_impl.h"
 #include "content/renderer/pepper/ppb_scrollbar_impl.h"
 #include "content/renderer/pepper/ppb_video_decoder_impl.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
 #include "ppapi/shared_impl/ppb_audio_shared.h"
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/var.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::InputEventData;
 using ppapi::PPB_InputEvent_Shared;
 using ppapi::StringVar;
 
 namespace content {
 
 ResourceCreationImpl::ResourceCreationImpl(PepperPluginInstanceImpl* instance) {
 }
@@ skipping 95 matching lines @@
                                                   const PP_Size* size,
                                                   PP_Bool init_to_zero) {
 #if defined(OS_WIN)
   // If Win32K lockdown mitigations are enabled for Windows 8 and beyond,
   // we use the SIMPLE image data type as the PLATFORM image data type
   // calls GDI functions to create DIB sections etc which fail in Win32K
   // lockdown mode.
   // 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,
                                     format,
                                     *size,
                                     init_to_zero);
 }
 
 PP_Resource ResourceCreationImpl::CreateImageDataSimple(
     PP_Instance instance,
@@ skipping 202 matching lines @@
                                                       wheel_ticks,
                                                       scroll_by_page);
 }
 
 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate(
     PP_Instance instance) {
   return 0;  // Not supported in-process.
 }
 
 }  // namespace content