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

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

Issue 73623006: Revert 162180 "[Refactoring] Remove include "core/inspector/Insp..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 1 month 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 | « trunk/Source/core/css/ElementRuleCollector.cpp ('k') | trunk/Source/core/css/SelectorChecker.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 22 matching lines...) Expand all
33 #include "bindings/v8/ScriptScope.h" 33 #include "bindings/v8/ScriptScope.h"
34 #include "bindings/v8/ScriptState.h" 34 #include "bindings/v8/ScriptState.h"
35 #include "core/css/CSSFontFaceLoadEvent.h" 35 #include "core/css/CSSFontFaceLoadEvent.h"
36 #include "core/css/CSSFontFaceSource.h" 36 #include "core/css/CSSFontFaceSource.h"
37 #include "core/css/CSSFontSelector.h" 37 #include "core/css/CSSFontSelector.h"
38 #include "core/css/CSSParser.h" 38 #include "core/css/CSSParser.h"
39 #include "core/css/CSSSegmentedFontFace.h" 39 #include "core/css/CSSSegmentedFontFace.h"
40 #include "core/css/StylePropertySet.h" 40 #include "core/css/StylePropertySet.h"
41 #include "core/css/resolver/StyleResolver.h" 41 #include "core/css/resolver/StyleResolver.h"
42 #include "core/dom/Document.h" 42 #include "core/dom/Document.h"
43 #include "core/frame/Frame.h"
44 #include "core/frame/FrameView.h" 43 #include "core/frame/FrameView.h"
45 #include "public/platform/Platform.h" 44 #include "public/platform/Platform.h"
46 45
47 namespace WebCore { 46 namespace WebCore {
48 47
49 static const int defaultFontSize = 10; 48 static const int defaultFontSize = 10;
50 static const char defaultFontFamily[] = "sans-serif"; 49 static const char defaultFontFamily[] = "sans-serif";
51 50
52 class LoadFontPromiseResolver : public CSSSegmentedFontFace::LoadFontCallback { 51 class LoadFontPromiseResolver : public CSSSegmentedFontFace::LoadFontCallback {
53 public: 52 public:
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 } 455 }
457 456
458 void FontFaceSet::didLayout(Document* document) 457 void FontFaceSet::didLayout(Document* document)
459 { 458 {
460 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu ment, supplementName()))) 459 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu ment, supplementName())))
461 fonts->didLayout(); 460 fonts->didLayout();
462 } 461 }
463 462
464 463
465 } // namespace WebCore 464 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/css/ElementRuleCollector.cpp ('k') | trunk/Source/core/css/SelectorChecker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698