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

Side by Side Diff: Source/core/css/CSSPageRule.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/CSSPageRule.h ('k') | Source/core/css/CSSStyleDeclaration.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 22 matching lines...) Expand all
33 namespace WebCore { 33 namespace WebCore {
34 34
35 CSSPageRule::CSSPageRule(StyleRulePage* pageRule, CSSStyleSheet* parent) 35 CSSPageRule::CSSPageRule(StyleRulePage* pageRule, CSSStyleSheet* parent)
36 : CSSRule(parent) 36 : CSSRule(parent)
37 , m_pageRule(pageRule) 37 , m_pageRule(pageRule)
38 { 38 {
39 } 39 }
40 40
41 CSSPageRule::~CSSPageRule() 41 CSSPageRule::~CSSPageRule()
42 { 42 {
43 #if !ENABLE(OILPAN)
44 if (m_propertiesCSSOMWrapper) 43 if (m_propertiesCSSOMWrapper)
45 m_propertiesCSSOMWrapper->clearParentRule(); 44 m_propertiesCSSOMWrapper->clearParentRule();
46 #endif
47 } 45 }
48 46
49 CSSStyleDeclaration* CSSPageRule::style() const 47 CSSStyleDeclaration* CSSPageRule::style() const
50 { 48 {
51 if (!m_propertiesCSSOMWrapper) 49 if (!m_propertiesCSSOMWrapper)
52 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRu le->mutableProperties(), const_cast<CSSPageRule*>(this)); 50 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRu le->mutableProperties(), const_cast<CSSPageRule*>(this));
53 return m_propertiesCSSOMWrapper.get(); 51 return m_propertiesCSSOMWrapper.get();
54 } 52 }
55 53
56 String CSSPageRule::selectorText() const 54 String CSSPageRule::selectorText() const
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 { 97 {
100 ASSERT(rule); 98 ASSERT(rule);
101 m_pageRule = toStyleRulePage(rule); 99 m_pageRule = toStyleRulePage(rule);
102 if (m_propertiesCSSOMWrapper) 100 if (m_propertiesCSSOMWrapper)
103 m_propertiesCSSOMWrapper->reattach(m_pageRule->mutableProperties()); 101 m_propertiesCSSOMWrapper->reattach(m_pageRule->mutableProperties());
104 } 102 }
105 103
106 void CSSPageRule::trace(Visitor* visitor) 104 void CSSPageRule::trace(Visitor* visitor)
107 { 105 {
108 visitor->trace(m_pageRule); 106 visitor->trace(m_pageRule);
109 visitor->trace(m_propertiesCSSOMWrapper);
110 CSSRule::trace(visitor); 107 CSSRule::trace(visitor);
111 } 108 }
112 109
113 } // namespace WebCore 110 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPageRule.h ('k') | Source/core/css/CSSStyleDeclaration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698