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

Side by Side Diff: Source/core/css/FontFaceSet.cpp

Issue 327773004: Remove include of StyleResolverState.h from StyleResolver.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased for landing Created 6 years, 6 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 | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/resolver/StyleResolver.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 (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/css/FontFaceSet.h" 27 #include "core/css/FontFaceSet.h"
28 28
29 #include "bindings/v8/Dictionary.h" 29 #include "bindings/v8/Dictionary.h"
30 #include "bindings/v8/ScriptPromiseResolverWithContext.h" 30 #include "bindings/v8/ScriptPromiseResolverWithContext.h"
31 #include "bindings/v8/ScriptState.h" 31 #include "bindings/v8/ScriptState.h"
32 #include "core/css/CSSFontFaceLoadEvent.h" 32 #include "core/css/CSSFontFaceLoadEvent.h"
33 #include "core/css/CSSFontSelector.h" 33 #include "core/css/CSSFontSelector.h"
34 #include "core/css/parser/BisonCSSParser.h"
35 #include "core/css/CSSSegmentedFontFace.h" 34 #include "core/css/CSSSegmentedFontFace.h"
36 #include "core/css/FontFaceCache.h" 35 #include "core/css/FontFaceCache.h"
37 #include "core/css/StylePropertySet.h" 36 #include "core/css/StylePropertySet.h"
37 #include "core/css/parser/BisonCSSParser.h"
38 #include "core/css/resolver/StyleResolver.h" 38 #include "core/css/resolver/StyleResolver.h"
39 #include "core/dom/Document.h" 39 #include "core/dom/Document.h"
40 #include "core/dom/StyleEngine.h" 40 #include "core/dom/StyleEngine.h"
41 #include "core/frame/FrameView.h" 41 #include "core/frame/FrameView.h"
42 #include "core/frame/LocalFrame.h" 42 #include "core/frame/LocalFrame.h"
43 #include "core/rendering/style/StyleInheritedData.h"
43 #include "platform/RuntimeEnabledFeatures.h" 44 #include "platform/RuntimeEnabledFeatures.h"
44 #include "public/platform/Platform.h" 45 #include "public/platform/Platform.h"
45 46
46 namespace WebCore { 47 namespace WebCore {
47 48
48 static const int defaultFontSize = 10; 49 static const int defaultFontSize = 10;
49 static const char defaultFontFamily[] = "sans-serif"; 50 static const char defaultFontFamily[] = "sans-serif";
50 51
51 class LoadFontPromiseResolver FINAL : public FontFace::LoadFontCallback { 52 class LoadFontPromiseResolver FINAL : public FontFace::LoadFontCallback {
52 public: 53 public:
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 visitor->trace(m_loadingFonts); 585 visitor->trace(m_loadingFonts);
585 visitor->trace(m_loadedFonts); 586 visitor->trace(m_loadedFonts);
586 visitor->trace(m_failedFonts); 587 visitor->trace(m_failedFonts);
587 visitor->trace(m_nonCSSConnectedFaces); 588 visitor->trace(m_nonCSSConnectedFaces);
588 DocumentSupplement::trace(visitor); 589 DocumentSupplement::trace(visitor);
589 EventTargetWithInlineData::trace(visitor); 590 EventTargetWithInlineData::trace(visitor);
590 } 591 }
591 #endif 592 #endif
592 593
593 } // namespace WebCore 594 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698