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

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

Issue 705783002: Decouple font unit conversion in computeLengthDouble from RenderStyle. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Forgot to remove ASSERT(rootStyle). Created 6 years, 1 month 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,
(...skipping 15 matching lines...) Expand all
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 blink { 30 namespace blink {
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(document)) 33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv eContext(document))
34 , m_document(document) 34 , m_document(document)
35 , m_style(nullptr) 35 , m_style(nullptr)
36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView())
37 , m_parentStyle(parentStyle) 36 , m_parentStyle(parentStyle)
38 , m_applyPropertyToRegularStyle(true) 37 , m_applyPropertyToRegularStyle(true)
39 , m_applyPropertyToVisitedLinkStyle(false) 38 , m_applyPropertyToVisitedLinkStyle(false)
40 , m_fontBuilder(document) 39 , m_fontBuilder(document)
41 , m_styleMap(*this, m_elementStyleResources) 40 , m_styleMap(*this, m_elementStyleResources)
42 { 41 {
43 if (!parentStyle && m_elementContext.parentNode()) 42 if (!parentStyle && m_elementContext.parentNode())
44 m_parentStyle = m_elementContext.parentNode()->renderStyle(); 43 m_parentStyle = m_elementContext.parentNode()->renderStyle();
45 44
46 ASSERT(document.isActive()); 45 ASSERT(document.isActive());
47 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor()); 46 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor());
48 } 47 }
49 48
50 StyleResolverState::~StyleResolverState() 49 StyleResolverState::~StyleResolverState()
51 { 50 {
52 } 51 }
53 52
54 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update) 53 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update)
55 { 54 {
56 m_animationUpdate = update; 55 m_animationUpdate = update;
57 } 56 }
58 57
59 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te() 58 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te()
60 { 59 {
61 return m_animationUpdate.release(); 60 return m_animationUpdate.release();
62 } 61 }
63 62
64 } // namespace blink 63 } // 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