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

Side by Side Diff: Source/core/css/CSSViewportRule.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/CSSViewportRule.h ('k') | Source/core/css/PropertySetCSSStyleDeclaration.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 * Copyright (C) 2012 Intel Corporation. All rights reserved. 2 * Copyright (C) 2012 Intel Corporation. All rights reserved.
3 * Copyright (C) 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2012 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above 9 * 1. Redistributions of source code must retain the above
10 * copyright notice, this list of conditions and the following 10 * copyright notice, this list of conditions and the following
(...skipping 28 matching lines...) Expand all
39 namespace WebCore { 39 namespace WebCore {
40 40
41 CSSViewportRule::CSSViewportRule(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet) 41 CSSViewportRule::CSSViewportRule(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
42 : CSSRule(sheet) 42 : CSSRule(sheet)
43 , m_viewportRule(viewportRule) 43 , m_viewportRule(viewportRule)
44 { 44 {
45 } 45 }
46 46
47 CSSViewportRule::~CSSViewportRule() 47 CSSViewportRule::~CSSViewportRule()
48 { 48 {
49 #if !ENABLE(OILPAN)
50 if (m_propertiesCSSOMWrapper) 49 if (m_propertiesCSSOMWrapper)
51 m_propertiesCSSOMWrapper->clearParentRule(); 50 m_propertiesCSSOMWrapper->clearParentRule();
52 #endif
53 } 51 }
54 52
55 CSSStyleDeclaration* CSSViewportRule::style() const 53 CSSStyleDeclaration* CSSViewportRule::style() const
56 { 54 {
57 if (!m_propertiesCSSOMWrapper) 55 if (!m_propertiesCSSOMWrapper)
58 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewpo rtRule->mutableProperties(), const_cast<CSSViewportRule*>(this)); 56 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewpo rtRule->mutableProperties(), const_cast<CSSViewportRule*>(this));
59 57
60 return m_propertiesCSSOMWrapper.get(); 58 return m_propertiesCSSOMWrapper.get();
61 } 59 }
62 60
(...skipping 16 matching lines...) Expand all
79 { 77 {
80 ASSERT(rule); 78 ASSERT(rule);
81 m_viewportRule = toStyleRuleViewport(rule); 79 m_viewportRule = toStyleRuleViewport(rule);
82 if (m_propertiesCSSOMWrapper) 80 if (m_propertiesCSSOMWrapper)
83 m_propertiesCSSOMWrapper->reattach(m_viewportRule->mutableProperties()); 81 m_propertiesCSSOMWrapper->reattach(m_viewportRule->mutableProperties());
84 } 82 }
85 83
86 void CSSViewportRule::trace(Visitor* visitor) 84 void CSSViewportRule::trace(Visitor* visitor)
87 { 85 {
88 visitor->trace(m_viewportRule); 86 visitor->trace(m_viewportRule);
89 visitor->trace(m_propertiesCSSOMWrapper);
90 CSSRule::trace(visitor); 87 CSSRule::trace(visitor);
91 } 88 }
92 89
93 } // namespace WebCore 90 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSViewportRule.h ('k') | Source/core/css/PropertySetCSSStyleDeclaration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698