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

Side by Side Diff: Source/core/dom/CSSSelectorWatch.cpp

Issue 1060813005: Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/dom/CSSSelectorWatch.h ('k') | Source/core/dom/ContextFeatures.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 CSSSelectorWatch::CSSSelectorWatch(Document& document) 47 CSSSelectorWatch::CSSSelectorWatch(Document& document)
48 : m_document(document) 48 : m_document(document)
49 , m_callbackSelectorChangeTimer(this, &CSSSelectorWatch::callbackSelectorCha ngeTimerFired) 49 , m_callbackSelectorChangeTimer(this, &CSSSelectorWatch::callbackSelectorCha ngeTimerFired)
50 , m_timerExpirations(0) 50 , m_timerExpirations(0)
51 { 51 {
52 } 52 }
53 53
54 CSSSelectorWatch& CSSSelectorWatch::from(Document& document) 54 CSSSelectorWatch& CSSSelectorWatch::from(Document& document)
55 { 55 {
56 CSSSelectorWatch* watch = static_cast<CSSSelectorWatch*>(DocumentSupplement: :from(document, kSupplementName)); 56 CSSSelectorWatch* watch = static_cast<CSSSelectorWatch*>(WillBeHeapSupplemen t<Document>::from(document, kSupplementName));
57 if (!watch) { 57 if (!watch) {
58 watch = new CSSSelectorWatch(document); 58 watch = new CSSSelectorWatch(document);
59 DocumentSupplement::provideTo(document, kSupplementName, adoptPtrWillBeN oop(watch)); 59 WillBeHeapSupplement<Document>::provideTo(document, kSupplementName, ado ptPtrWillBeNoop(watch));
60 } 60 }
61 return *watch; 61 return *watch;
62 } 62 }
63 63
64 void CSSSelectorWatch::callbackSelectorChangeTimerFired(Timer<CSSSelectorWatch>* ) 64 void CSSSelectorWatch::callbackSelectorChangeTimerFired(Timer<CSSSelectorWatch>* )
65 { 65 {
66 // Should be ensured by updateSelectorMatches(): 66 // Should be ensured by updateSelectorMatches():
67 ASSERT(!m_addedSelectors.isEmpty() || !m_removedSelectors.isEmpty()); 67 ASSERT(!m_addedSelectors.isEmpty() || !m_removedSelectors.isEmpty());
68 68
69 if (m_timerExpirations < 1) { 69 if (m_timerExpirations < 1) {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 rule->setProperties(callbackPropertySet); 158 rule->setProperties(callbackPropertySet);
159 m_watchedCallbackSelectors.append(rule.release()); 159 m_watchedCallbackSelectors.append(rule.release());
160 } 160 }
161 document().changedSelectorWatch(); 161 document().changedSelectorWatch();
162 } 162 }
163 163
164 DEFINE_TRACE(CSSSelectorWatch) 164 DEFINE_TRACE(CSSSelectorWatch)
165 { 165 {
166 visitor->trace(m_watchedCallbackSelectors); 166 visitor->trace(m_watchedCallbackSelectors);
167 visitor->trace(m_document); 167 visitor->trace(m_document);
168 DocumentSupplement::trace(visitor); 168 WillBeHeapSupplement<Document>::trace(visitor);
169 } 169 }
170 170
171 } // namespace blink 171 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/CSSSelectorWatch.h ('k') | Source/core/dom/ContextFeatures.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698