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

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

Issue 14190004: Absolutify paths to loader/*. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: hmm 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/CSSFontSelector.h ('k') | Source/core/css/CSSImageSetValue.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) 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 19 matching lines...) Expand all
30 #include "CSSFontFace.h" 30 #include "CSSFontFace.h"
31 #include "CSSFontFaceRule.h" 31 #include "CSSFontFaceRule.h"
32 #include "CSSFontFaceSource.h" 32 #include "CSSFontFaceSource.h"
33 #include "CSSFontFaceSrcValue.h" 33 #include "CSSFontFaceSrcValue.h"
34 #include "CSSPrimitiveValue.h" 34 #include "CSSPrimitiveValue.h"
35 #include "CSSPropertyNames.h" 35 #include "CSSPropertyNames.h"
36 #include "CSSSegmentedFontFace.h" 36 #include "CSSSegmentedFontFace.h"
37 #include "CSSUnicodeRangeValue.h" 37 #include "CSSUnicodeRangeValue.h"
38 #include "CSSValueKeywords.h" 38 #include "CSSValueKeywords.h"
39 #include "CSSValueList.h" 39 #include "CSSValueList.h"
40 #include "CachedFont.h"
41 #include "CachedResourceLoader.h"
42 #include "Document.h" 40 #include "Document.h"
43 #include "Frame.h" 41 #include "Frame.h"
44 #include "Settings.h" 42 #include "Settings.h"
45 #include "StylePropertySet.h" 43 #include "StylePropertySet.h"
46 #include "StyleResolver.h" 44 #include "StyleResolver.h"
47 #include "StyleRule.h" 45 #include "StyleRule.h"
48 #include "WebKitFontFamilyNames.h" 46 #include "WebKitFontFamilyNames.h"
49 #include "core/loader/FrameLoader.h" 47 #include "core/loader/FrameLoader.h"
48 #include "core/loader/cache/CachedFont.h"
49 #include "core/loader/cache/CachedResourceLoader.h"
50 #include "core/platform/graphics/FontCache.h" 50 #include "core/platform/graphics/FontCache.h"
51 #include "core/platform/graphics/SimpleFontData.h" 51 #include "core/platform/graphics/SimpleFontData.h"
52 #include "core/rendering/RenderObject.h" 52 #include "core/rendering/RenderObject.h"
53 #include <wtf/text/AtomicString.h> 53 #include <wtf/text/AtomicString.h>
54 54
55 #if ENABLE(SVG) 55 #if ENABLE(SVG)
56 #include "SVGFontFaceElement.h" 56 #include "SVGFontFaceElement.h"
57 #include "SVGNames.h" 57 #include "SVGNames.h"
58 #endif 58 #endif
59 59
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 } 602 }
603 // Ensure that if the request count reaches zero, the frame loader will know about it. 603 // Ensure that if the request count reaches zero, the frame loader will know about it.
604 cachedResourceLoader->loadDone(0); 604 cachedResourceLoader->loadDone(0);
605 // New font loads may be triggered by layout after the document load is comp lete but before we have dispatched 605 // New font loads may be triggered by layout after the document load is comp lete but before we have dispatched
606 // didFinishLoading for the frame. Make sure the delegate is always dispatch ed by checking explicitly. 606 // didFinishLoading for the frame. Make sure the delegate is always dispatch ed by checking explicitly.
607 if (m_document && m_document->frame()) 607 if (m_document && m_document->frame())
608 m_document->frame()->loader()->checkLoadComplete(); 608 m_document->frame()->loader()->checkLoadComplete();
609 } 609 }
610 610
611 } 611 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontSelector.h ('k') | Source/core/css/CSSImageSetValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698