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

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

Issue 2521103004: Revert of Apply custom property animation (Closed)
Patch Set: Created 4 years 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 | « third_party/WebKit/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. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 23 matching lines...) Expand all
34 StyleResolverState::StyleResolverState( 34 StyleResolverState::StyleResolverState(
35 Document& document, 35 Document& document,
36 const ElementResolveContext& elementContext, 36 const ElementResolveContext& elementContext,
37 const ComputedStyle* parentStyle) 37 const ComputedStyle* parentStyle)
38 : m_elementContext(elementContext), 38 : m_elementContext(elementContext),
39 m_document(document), 39 m_document(document),
40 m_style(nullptr), 40 m_style(nullptr),
41 // TODO(jchaffraix): We should make m_parentStyle const 41 // TODO(jchaffraix): We should make m_parentStyle const
42 // (https://crbug.com/468152) 42 // (https://crbug.com/468152)
43 m_parentStyle(const_cast<ComputedStyle*>(parentStyle)), 43 m_parentStyle(const_cast<ComputedStyle*>(parentStyle)),
44 m_isAnimatingCustomProperties(false),
45 m_applyPropertyToRegularStyle(true), 44 m_applyPropertyToRegularStyle(true),
46 m_applyPropertyToVisitedLinkStyle(false), 45 m_applyPropertyToVisitedLinkStyle(false),
47 m_hasDirAutoAttribute(false), 46 m_hasDirAutoAttribute(false),
48 m_fontBuilder(document), 47 m_fontBuilder(document),
49 m_elementStyleResources(document, document.devicePixelRatio()) { 48 m_elementStyleResources(document, document.devicePixelRatio()) {
50 if (!m_parentStyle) { 49 if (!m_parentStyle) {
51 // TODO(jchaffraix): We should make m_parentStyle const 50 // TODO(jchaffraix): We should make m_parentStyle const
52 // (https://crbug.com/468152) 51 // (https://crbug.com/468152)
53 m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle()); 52 m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle());
54 } 53 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map = 109 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map =
111 m_parsedPropertiesForPendingSubstitutionCache.get(&value); 110 m_parsedPropertiesForPendingSubstitutionCache.get(&value);
112 if (!map) { 111 if (!map) {
113 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>; 112 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>;
114 m_parsedPropertiesForPendingSubstitutionCache.set(&value, map); 113 m_parsedPropertiesForPendingSubstitutionCache.set(&value, map);
115 } 114 }
116 return *map; 115 return *map;
117 } 116 }
118 117
119 } // namespace blink 118 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleResolverState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698