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

Side by Side Diff: src/ports/SkOSFile_win.cpp

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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/ports/SkOSFile_posix.cpp ('k') | src/sfnt/SkIBMFamilyClass.h » ('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 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkOSFile.h" 8 #include "SkOSFile.h"
9 9
10 #include "SkTFitsIn.h" 10 #include "SkTFitsIn.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return sk_fdmmap(fileno, length); 121 return sk_fdmmap(fileno, length);
122 } 122 }
123 123
124 //////////////////////////////////////////////////////////////////////////// 124 ////////////////////////////////////////////////////////////////////////////
125 125
126 struct SkOSFileIterData { 126 struct SkOSFileIterData {
127 SkOSFileIterData() : fHandle(0), fPath16(NULL) { } 127 SkOSFileIterData() : fHandle(0), fPath16(NULL) { }
128 HANDLE fHandle; 128 HANDLE fHandle;
129 uint16_t* fPath16; 129 uint16_t* fPath16;
130 }; 130 };
131 SK_COMPILE_ASSERT(sizeof(SkOSFileIterData) <= SkOSFile::Iter::kStorageSize, not_ enough_space); 131 static_assert(sizeof(SkOSFileIterData) <= SkOSFile::Iter::kStorageSize, "not_eno ugh_space");
132 132
133 static uint16_t* concat_to_16(const char src[], const char suffix[]) { 133 static uint16_t* concat_to_16(const char src[], const char suffix[]) {
134 size_t i, len = strlen(src); 134 size_t i, len = strlen(src);
135 size_t len2 = 3 + (suffix ? strlen(suffix) : 0); 135 size_t len2 = 3 + (suffix ? strlen(suffix) : 0);
136 uint16_t* dst = (uint16_t*)sk_malloc_throw((len + len2) * sizeof(uint16_t)); 136 uint16_t* dst = (uint16_t*)sk_malloc_throw((len + len2) * sizeof(uint16_t));
137 137
138 for (i = 0; i < len; i++) { 138 for (i = 0; i < len; i++) {
139 dst[i] = src[i]; 139 dst[i] = src[i];
140 } 140 }
141 141
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 return false; 235 return false;
236 } 236 }
237 237
238 self.fHandle = ::FindFirstFileW((LPCWSTR)self.fPath16, &data); 238 self.fHandle = ::FindFirstFileW((LPCWSTR)self.fPath16, &data);
239 if (self.fHandle != 0 && self.fHandle != (HANDLE)~0) { 239 if (self.fHandle != 0 && self.fHandle != (HANDLE)~0) {
240 dataPtr = &data; 240 dataPtr = &data;
241 } 241 }
242 } 242 }
243 return self.fHandle != (HANDLE)~0 && get_the_file(self.fHandle, name, dataPt r, getDir); 243 return self.fHandle != (HANDLE)~0 && get_the_file(self.fHandle, name, dataPt r, getDir);
244 } 244 }
OLDNEW
« no previous file with comments | « src/ports/SkOSFile_posix.cpp ('k') | src/sfnt/SkIBMFamilyClass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698