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

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

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 8 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/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/MediaQueryEvaluator.cpp » ('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 22 matching lines...) Expand all
33 #include "core/css/CSSSegmentedFontFace.h" 33 #include "core/css/CSSSegmentedFontFace.h"
34 #include "core/css/FontFaceCache.h" 34 #include "core/css/FontFaceCache.h"
35 #include "core/css/FontFaceSetLoadEvent.h" 35 #include "core/css/FontFaceSetLoadEvent.h"
36 #include "core/css/StylePropertySet.h" 36 #include "core/css/StylePropertySet.h"
37 #include "core/css/parser/CSSParser.h" 37 #include "core/css/parser/CSSParser.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/layout/style/StyleInheritedData.h" 43 #include "core/style/StyleInheritedData.h"
44 #include "public/platform/Platform.h" 44 #include "public/platform/Platform.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 static const int defaultFontSize = 10; 48 static const int defaultFontSize = 10;
49 static const char defaultFontFamily[] = "sans-serif"; 49 static const char defaultFontFamily[] = "sans-serif";
50 50
51 class LoadFontPromiseResolver final : public FontFace::LoadFontCallback { 51 class LoadFontPromiseResolver final : public FontFace::LoadFontCallback {
52 public: 52 public:
53 static PassRefPtrWillBeRawPtr<LoadFontPromiseResolver> create(FontFaceArray faces, ScriptState* scriptState) 53 static PassRefPtrWillBeRawPtr<LoadFontPromiseResolver> create(FontFaceArray faces, ScriptState* scriptState)
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 visitor->trace(m_loadedFonts); 594 visitor->trace(m_loadedFonts);
595 visitor->trace(m_failedFonts); 595 visitor->trace(m_failedFonts);
596 visitor->trace(m_nonCSSConnectedFaces); 596 visitor->trace(m_nonCSSConnectedFaces);
597 DocumentSupplement::trace(visitor); 597 DocumentSupplement::trace(visitor);
598 #endif 598 #endif
599 EventTargetWithInlineData::trace(visitor); 599 EventTargetWithInlineData::trace(visitor);
600 ActiveDOMObject::trace(visitor); 600 ActiveDOMObject::trace(visitor);
601 } 601 }
602 602
603 } // namespace blink 603 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/MediaQueryEvaluator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698