| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 #include "core/css/resolver/StyleResolverState.h" | 23 #include "core/css/resolver/StyleResolverState.h" |
| 24 | 24 |
| 25 #include "core/animation/css/CSSAnimations.h" | 25 #include "core/animation/css/CSSAnimations.h" |
| 26 #include "core/dom/Node.h" | 26 #include "core/dom/Node.h" |
| 27 #include "core/dom/NodeRenderStyle.h" | 27 #include "core/dom/NodeRenderStyle.h" |
| 28 #include "core/frame/FrameHost.h" | 28 #include "core/frame/FrameHost.h" |
| 29 | 29 |
| 30 namespace blink { | 30 namespace blink { |
| 31 | 31 |
| 32 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
derStyle* parentStyle) | 32 StyleResolverState::StyleResolverState(Document& document, const ElementResolveC
ontext& elementContext, RenderStyle* parentStyle) |
| 33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv
eContext(document)) | 33 : m_elementContext(elementContext) |
| 34 , m_document(document) | 34 , m_document(document) |
| 35 , m_style(nullptr) | 35 , m_style(nullptr) |
| 36 , m_parentStyle(parentStyle) | 36 , m_parentStyle(parentStyle) |
| 37 , m_applyPropertyToRegularStyle(true) | 37 , m_applyPropertyToRegularStyle(true) |
| 38 , m_applyPropertyToVisitedLinkStyle(false) | 38 , m_applyPropertyToVisitedLinkStyle(false) |
| 39 , m_fontBuilder(document) | 39 , m_fontBuilder(document) |
| 40 , m_styleMap(*this, m_elementStyleResources) | 40 , m_styleMap(*this, m_elementStyleResources) |
| 41 { | 41 { |
| 42 if (!parentStyle && m_elementContext.parentNode()) | 42 if (!m_parentStyle) |
| 43 m_parentStyle = m_elementContext.parentNode()->renderStyle(); | 43 m_parentStyle = m_elementContext.parentStyle(); |
| 44 | 44 |
| 45 ASSERT(document.isActive()); | 45 ASSERT(document.isActive()); |
| 46 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
leFactor()); | 46 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
leFactor()); |
| 47 } | 47 } |
| 48 | 48 |
| 49 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
derStyle* parentStyle) |
| 50 : StyleResolverState(document, element ? ElementResolveContext(*element) : E
lementResolveContext(document), parentStyle) |
| 51 { |
| 52 } |
| 53 |
| 49 StyleResolverState::~StyleResolverState() | 54 StyleResolverState::~StyleResolverState() |
| 50 { | 55 { |
| 51 } | 56 } |
| 52 | 57 |
| 53 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU
pdate> update) | 58 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU
pdate> update) |
| 54 { | 59 { |
| 55 m_animationUpdate = update; | 60 m_animationUpdate = update; |
| 56 } | 61 } |
| 57 | 62 |
| 58 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda
te() | 63 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda
te() |
| 59 { | 64 { |
| 60 return m_animationUpdate.release(); | 65 return m_animationUpdate.release(); |
| 61 } | 66 } |
| 62 | 67 |
| 63 } // namespace blink | 68 } // namespace blink |
| OLD | NEW |