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

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

Issue 2848243004: Clean up bindings/core/v8 (Part 2) (Closed)
Patch Set: Rebase Created 3 years, 7 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) 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #include "core/css/FontFaceSet.h" 26 #include "core/css/FontFaceSet.h"
27 27
28 #include "bindings/core/v8/Dictionary.h" 28 #include "bindings/core/v8/Dictionary.h"
29 #include "bindings/core/v8/ScriptPromiseResolver.h" 29 #include "bindings/core/v8/ScriptPromiseResolver.h"
30 #include "bindings/core/v8/ScriptState.h"
31 #include "core/css/CSSFontSelector.h" 30 #include "core/css/CSSFontSelector.h"
32 #include "core/css/CSSSegmentedFontFace.h" 31 #include "core/css/CSSSegmentedFontFace.h"
33 #include "core/css/FontFaceCache.h" 32 #include "core/css/FontFaceCache.h"
34 #include "core/css/FontFaceSetLoadEvent.h" 33 #include "core/css/FontFaceSetLoadEvent.h"
35 #include "core/css/StylePropertySet.h" 34 #include "core/css/StylePropertySet.h"
36 #include "core/css/parser/CSSParser.h" 35 #include "core/css/parser/CSSParser.h"
37 #include "core/css/resolver/StyleResolver.h" 36 #include "core/css/resolver/StyleResolver.h"
38 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
39 #include "core/dom/StyleEngine.h" 38 #include "core/dom/StyleEngine.h"
40 #include "core/frame/FrameView.h" 39 #include "core/frame/FrameView.h"
41 #include "core/frame/LocalFrame.h" 40 #include "core/frame/LocalFrame.h"
42 #include "core/style/ComputedStyle.h" 41 #include "core/style/ComputedStyle.h"
43 #include "platform/Histogram.h" 42 #include "platform/Histogram.h"
43 #include "platform/bindings/ScriptState.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 static const int kDefaultFontSize = 10; 47 static const int kDefaultFontSize = 10;
48 static const char kDefaultFontFamily[] = "sans-serif"; 48 static const char kDefaultFontFamily[] = "sans-serif";
49 49
50 class LoadFontPromiseResolver final 50 class LoadFontPromiseResolver final
51 : public GarbageCollectedFinalized<LoadFontPromiseResolver>, 51 : public GarbageCollectedFinalized<LoadFontPromiseResolver>,
52 public FontFace::LoadFontCallback { 52 public FontFace::LoadFontCallback {
53 USING_GARBAGE_COLLECTED_MIXIN(LoadFontPromiseResolver); 53 USING_GARBAGE_COLLECTED_MIXIN(LoadFontPromiseResolver);
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 visitor->Trace(failed_fonts_); 575 visitor->Trace(failed_fonts_);
576 visitor->Trace(non_css_connected_faces_); 576 visitor->Trace(non_css_connected_faces_);
577 visitor->Trace(async_runner_); 577 visitor->Trace(async_runner_);
578 EventTargetWithInlineData::Trace(visitor); 578 EventTargetWithInlineData::Trace(visitor);
579 Supplement<Document>::Trace(visitor); 579 Supplement<Document>::Trace(visitor);
580 SuspendableObject::Trace(visitor); 580 SuspendableObject::Trace(visitor);
581 FontFace::LoadFontCallback::Trace(visitor); 581 FontFace::LoadFontCallback::Trace(visitor);
582 } 582 }
583 583
584 } // namespace blink 584 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/MediaList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698