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

Side by Side Diff: content/renderer/pepper/resource_creation_impl.cc

Issue 857123002: Disable Win32k renderer lockdown if DirectWrite is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cloudprint 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 unified diff | Download patch
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/renderer/pepper/resource_creation_impl.h" 5 #include "content/renderer/pepper/resource_creation_impl.h"
6 6
7 #include "content/renderer/pepper/ppb_audio_impl.h" 7 #include "content/renderer/pepper/ppb_audio_impl.h"
8 #include "content/renderer/pepper/ppb_broker_impl.h" 8 #include "content/renderer/pepper/ppb_broker_impl.h"
9 #include "content/renderer/pepper/ppb_buffer_impl.h" 9 #include "content/renderer/pepper/ppb_buffer_impl.h"
10 #include "content/renderer/pepper/ppb_flash_message_loop_impl.h" 10 #include "content/renderer/pepper/ppb_flash_message_loop_impl.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 const PP_Size* size, 133 const PP_Size* size,
134 PP_Bool init_to_zero) { 134 PP_Bool init_to_zero) {
135 #if defined(OS_WIN) 135 #if defined(OS_WIN)
136 // If Win32K lockdown mitigations are enabled for Windows 8 and beyond, 136 // If Win32K lockdown mitigations are enabled for Windows 8 and beyond,
137 // we use the SIMPLE image data type as the PLATFORM image data type 137 // we use the SIMPLE image data type as the PLATFORM image data type
138 // calls GDI functions to create DIB sections etc which fail in Win32K 138 // calls GDI functions to create DIB sections etc which fail in Win32K
139 // lockdown mode. 139 // lockdown mode.
140 // TODO(ananta) 140 // TODO(ananta)
141 // Look into whether this causes a loss of functionality. From cursory 141 // Look into whether this causes a loss of functionality. From cursory
142 // testing things seem to work well. 142 // testing things seem to work well.
143 if (switches::IsWin32kRendererLockdownEnabled() && 143 if (switches::IsWin32kRendererLockdownEnabled(false)) {
144 base::win::GetVersion() >= base::win::VERSION_WIN8) {
145 return CreateImageDataSimple(instance, format, size, init_to_zero); 144 return CreateImageDataSimple(instance, format, size, init_to_zero);
146 } 145 }
147 #endif 146 #endif
148 return PPB_ImageData_Impl::Create(instance, 147 return PPB_ImageData_Impl::Create(instance,
149 ppapi::PPB_ImageData_Shared::PLATFORM, 148 ppapi::PPB_ImageData_Shared::PLATFORM,
150 format, 149 format,
151 *size, 150 *size,
152 init_to_zero); 151 init_to_zero);
153 } 152 }
154 153
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 wheel_ticks, 358 wheel_ticks,
360 scroll_by_page); 359 scroll_by_page);
361 } 360 }
362 361
363 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate( 362 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate(
364 PP_Instance instance) { 363 PP_Instance instance) {
365 return 0; // Not supported in-process. 364 return 0; // Not supported in-process.
366 } 365 }
367 366
368 } // namespace content 367 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698