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

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

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 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/FontLoader.h ('k') | Source/core/css/FontValue.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
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 "config.h" 26 #include "config.h"
27 #include "core/css/FontLoader.h" 27 #include "core/css/FontLoader.h"
28 28
29 #include "Dictionary.h" 29 #include "Dictionary.h"
30 #include "Document.h"
31 #include "core/css/CSSFontFaceLoadEvent.h" 30 #include "core/css/CSSFontFaceLoadEvent.h"
32 #include "core/css/CSSFontFaceSource.h" 31 #include "core/css/CSSFontFaceSource.h"
33 #include "core/css/CSSFontSelector.h" 32 #include "core/css/CSSFontSelector.h"
34 #include "core/css/CSSParser.h" 33 #include "core/css/CSSParser.h"
35 #include "core/css/CSSSegmentedFontFace.h" 34 #include "core/css/CSSSegmentedFontFace.h"
36 #include "core/css/StylePropertySet.h" 35 #include "core/css/StylePropertySet.h"
37 #include "core/css/StyleResolver.h" 36 #include "core/css/StyleResolver.h"
37 #include "core/dom/Document.h"
38 #include "core/page/FrameView.h" 38 #include "core/page/FrameView.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 static const int defaultFontSize = 10; 42 static const int defaultFontSize = 10;
43 static const char* const defaultFontFamily = "sans-serif"; 43 static const char* const defaultFontFamily = "sans-serif";
44 44
45 class LoadFontCallback : public CSSSegmentedFontFace::LoadFontCallback { 45 class LoadFontCallback : public CSSSegmentedFontFace::LoadFontCallback {
46 public: 46 public:
47 static PassRefPtr<LoadFontCallback> create(int numLoading, PassRefPtr<VoidCa llback> loadCallback, PassRefPtr<VoidCallback> errorCallback) 47 static PassRefPtr<LoadFontCallback> create(int numLoading, PassRefPtr<VoidCa llback> loadCallback, PassRefPtr<VoidCallback> errorCallback)
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontSize, parsedStyle) ; 343 applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontSize, parsedStyle) ;
344 styleResolver->updateFont(); 344 styleResolver->updateFont();
345 applyPropertyToCurrentStyle(styleResolver, CSSPropertyLineHeight, parsedStyl e); 345 applyPropertyToCurrentStyle(styleResolver, CSSPropertyLineHeight, parsedStyl e);
346 346
347 font = style->font(); 347 font = style->font();
348 font.update(styleResolver->fontSelector()); 348 font.update(styleResolver->fontSelector());
349 return true; 349 return true;
350 } 350 }
351 351
352 } // namespace WebCore 352 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/FontLoader.h ('k') | Source/core/css/FontValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698