Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: Source/core/css/resolver/StyleResolverState.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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/NodeLayoutStyle.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, LayoutStyle* parentStyle) 32 StyleResolverState::StyleResolverState(Document& document, const ElementResolveC ontext& elementContext, const LayoutStyle* 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 , 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 { 40 {
41 if (!m_parentStyle) 41 if (!m_parentStyle)
42 m_parentStyle = m_elementContext.parentStyle(); 42 m_parentStyle = m_elementContext.parentStyle();
43 43
44 ASSERT(document.isActive()); 44 ASSERT(document.isActive());
45 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor()); 45 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor());
46 } 46 }
47 47
48 StyleResolverState::StyleResolverState(Document& document, Element* element, Lay outStyle* parentStyle) 48 StyleResolverState::StyleResolverState(Document& document, Element* element, con st LayoutStyle* parentStyle)
49 : StyleResolverState(document, element ? ElementResolveContext(*element) : E lementResolveContext(document), parentStyle) 49 : StyleResolverState(document, element ? ElementResolveContext(*element) : E lementResolveContext(document), parentStyle)
50 { 50 {
51 } 51 }
52 52
53 StyleResolverState::~StyleResolverState() 53 StyleResolverState::~StyleResolverState()
54 { 54 {
55 } 55 }
56 56
57 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update) 57 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update)
58 { 58 {
59 m_animationUpdate = update; 59 m_animationUpdate = update;
60 } 60 }
61 61
62 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te() 62 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te()
63 { 63 {
64 return m_animationUpdate.release(); 64 return m_animationUpdate.release();
65 } 65 }
66 66
67 } // namespace blink 67 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/css/resolver/ViewportStyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698