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

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

Issue 180003002: Consistently use on-heap collections for StyleRuleBase descendants. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: addressed reviewers comments Created 6 years, 10 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
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, 2009, 2010, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 , m_mediaQueries(media) 44 , m_mediaQueries(media)
45 , m_resource(0) 45 , m_resource(0)
46 , m_loading(false) 46 , m_loading(false)
47 { 47 {
48 if (!m_mediaQueries) 48 if (!m_mediaQueries)
49 m_mediaQueries = MediaQuerySet::create(String()); 49 m_mediaQueries = MediaQuerySet::create(String());
50 } 50 }
51 51
52 StyleRuleImport::~StyleRuleImport() 52 StyleRuleImport::~StyleRuleImport()
53 { 53 {
54 #if !ENABLE(OILPAN)
54 if (m_styleSheet) 55 if (m_styleSheet)
55 m_styleSheet->clearOwnerRule(); 56 m_styleSheet->clearOwnerRule();
57 #endif
56 if (m_resource) 58 if (m_resource)
57 m_resource->removeClient(&m_styleSheetClient); 59 m_resource->removeClient(&m_styleSheetClient);
58 } 60 }
59 61
60 void StyleRuleImport::traceAfterDispatch(Visitor* visitor) 62 void StyleRuleImport::traceAfterDispatch(Visitor* visitor)
61 { 63 {
62 visitor->trace(m_parentStyleSheet); 64 visitor->trace(m_parentStyleSheet);
63 visitor->trace(m_styleSheet); 65 visitor->trace(m_styleSheet);
64 StyleRuleBase::traceAfterDispatch(visitor); 66 StyleRuleBase::traceAfterDispatch(visitor);
65 } 67 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // removed from the pending sheet count, so let the doc know 130 // removed from the pending sheet count, so let the doc know
129 // the sheet being imported is pending. 131 // the sheet being imported is pending.
130 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet) 132 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet)
131 m_parentStyleSheet->startLoadingDynamicSheet(); 133 m_parentStyleSheet->startLoadingDynamicSheet();
132 m_loading = true; 134 m_loading = true;
133 m_resource->addClient(&m_styleSheetClient); 135 m_resource->addClient(&m_styleSheetClient);
134 } 136 }
135 } 137 }
136 138
137 } // namespace WebCore 139 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698