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

Side by Side Diff: skia/ext/SkFontHost_fontconfig.cpp

Issue 12096101: Roll Skia DEPS to 7502 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | skia/skia.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libs/graphics/ports/SkFontHost_fontconfig.cpp 1 /* libs/graphics/ports/SkFontHost_fontconfig.cpp
2 ** 2 **
3 ** Copyright 2008, Google Inc. 3 ** Copyright 2008, Google Inc.
4 ** 4 **
5 ** Licensed under the Apache License, Version 2.0 (the "License"); 5 ** Licensed under the Apache License, Version 2.0 (the "License");
6 ** you may not use this file except in compliance with the License. 6 ** you may not use this file except in compliance with the License.
7 ** You may obtain a copy of the License at 7 ** You may obtain a copy of the License at
8 ** 8 **
9 ** http://www.apache.org/licenses/LICENSE-2.0 9 ** http://www.apache.org/licenses/LICENSE-2.0
10 ** 10 **
(...skipping 14 matching lines...) Expand all
25 // ----------------------------------------------------------------------------- 25 // -----------------------------------------------------------------------------
26 26
27 #include <map> 27 #include <map>
28 #include <string> 28 #include <string>
29 29
30 #include <sys/mman.h> 30 #include <sys/mman.h>
31 #include <sys/stat.h> 31 #include <sys/stat.h>
32 #include <unistd.h> 32 #include <unistd.h>
33 33
34 #include "base/compiler_specific.h" 34 #include "base/compiler_specific.h"
35 #include "third_party/skia/src/ports/SkFontDescriptor.h" 35 #include "third_party/skia/src/core/SkFontDescriptor.h"
36 #include "SkFontHost.h" 36 #include "SkFontHost.h"
37 #include "SkStream.h" 37 #include "SkStream.h"
38 #include "SkFontHost_fontconfig_control.h" 38 #include "SkFontHost_fontconfig_control.h"
39 #include "SkFontHost_fontconfig_impl.h" 39 #include "SkFontHost_fontconfig_impl.h"
40 #include "SkFontHost_fontconfig_direct.h" 40 #include "SkFontHost_fontconfig_direct.h"
41 41
42 static FontConfigInterface* global_fc_impl = NULL; 42 static FontConfigInterface* global_fc_impl = NULL;
43 43
44 void SkiaFontConfigUseDirectImplementation() { 44 void SkiaFontConfigUseDirectImplementation() {
45 if (global_fc_impl) 45 if (global_fc_impl)
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 if (!path) 360 if (!path)
361 return 1; 361 return 1;
362 } 362 }
363 363
364 if (path) 364 if (path)
365 SkASSERT(!"SkFontHost::GetFileName does not support the font path " 365 SkASSERT(!"SkFontHost::GetFileName does not support the font path "
366 "retrieval."); 366 "retrieval.");
367 367
368 return 0; 368 return 0;
369 } 369 }
OLDNEW
« no previous file with comments | « DEPS ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698