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

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

Issue 350333003: Cascade declared property values instead of applying values on top of each other (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 4 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,
(...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_styleMap(*this, m_elementStyleResources) 40 , m_styleMap(*this, m_elementStyleResources)
42 , m_currentRule(nullptr)
43 { 41 {
44 if (!parentStyle && m_elementContext.parentNode()) 42 if (!parentStyle && m_elementContext.parentNode())
45 m_parentStyle = m_elementContext.parentNode()->renderStyle(); 43 m_parentStyle = m_elementContext.parentNode()->renderStyle();
46 44
47 // FIXME: Animation unitests will start animations on non-active documents! 45 // FIXME: Animation unitests will start animations on non-active documents!
48 // http://crbug.com/330095 46 // http://crbug.com/330095
49 // ASSERT(document.isActive()); 47 // ASSERT(document.isActive());
50 if (!document.isActive()) 48 if (!document.isActive())
51 return; 49 return;
52 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor()); 50 m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceSca leFactor());
53 } 51 }
54 52
55 StyleResolverState::~StyleResolverState() 53 StyleResolverState::~StyleResolverState()
56 { 54 {
57 } 55 }
58 56
59 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update) 57 void StyleResolverState::setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationU pdate> update)
60 { 58 {
61 m_animationUpdate = update; 59 m_animationUpdate = update;
62 } 60 }
63 61
64 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te() 62 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> StyleResolverState::takeAnimationUpda te()
65 { 63 {
66 return m_animationUpdate.release(); 64 return m_animationUpdate.release();
67 } 65 }
68 66
69 } // namespace blink 67 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/rendering/style/FillLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698