| OLD | NEW |
| 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 27 matching lines...) Expand all Loading... |
| 38 , m_applyPropertyToRegularStyle(true) | 38 , m_applyPropertyToRegularStyle(true) |
| 39 , m_applyPropertyToVisitedLinkStyle(false) | 39 , m_applyPropertyToVisitedLinkStyle(false) |
| 40 , m_hasDirAutoAttribute(false) | 40 , m_hasDirAutoAttribute(false) |
| 41 , m_fontBuilder(document) | 41 , m_fontBuilder(document) |
| 42 , m_elementStyleResources(document, document.devicePixelRatio()) | 42 , m_elementStyleResources(document, document.devicePixelRatio()) |
| 43 { | 43 { |
| 44 if (!m_parentStyle) { | 44 if (!m_parentStyle) { |
| 45 // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.c
om/468152) | 45 // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.c
om/468152) |
| 46 m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle(
)); | 46 m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle(
)); |
| 47 } | 47 } |
| 48 | |
| 49 ASSERT(document.isActive()); | |
| 50 } | 48 } |
| 51 | 49 |
| 52 StyleResolverState::StyleResolverState(Document& document, Element* element, con
st ComputedStyle* parentStyle) | 50 StyleResolverState::StyleResolverState(Document& document, Element* element, con
st ComputedStyle* parentStyle) |
| 53 : StyleResolverState(document, element ? ElementResolveContext(*element) : E
lementResolveContext(document), parentStyle) | 51 : StyleResolverState(document, element ? ElementResolveContext(*element) : E
lementResolveContext(document), parentStyle) |
| 54 { | 52 { |
| 55 } | 53 } |
| 56 | 54 |
| 57 StyleResolverState::~StyleResolverState() | 55 StyleResolverState::~StyleResolverState() |
| 58 { | 56 { |
| 59 // For performance reasons, explicitly clear HeapVectors and | 57 // For performance reasons, explicitly clear HeapVectors and |
| (...skipping 30 matching lines...) Expand all Loading... |
| 90 { | 88 { |
| 91 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map = m_parsedProperties
ForPendingSubstitution.get(&value); | 89 HeapHashMap<CSSPropertyID, Member<const CSSValue>>* map = m_parsedProperties
ForPendingSubstitution.get(&value); |
| 92 if (!map) { | 90 if (!map) { |
| 93 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>; | 91 map = new HeapHashMap<CSSPropertyID, Member<const CSSValue>>; |
| 94 m_parsedPropertiesForPendingSubstitution.set(&value, map); | 92 m_parsedPropertiesForPendingSubstitution.set(&value, map); |
| 95 } | 93 } |
| 96 return *map; | 94 return *map; |
| 97 } | 95 } |
| 98 | 96 |
| 99 } // namespace blink | 97 } // namespace blink |
| OLD | NEW |