| 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 14 matching lines...) Expand all Loading... |
| 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 WebCore { | 30 namespace WebCore { |
| 31 | 31 |
| 32 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
derStyle* parentStyle) | 32 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
derStyle* parentStyle) |
| 33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv
eContext()) | 33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv
eContext()) |
| 34 , m_document(document) | 34 , m_document(document) |
| 35 , m_style(0) | 35 , m_style(nullptr) |
| 36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView()) | 36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView()) |
| 37 , m_parentStyle(parentStyle) | 37 , m_parentStyle(parentStyle) |
| 38 , m_applyPropertyToRegularStyle(true) | 38 , m_applyPropertyToRegularStyle(true) |
| 39 , m_applyPropertyToVisitedLinkStyle(false) | 39 , m_applyPropertyToVisitedLinkStyle(false) |
| 40 , m_lineHeightValue(0) | 40 , m_lineHeightValue(0) |
| 41 , m_styleMap(*this, m_elementStyleResources) | 41 , m_styleMap(*this, m_elementStyleResources) |
| 42 , m_currentRule(0) | 42 , m_currentRule(0) |
| 43 { | 43 { |
| 44 if (m_elementContext.resetStyleInheritance()) | 44 if (m_elementContext.resetStyleInheritance()) |
| 45 m_parentStyle = 0; | 45 m_parentStyle = nullptr; |
| 46 else if (!parentStyle && m_elementContext.parentNode()) | 46 else if (!parentStyle && m_elementContext.parentNode()) |
| 47 m_parentStyle = m_elementContext.parentNode()->renderStyle(); | 47 m_parentStyle = m_elementContext.parentNode()->renderStyle(); |
| 48 | 48 |
| 49 // FIXME: Animation unitests will start animations on non-active documents! | 49 // FIXME: Animation unitests will start animations on non-active documents! |
| 50 // http://crbug.com/330095 | 50 // http://crbug.com/330095 |
| 51 // ASSERT(document.isActive()); | 51 // ASSERT(document.isActive()); |
| 52 if (!document.isActive()) | 52 if (!document.isActive()) |
| 53 return; | 53 return; |
| 54 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
leFactor()); | 54 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
leFactor()); |
| 55 } | 55 } |
| 56 | 56 |
| 57 StyleResolverState::~StyleResolverState() | 57 StyleResolverState::~StyleResolverState() |
| 58 { | 58 { |
| 59 } | 59 } |
| 60 | 60 |
| 61 void StyleResolverState::setAnimationUpdate(PassOwnPtr<CSSAnimationUpdate> updat
e) | 61 void StyleResolverState::setAnimationUpdate(PassOwnPtr<CSSAnimationUpdate> updat
e) |
| 62 { | 62 { |
| 63 m_animationUpdate = update; | 63 m_animationUpdate = update; |
| 64 } | 64 } |
| 65 | 65 |
| 66 PassOwnPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpdate() | 66 PassOwnPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpdate() |
| 67 { | 67 { |
| 68 return m_animationUpdate.release(); | 68 return m_animationUpdate.release(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 } // namespace WebCore | 71 } // namespace WebCore |
| OLD | NEW |