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

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

Issue 143323014: *** DO NOT LAND *** Attempt to understand Regions complexity Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/dom/DOMNamedFlowCollection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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, RenderRegion* regionForStyling) 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(0)
36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView()) 36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView())
37 , m_parentStyle(parentStyle) 37 , m_parentStyle(parentStyle)
38 , m_regionForStyling(regionForStyling)
39 , m_applyPropertyToRegularStyle(true) 38 , m_applyPropertyToRegularStyle(true)
40 , m_applyPropertyToVisitedLinkStyle(false) 39 , m_applyPropertyToVisitedLinkStyle(false)
41 , m_lineHeightValue(0) 40 , m_lineHeightValue(0)
42 , m_styleMap(*this, m_elementStyleResources) 41 , m_styleMap(*this, m_elementStyleResources)
43 , m_currentRule(0) 42 , m_currentRule(0)
44 { 43 {
45 if (m_elementContext.resetStyleInheritance()) 44 if (m_elementContext.resetStyleInheritance())
46 m_parentStyle = 0; 45 m_parentStyle = 0;
47 else if (!parentStyle && m_elementContext.parentNode()) 46 else if (!parentStyle && m_elementContext.parentNode())
48 m_parentStyle = m_elementContext.parentNode()->renderStyle(); 47 m_parentStyle = m_elementContext.parentNode()->renderStyle();
(...skipping 14 matching lines...) Expand all
63 { 62 {
64 m_animationUpdate = update; 63 m_animationUpdate = update;
65 } 64 }
66 65
67 PassOwnPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpdate() 66 PassOwnPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpdate()
68 { 67 {
69 return m_animationUpdate.release(); 68 return m_animationUpdate.release();
70 } 69 }
71 70
72 } // namespace WebCore 71 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/dom/DOMNamedFlowCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698