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

Side by Side Diff: Source/core/css/CSSFontFaceRule.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/CSSFontFaceRule.h ('k') | Source/core/css/CSSKeyframeRule.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 19 matching lines...) Expand all
30 namespace WebCore { 30 namespace WebCore {
31 31
32 CSSFontFaceRule::CSSFontFaceRule(StyleRuleFontFace* fontFaceRule, CSSStyleSheet* parent) 32 CSSFontFaceRule::CSSFontFaceRule(StyleRuleFontFace* fontFaceRule, CSSStyleSheet* parent)
33 : CSSRule(parent) 33 : CSSRule(parent)
34 , m_fontFaceRule(fontFaceRule) 34 , m_fontFaceRule(fontFaceRule)
35 { 35 {
36 } 36 }
37 37
38 CSSFontFaceRule::~CSSFontFaceRule() 38 CSSFontFaceRule::~CSSFontFaceRule()
39 { 39 {
40 #if !ENABLE(OILPAN)
41 if (m_propertiesCSSOMWrapper) 40 if (m_propertiesCSSOMWrapper)
42 m_propertiesCSSOMWrapper->clearParentRule(); 41 m_propertiesCSSOMWrapper->clearParentRule();
43 #endif
44 } 42 }
45 43
46 CSSStyleDeclaration* CSSFontFaceRule::style() const 44 CSSStyleDeclaration* CSSFontFaceRule::style() const
47 { 45 {
48 if (!m_propertiesCSSOMWrapper) 46 if (!m_propertiesCSSOMWrapper)
49 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_fontFa ceRule->mutableProperties(), const_cast<CSSFontFaceRule*>(this)); 47 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_fontFa ceRule->mutableProperties(), const_cast<CSSFontFaceRule*>(this));
50 return m_propertiesCSSOMWrapper.get(); 48 return m_propertiesCSSOMWrapper.get();
51 } 49 }
52 50
53 String CSSFontFaceRule::cssText() const 51 String CSSFontFaceRule::cssText() const
(...skipping 12 matching lines...) Expand all
66 { 64 {
67 ASSERT(rule); 65 ASSERT(rule);
68 m_fontFaceRule = toStyleRuleFontFace(rule); 66 m_fontFaceRule = toStyleRuleFontFace(rule);
69 if (m_propertiesCSSOMWrapper) 67 if (m_propertiesCSSOMWrapper)
70 m_propertiesCSSOMWrapper->reattach(m_fontFaceRule->mutableProperties()); 68 m_propertiesCSSOMWrapper->reattach(m_fontFaceRule->mutableProperties());
71 } 69 }
72 70
73 void CSSFontFaceRule::trace(Visitor* visitor) 71 void CSSFontFaceRule::trace(Visitor* visitor)
74 { 72 {
75 visitor->trace(m_fontFaceRule); 73 visitor->trace(m_fontFaceRule);
76 visitor->trace(m_propertiesCSSOMWrapper);
77 CSSRule::trace(visitor); 74 CSSRule::trace(visitor);
78 } 75 }
79 76
80 } // namespace WebCore 77 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceRule.h ('k') | Source/core/css/CSSKeyframeRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698