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

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

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 29 matching lines...) Expand all
40 #include "platform/fonts/shaping/HarfBuzzShaper.h" 40 #include "platform/fonts/shaping/HarfBuzzShaper.h"
41 #include "platform/fonts/shaping/SimpleShaper.h" 41 #include "platform/fonts/shaping/SimpleShaper.h"
42 #include "platform/geometry/FloatRect.h" 42 #include "platform/geometry/FloatRect.h"
43 #include "platform/text/BidiResolver.h" 43 #include "platform/text/BidiResolver.h"
44 #include "platform/text/TextRun.h" 44 #include "platform/text/TextRun.h"
45 #include "platform/text/TextRunIterator.h" 45 #include "platform/text/TextRunIterator.h"
46 #include "platform/transforms/AffineTransform.h" 46 #include "platform/transforms/AffineTransform.h"
47 #include "third_party/skia/include/core/SkCanvas.h" 47 #include "third_party/skia/include/core/SkCanvas.h"
48 #include "third_party/skia/include/core/SkPaint.h" 48 #include "third_party/skia/include/core/SkPaint.h"
49 #include "third_party/skia/include/core/SkTextBlob.h" 49 #include "third_party/skia/include/core/SkTextBlob.h"
50 #include "wtf/MainThread.h"
51 #include "wtf/StdLibExtras.h" 50 #include "wtf/StdLibExtras.h"
52 #include "wtf/text/CharacterNames.h" 51 #include "wtf/text/CharacterNames.h"
53 #include "wtf/text/Unicode.h" 52 #include "wtf/text/Unicode.h"
54 53
55 using namespace WTF; 54 using namespace WTF;
56 using namespace Unicode; 55 using namespace Unicode;
57 56
58 namespace blink { 57 namespace blink {
59 58
60 Font::Font() 59 Font::Font()
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 { 840 {
842 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 841 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
843 } 842 }
844 843
845 bool Font::isFallbackValid() const 844 bool Font::isFallbackValid() const
846 { 845 {
847 return !m_fontFallbackList || m_fontFallbackList->isValid(); 846 return !m_fontFallbackList || m_fontFallbackList->isValid();
848 } 847 }
849 848
850 } // namespace blink 849 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698