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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 13 matching lines...) Expand all
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "platform/fonts/FontCache.h" 32 #include "platform/fonts/FontCache.h"
33 33
34 #include <memory>
34 #include "SkFontMgr.h" 35 #include "SkFontMgr.h"
35 #include "SkTypeface_win.h" 36 #include "SkTypeface_win.h"
36 #include "platform/Language.h" 37 #include "platform/Language.h"
37 #include "platform/RuntimeEnabledFeatures.h" 38 #include "platform/RuntimeEnabledFeatures.h"
38 #include "platform/fonts/FontDescription.h" 39 #include "platform/fonts/FontDescription.h"
39 #include "platform/fonts/FontFaceCreationParams.h" 40 #include "platform/fonts/FontFaceCreationParams.h"
40 #include "platform/fonts/FontPlatformData.h" 41 #include "platform/fonts/FontPlatformData.h"
41 #include "platform/fonts/SimpleFontData.h" 42 #include "platform/fonts/SimpleFontData.h"
42 #include "platform/fonts/win/FontFallbackWin.h" 43 #include "platform/fonts/win/FontFallbackWin.h"
43 #include "wtf/PtrUtil.h" 44 #include "wtf/PtrUtil.h"
44 #include <memory>
45 45
46 namespace blink { 46 namespace blink {
47 47
48 HashMap<String, sk_sp<SkTypeface>>* FontCache::s_sideloadedFonts = nullptr; 48 HashMap<String, sk_sp<SkTypeface>>* FontCache::s_sideloadedFonts = nullptr;
49 49
50 // Cached system font metrics. 50 // Cached system font metrics.
51 AtomicString* FontCache::s_menuFontFamilyName = nullptr; 51 AtomicString* FontCache::s_menuFontFamilyName = nullptr;
52 int32_t FontCache::s_menuFontHeight = 0; 52 int32_t FontCache::s_menuFontHeight = 0;
53 AtomicString* FontCache::s_smallCaptionFontFamilyName = nullptr; 53 AtomicString* FontCache::s_smallCaptionFontFamilyName = nullptr;
54 int32_t FontCache::s_smallCaptionFontHeight = 0; 54 int32_t FontCache::s_smallCaptionFontHeight = 0;
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 if (typefacesMatchesFamily(tf.get(), family)) { 418 if (typefacesMatchesFamily(tf.get(), family)) {
419 result->setMinSizeForSubpixel(minSizeForSubpixelForFont); 419 result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
420 break; 420 break;
421 } 421 }
422 } 422 }
423 423
424 return result; 424 return result;
425 } 425 }
426 426
427 } // namespace blink 427 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698