| OLD | NEW |
| 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 Loading... |
| 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" |
| 43 #include "core/frame/FrameView.h" | 44 #include "core/frame/FrameView.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 : public CSSSegmentedFontFace::LoadFontCallback { | 52 class LoadFontPromiseResolver : public CSSSegmentedFontFace::LoadFontCallback { |
| 52 public: | 53 public: |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 } | 456 } |
| 456 | 457 |
| 457 void FontFaceSet::didLayout(Document* document) | 458 void FontFaceSet::didLayout(Document* document) |
| 458 { | 459 { |
| 459 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu
ment, supplementName()))) | 460 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu
ment, supplementName()))) |
| 460 fonts->didLayout(); | 461 fonts->didLayout(); |
| 461 } | 462 } |
| 462 | 463 |
| 463 | 464 |
| 464 } // namespace WebCore | 465 } // namespace WebCore |
| OLD | NEW |