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

Side by Side Diff: Source/platform/fonts/skia/SimpleFontDataSkia.cpp

Issue 209083003: Remove unnecessary ifdefs from font code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « Source/platform/fonts/SimpleFontData.h ('k') | no next file » | 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 (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include <unicode/normlzr.h> 34 #include <unicode/normlzr.h>
35 #include "SkPaint.h" 35 #include "SkPaint.h"
36 #include "SkPath.h" 36 #include "SkPath.h"
37 #include "SkTypeface.h" 37 #include "SkTypeface.h"
38 #include "SkTypes.h" 38 #include "SkTypes.h"
39 #include "platform/fonts/FontDescription.h" 39 #include "platform/fonts/FontDescription.h"
40 #include "platform/fonts/VDMXParser.h" 40 #include "platform/fonts/VDMXParser.h"
41 #include "platform/geometry/FloatRect.h" 41 #include "platform/geometry/FloatRect.h"
42 #include "wtf/unicode/Unicode.h" 42 #include "wtf/unicode/Unicode.h"
43 43
44 #if OS(WIN)
45 #include "platform/win/HWndDC.h"
46 #endif
47
48 namespace WebCore { 44 namespace WebCore {
49 45
50 // This is the largest VDMX table which we'll try to load and parse. 46 // This is the largest VDMX table which we'll try to load and parse.
51 static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB 47 static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB
52 48
53 void SimpleFontData::platformInit() 49 void SimpleFontData::platformInit()
54 { 50 {
55 if (!m_platformData.size()) { 51 if (!m_platformData.size()) {
56 m_fontMetrics.reset(); 52 m_fontMetrics.reset();
57 m_avgCharWidth = 0; 53 m_avgCharWidth = 0;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 paint.setTextEncoding(SkPaint::kUTF16_TextEncoding); 272 paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
277 if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) { 273 if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) {
278 addResult.storedValue->value = true; 274 addResult.storedValue->value = true;
279 return true; 275 return true;
280 } 276 }
281 return false; 277 return false;
282 } 278 }
283 #endif 279 #endif
284 280
285 } // namespace WebCore 281 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/SimpleFontData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698