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

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

Issue 2348853003: Don't include LayoutViewItem.h from StyleResolverState.h (Closed)
Patch Set: Created 4 years, 3 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
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,
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 "core/css/resolver/StyleResolverState.h" 22 #include "core/css/resolver/StyleResolverState.h"
23 23
24 #include "core/animation/css/CSSAnimations.h" 24 #include "core/animation/css/CSSAnimations.h"
25 #include "core/css/StylePropertySet.h" 25 #include "core/css/StylePropertySet.h"
26 #include "core/dom/Node.h" 26 #include "core/dom/Node.h"
27 #include "core/dom/NodeComputedStyle.h" 27 #include "core/dom/NodeComputedStyle.h"
28 #include "core/frame/FrameHost.h" 28 #include "core/frame/FrameHost.h"
29 #include "core/layout/api/LayoutViewItem.h"
29 30
30 namespace blink { 31 namespace blink {
31 32
32 StyleResolverState::StyleResolverState(Document& document, const ElementResolveC ontext& elementContext, const ComputedStyle* parentStyle) 33 StyleResolverState::StyleResolverState(Document& document, const ElementResolveC ontext& elementContext, const ComputedStyle* parentStyle)
33 : m_elementContext(elementContext) 34 : m_elementContext(elementContext)
34 , m_document(document) 35 , m_document(document)
35 , m_style(nullptr) 36 , m_style(nullptr)
36 // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/4 68152) 37 // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/4 68152)
37 , m_parentStyle(const_cast<ComputedStyle*>(parentStyle)) 38 , m_parentStyle(const_cast<ComputedStyle*>(parentStyle))
38 , m_applyPropertyToRegularStyle(true) 39 , m_applyPropertyToRegularStyle(true)
(...skipping 13 matching lines...) Expand all
52 { 53 {
53 } 54 }
54 55
55 StyleResolverState::~StyleResolverState() 56 StyleResolverState::~StyleResolverState()
56 { 57 {
57 // For performance reasons, explicitly clear HeapVectors and 58 // For performance reasons, explicitly clear HeapVectors and
58 // HeapHashMaps to avoid giving a pressure on Oilpan's GC. 59 // HeapHashMaps to avoid giving a pressure on Oilpan's GC.
59 m_animationUpdate.clear(); 60 m_animationUpdate.clear();
60 } 61 }
61 62
63 void StyleResolverState::setStyle(PassRefPtr<ComputedStyle> style)
64 {
65 // FIXME: Improve RAII of StyleResolverState to remove this function.
66 m_style = style;
67 m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), rootE lementStyle(), document().layoutViewItem(), m_style->effectiveZoom());
68 }
69
62 CSSToLengthConversionData StyleResolverState::fontSizeConversionData() const 70 CSSToLengthConversionData StyleResolverState::fontSizeConversionData() const
63 { 71 {
64 float em = parentStyle()->specifiedFontSize(); 72 float em = parentStyle()->specifiedFontSize();
65 float rem = rootElementStyle() ? rootElementStyle()->specifiedFontSize() : 1 ; 73 float rem = rootElementStyle() ? rootElementStyle()->specifiedFontSize() : 1 ;
66 CSSToLengthConversionData::FontSizes fontSizes(em, rem, &parentStyle()->font ()); 74 CSSToLengthConversionData::FontSizes fontSizes(em, rem, &parentStyle()->font ());
67 CSSToLengthConversionData::ViewportSize viewportSize(document().layoutViewIt em()); 75 CSSToLengthConversionData::ViewportSize viewportSize(document().layoutViewIt em());
68 76
69 return CSSToLengthConversionData(style(), fontSizes, viewportSize, 1); 77 return CSSToLengthConversionData(style(), fontSizes, viewportSize, 1);
70 } 78 }
71 79
(...skipping 16 matching lines...) Expand all
88 { 96 {
89 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map = m_parsedProperties ForPendingSubstitutionCache.get(&value); 97 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map = m_parsedProperties ForPendingSubstitutionCache.get(&value);
90 if (!map) { 98 if (!map) {
91 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>; 99 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>;
92 m_parsedPropertiesForPendingSubstitutionCache.set(&value, map); 100 m_parsedPropertiesForPendingSubstitutionCache.set(&value, map);
93 } 101 }
94 return *map; 102 return *map;
95 } 103 }
96 104
97 } // namespace blink 105 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleResolverState.h ('k') | third_party/WebKit/Source/core/dom/ContainerNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698