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

Side by Side Diff: src/utils/win/SkAutoCoInitialize.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/utils/mac/SkCreateCGImageRef.cpp ('k') | src/utils/win/SkDWrite.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #define WIN32_LEAN_AND_MEAN 10 #define WIN32_LEAN_AND_MEAN
11 #include <windows.h> 11 #include <windows.h>
12 #include <ole2.h> 12 #include <ole2.h>
13 #include "SkAutoCoInitialize.h" 13 #include "SkAutoCoInitialize.h"
14 14
15 SkAutoCoInitialize::SkAutoCoInitialize() : 15 SkAutoCoInitialize::SkAutoCoInitialize() :
16 fHR( 16 fHR(
17 CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) 17 CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DD E)
18 ) 18 )
19 { } 19 { }
20 20
21 SkAutoCoInitialize::~SkAutoCoInitialize() { 21 SkAutoCoInitialize::~SkAutoCoInitialize() {
22 if (SUCCEEDED(this->fHR)) { 22 if (SUCCEEDED(this->fHR)) {
23 CoUninitialize(); 23 CoUninitialize();
24 } 24 }
25 } 25 }
26 26
27 bool SkAutoCoInitialize::succeeded() { 27 bool SkAutoCoInitialize::succeeded() {
28 return SUCCEEDED(this->fHR) || RPC_E_CHANGED_MODE == this->fHR; 28 return SUCCEEDED(this->fHR) || RPC_E_CHANGED_MODE == this->fHR;
29 } 29 }
OLDNEW
« no previous file with comments | « src/utils/mac/SkCreateCGImageRef.cpp ('k') | src/utils/win/SkDWrite.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698