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

Side by Side Diff: Source/core/css/CSSStyleRule.cpp

Issue 205033007: Revert of Oilpan: Move CSSStyleDeclaration and subclasses to the heap using transistion types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSStyleRule.h ('k') | Source/core/css/CSSViewportRule.h » ('j') | 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 2006, 2008, 2012 Apple Inc. 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 29 matching lines...) Expand all
40 } 40 }
41 41
42 CSSStyleRule::CSSStyleRule(StyleRule* styleRule, CSSStyleSheet* parent) 42 CSSStyleRule::CSSStyleRule(StyleRule* styleRule, CSSStyleSheet* parent)
43 : CSSRule(parent) 43 : CSSRule(parent)
44 , m_styleRule(styleRule) 44 , m_styleRule(styleRule)
45 { 45 {
46 } 46 }
47 47
48 CSSStyleRule::~CSSStyleRule() 48 CSSStyleRule::~CSSStyleRule()
49 { 49 {
50 #if !ENABLE(OILPAN)
51 if (m_propertiesCSSOMWrapper) 50 if (m_propertiesCSSOMWrapper)
52 m_propertiesCSSOMWrapper->clearParentRule(); 51 m_propertiesCSSOMWrapper->clearParentRule();
53 #endif 52
54 if (hasCachedSelectorText()) { 53 if (hasCachedSelectorText()) {
55 selectorTextCache().remove(this); 54 selectorTextCache().remove(this);
56 setHasCachedSelectorText(false); 55 setHasCachedSelectorText(false);
57 } 56 }
58 } 57 }
59 58
60 CSSStyleDeclaration* CSSStyleRule::style() const 59 CSSStyleDeclaration* CSSStyleRule::style() const
61 { 60 {
62 if (!m_propertiesCSSOMWrapper) { 61 if (!m_propertiesCSSOMWrapper) {
63 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleR ule->mutableProperties(), const_cast<CSSStyleRule*>(this)); 62 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleR ule->mutableProperties(), const_cast<CSSStyleRule*>(this));
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 { 125 {
127 ASSERT(rule); 126 ASSERT(rule);
128 m_styleRule = toStyleRule(rule); 127 m_styleRule = toStyleRule(rule);
129 if (m_propertiesCSSOMWrapper) 128 if (m_propertiesCSSOMWrapper)
130 m_propertiesCSSOMWrapper->reattach(m_styleRule->mutableProperties()); 129 m_propertiesCSSOMWrapper->reattach(m_styleRule->mutableProperties());
131 } 130 }
132 131
133 void CSSStyleRule::trace(Visitor* visitor) 132 void CSSStyleRule::trace(Visitor* visitor)
134 { 133 {
135 visitor->trace(m_styleRule); 134 visitor->trace(m_styleRule);
136 visitor->trace(m_propertiesCSSOMWrapper);
137 CSSRule::trace(visitor); 135 CSSRule::trace(visitor);
138 } 136 }
139 137
140 } // namespace WebCore 138 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSStyleRule.h ('k') | Source/core/css/CSSViewportRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698