| 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, | 
| 11  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 
| 13  * Library General Public License for more details. | 13  * Library General Public License for more details. | 
| 14  * | 14  * | 
| 15  * You should have received a copy of the GNU Library General Public License | 15  * You should have received a copy of the GNU Library General Public License | 
| 16  * along with this library; see the file COPYING.LIB.  If not, write to | 16  * along with this library; see the file COPYING.LIB.  If not, write to | 
| 17  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 
| 18  * Boston, MA 02110-1301, USA. | 18  * Boston, MA 02110-1301, USA. | 
| 19  * | 19  * | 
| 20  */ | 20  */ | 
| 21 | 21 | 
| 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/NodeLayoutStyle.h" | 27 #include "core/dom/NodeComputedStyle.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, const ElementResolveC
    ontext& elementContext, const LayoutStyle* parentStyle) | 32 StyleResolverState::StyleResolverState(Document& document, const ElementResolveC
    ontext& elementContext, const ComputedStyle* parentStyle) | 
| 33     : m_elementContext(elementContext) | 33     : m_elementContext(elementContext) | 
| 34     , m_document(document) | 34     , m_document(document) | 
| 35     , m_style(nullptr) | 35     , m_style(nullptr) | 
| 36     // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/4
    68152) | 36     // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/4
    68152) | 
| 37     , m_parentStyle(const_cast<LayoutStyle*>(parentStyle)) | 37     , m_parentStyle(const_cast<ComputedStyle*>(parentStyle)) | 
| 38     , m_applyPropertyToRegularStyle(true) | 38     , m_applyPropertyToRegularStyle(true) | 
| 39     , m_applyPropertyToVisitedLinkStyle(false) | 39     , m_applyPropertyToVisitedLinkStyle(false) | 
| 40     , m_hasDirAutoAttribute(false) | 40     , m_hasDirAutoAttribute(false) | 
| 41     , m_fontBuilder(document) | 41     , m_fontBuilder(document) | 
| 42 { | 42 { | 
| 43     if (!m_parentStyle) { | 43     if (!m_parentStyle) { | 
| 44         // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.c
    om/468152) | 44         // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.c
    om/468152) | 
| 45         m_parentStyle = const_cast<LayoutStyle*>(m_elementContext.parentStyle())
    ; | 45         m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle(
    )); | 
| 46     } | 46     } | 
| 47 | 47 | 
| 48     ASSERT(document.isActive()); | 48     ASSERT(document.isActive()); | 
| 49     m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
    leFactor()); | 49     m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca
    leFactor()); | 
| 50 } | 50 } | 
| 51 | 51 | 
| 52 StyleResolverState::StyleResolverState(Document& document, Element* element, con
    st LayoutStyle* parentStyle) | 52 StyleResolverState::StyleResolverState(Document& document, Element* element, con
    st ComputedStyle* parentStyle) | 
| 53     : StyleResolverState(document, element ? ElementResolveContext(*element) : E
    lementResolveContext(document), parentStyle) | 53     : StyleResolverState(document, element ? ElementResolveContext(*element) : E
    lementResolveContext(document), parentStyle) | 
| 54 { | 54 { | 
| 55 } | 55 } | 
| 56 | 56 | 
| 57 StyleResolverState::~StyleResolverState() | 57 StyleResolverState::~StyleResolverState() | 
| 58 { | 58 { | 
| 59 } | 59 } | 
| 60 | 60 | 
| 61 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU
    pdate> update) | 61 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU
    pdate> update) | 
| 62 { | 62 { | 
| 63     m_animationUpdate = update; | 63     m_animationUpdate = update; | 
| 64 } | 64 } | 
| 65 | 65 | 
| 66 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda
    te() | 66 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda
    te() | 
| 67 { | 67 { | 
| 68     return m_animationUpdate.release(); | 68     return m_animationUpdate.release(); | 
| 69 } | 69 } | 
| 70 | 70 | 
| 71 } // namespace blink | 71 } // namespace blink | 
| OLD | NEW | 
|---|