| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 #include "sky/engine/core/css/StylePropertySet.h" | 53 #include "sky/engine/core/css/StylePropertySet.h" |
| 54 #include "sky/engine/core/css/StyleSheetContents.h" | 54 #include "sky/engine/core/css/StyleSheetContents.h" |
| 55 #include "sky/engine/core/css/parser/BisonCSSParser.h" | 55 #include "sky/engine/core/css/parser/BisonCSSParser.h" |
| 56 #include "sky/engine/core/css/resolver/AnimatedStyleBuilder.h" | 56 #include "sky/engine/core/css/resolver/AnimatedStyleBuilder.h" |
| 57 #include "sky/engine/core/css/resolver/MatchResult.h" | 57 #include "sky/engine/core/css/resolver/MatchResult.h" |
| 58 #include "sky/engine/core/css/resolver/SharedStyleFinder.h" | 58 #include "sky/engine/core/css/resolver/SharedStyleFinder.h" |
| 59 #include "sky/engine/core/css/resolver/StyleAdjuster.h" | 59 #include "sky/engine/core/css/resolver/StyleAdjuster.h" |
| 60 #include "sky/engine/core/css/resolver/StyleBuilder.h" | 60 #include "sky/engine/core/css/resolver/StyleBuilder.h" |
| 61 #include "sky/engine/core/css/resolver/StyleResolverState.h" | 61 #include "sky/engine/core/css/resolver/StyleResolverState.h" |
| 62 #include "sky/engine/core/css/resolver/StyleResolverStats.h" | 62 #include "sky/engine/core/css/resolver/StyleResolverStats.h" |
| 63 #include "sky/engine/core/css/resolver/StyleResourceLoader.h" |
| 63 #include "sky/engine/core/dom/NodeRenderStyle.h" | 64 #include "sky/engine/core/dom/NodeRenderStyle.h" |
| 64 #include "sky/engine/core/dom/StyleEngine.h" | 65 #include "sky/engine/core/dom/StyleEngine.h" |
| 65 #include "sky/engine/core/dom/Text.h" | 66 #include "sky/engine/core/dom/Text.h" |
| 66 #include "sky/engine/core/dom/shadow/ElementShadow.h" | 67 #include "sky/engine/core/dom/shadow/ElementShadow.h" |
| 67 #include "sky/engine/core/dom/shadow/ShadowRoot.h" | 68 #include "sky/engine/core/dom/shadow/ShadowRoot.h" |
| 68 #include "sky/engine/core/frame/FrameView.h" | 69 #include "sky/engine/core/frame/FrameView.h" |
| 69 #include "sky/engine/core/frame/LocalFrame.h" | 70 #include "sky/engine/core/frame/LocalFrame.h" |
| 70 #include "sky/engine/core/rendering/RenderView.h" | 71 #include "sky/engine/core/rendering/RenderView.h" |
| 71 #include "sky/engine/core/rendering/style/KeyframeList.h" | 72 #include "sky/engine/core/rendering/style/KeyframeList.h" |
| 72 #include "sky/engine/wtf/LeakAnnotations.h" | 73 #include "sky/engine/wtf/LeakAnnotations.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 styleSheet->parseString(cssText); | 111 styleSheet->parseString(cssText); |
| 111 | 112 |
| 112 ruleSet = RuleSet::create(); | 113 ruleSet = RuleSet::create(); |
| 113 ruleSet->addRulesFromSheet(styleSheet.get()); | 114 ruleSet->addRulesFromSheet(styleSheet.get()); |
| 114 | 115 |
| 115 return *ruleSet; | 116 return *ruleSet; |
| 116 } | 117 } |
| 117 | 118 |
| 118 StyleResolver::StyleResolver(Document& document) | 119 StyleResolver::StyleResolver(Document& document) |
| 119 : m_document(document) | 120 : m_document(document) |
| 120 , m_styleResourceLoader(document.fetcher()) | |
| 121 , m_styleResolverStatsSequence(0) | 121 , m_styleResolverStatsSequence(0) |
| 122 , m_accessCount(0) | 122 , m_accessCount(0) |
| 123 { | 123 { |
| 124 } | 124 } |
| 125 | 125 |
| 126 void StyleResolver::addToStyleSharingList(Element& element) | 126 void StyleResolver::addToStyleSharingList(Element& element) |
| 127 { | 127 { |
| 128 // Never add elements to the style sharing list if we're not in a recalcStyl
e, | 128 // Never add elements to the style sharing list if we're not in a recalcStyl
e, |
| 129 // otherwise we could leave stale pointers in there. | 129 // otherwise we could leave stale pointers in there. |
| 130 if (!document().inStyleRecalc()) | 130 if (!document().inStyleRecalc()) |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 documentStyle->setRTLOrdering(LogicalOrder); | 195 documentStyle->setRTLOrdering(LogicalOrder); |
| 196 documentStyle->setLocale(document.contentLanguage()); | 196 documentStyle->setLocale(document.contentLanguage()); |
| 197 documentStyle->setZIndex(0); | 197 documentStyle->setZIndex(0); |
| 198 documentStyle->setUserModify(READ_ONLY); | 198 documentStyle->setUserModify(READ_ONLY); |
| 199 | 199 |
| 200 document.setupFontBuilder(documentStyle.get()); | 200 document.setupFontBuilder(documentStyle.get()); |
| 201 | 201 |
| 202 return documentStyle.release(); | 202 return documentStyle.release(); |
| 203 } | 203 } |
| 204 | 204 |
| 205 // Start loading resources referenced by this style. | |
| 206 void StyleResolver::loadPendingResources(StyleResolverState& state) | 205 void StyleResolver::loadPendingResources(StyleResolverState& state) |
| 207 { | 206 { |
| 208 m_styleResourceLoader.loadPendingResources(state.style(), state.elementStyle
Resources()); | 207 StyleResourceLoader loader(document().fetcher()); |
| 208 loader.loadPendingResources(state.style(), state.elementStyleResources()); |
| 209 document().styleEngine()->fontSelector()->fontLoader()->loadPendingFonts(); | 209 document().styleEngine()->fontSelector()->fontLoader()->loadPendingFonts(); |
| 210 } | 210 } |
| 211 | 211 |
| 212 PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
tyle* defaultParent) | 212 PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
tyle* defaultParent) |
| 213 { | 213 { |
| 214 ASSERT(document().frame()); | 214 ASSERT(document().frame()); |
| 215 ASSERT(document().settings()); | 215 ASSERT(document().settings()); |
| 216 | 216 |
| 217 didAccess(); | 217 didAccess(); |
| 218 | 218 |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 break; | 689 break; |
| 690 default: | 690 default: |
| 691 break; | 691 break; |
| 692 } | 692 } |
| 693 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); | 693 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); |
| 694 } | 694 } |
| 695 } | 695 } |
| 696 } | 696 } |
| 697 | 697 |
| 698 } // namespace blink | 698 } // namespace blink |
| OLD | NEW |