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

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

Issue 670373002: Demote 'line-height' to a low priority property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. 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
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | no next file » | 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 19 matching lines...) Expand all
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()) 36 , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView())
37 , m_parentStyle(parentStyle) 37 , m_parentStyle(parentStyle)
38 , m_applyPropertyToRegularStyle(true) 38 , m_applyPropertyToRegularStyle(true)
39 , m_applyPropertyToVisitedLinkStyle(false) 39 , m_applyPropertyToVisitedLinkStyle(false)
40 , m_lineHeightValue(nullptr)
41 , m_fontBuilder(document) 40 , m_fontBuilder(document)
42 , m_styleMap(*this, m_elementStyleResources) 41 , m_styleMap(*this, m_elementStyleResources)
43 { 42 {
44 if (!parentStyle && m_elementContext.parentNode()) 43 if (!parentStyle && m_elementContext.parentNode())
45 m_parentStyle = m_elementContext.parentNode()->renderStyle(); 44 m_parentStyle = m_elementContext.parentNode()->renderStyle();
46 45
47 ASSERT(document.isActive()); 46 ASSERT(document.isActive());
48 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor()); 47 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor());
49 } 48 }
50 49
51 StyleResolverState::~StyleResolverState() 50 StyleResolverState::~StyleResolverState()
52 { 51 {
53 } 52 }
54 53
55 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update) 54 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update)
56 { 55 {
57 m_animationUpdate = update; 56 m_animationUpdate = update;
58 } 57 }
59 58
60 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te() 59 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te()
61 { 60 {
62 return m_animationUpdate.release(); 61 return m_animationUpdate.release();
63 } 62 }
64 63
65 } // namespace blink 64 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698