| 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 181 |
| 182 document.setupFontBuilder(documentStyle.get()); | 182 document.setupFontBuilder(documentStyle.get()); |
| 183 | 183 |
| 184 return documentStyle.release(); | 184 return documentStyle.release(); |
| 185 } | 185 } |
| 186 | 186 |
| 187 void StyleResolver::loadPendingResources(StyleResolverState& state) | 187 void StyleResolver::loadPendingResources(StyleResolverState& state) |
| 188 { | 188 { |
| 189 StyleResourceLoader loader(m_document.fetcher()); | 189 StyleResourceLoader loader(m_document.fetcher()); |
| 190 loader.loadPendingResources(state.style(), state.elementStyleResources()); | 190 loader.loadPendingResources(state.style(), state.elementStyleResources()); |
| 191 m_document.styleEngine()->fontSelector()->fontLoader()->loadPendingFonts(); | |
| 192 } | 191 } |
| 193 | 192 |
| 194 PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
tyle* defaultParent) | 193 PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
tyle* defaultParent) |
| 195 { | 194 { |
| 196 ASSERT(m_document.frame()); | 195 ASSERT(m_document.frame()); |
| 197 ASSERT(m_document.settings()); | 196 ASSERT(m_document.settings()); |
| 198 | 197 |
| 199 StyleResolverState state(m_document, element, defaultParent); | 198 StyleResolverState state(m_document, element, defaultParent); |
| 200 | 199 |
| 201 if (state.parentStyle()) { | 200 if (state.parentStyle()) { |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 break; | 550 break; |
| 552 default: | 551 default: |
| 553 break; | 552 break; |
| 554 } | 553 } |
| 555 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); | 554 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); |
| 556 } | 555 } |
| 557 } | 556 } |
| 558 } | 557 } |
| 559 | 558 |
| 560 } // namespace blink | 559 } // namespace blink |
| OLD | NEW |