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

Side by Side Diff: Source/core/html/imports/HTMLImport.cpp

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use nullptr Created 6 years, 1 month 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
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 { 82 {
83 if (!state().shouldBlockScriptExecution()) { 83 if (!state().shouldBlockScriptExecution()) {
84 if (Document* document = this->document()) 84 if (Document* document = this->document())
85 document->didLoadAllImports(); 85 document->didLoadAllImports();
86 } 86 }
87 } 87 }
88 88
89 void HTMLImport::recalcTreeState(HTMLImport* root) 89 void HTMLImport::recalcTreeState(HTMLImport* root)
90 { 90 {
91 WillBeHeapHashMap<RawPtrWillBeMember<HTMLImport>, HTMLImportState> snapshot; 91 WillBeHeapHashMap<RawPtrWillBeMember<HTMLImport>, HTMLImportState> snapshot;
92 WillBeHeapVector<RawPtrWillBeMember<HTMLImport> > updated; 92 WillBeHeapVector<RawPtrWillBeMember<HTMLImport>> updated;
93 93
94 for (HTMLImport* i = root; i; i = traverseNext(i)) { 94 for (HTMLImport* i = root; i; i = traverseNext(i)) {
95 snapshot.add(i, i->state()); 95 snapshot.add(i, i->state());
96 i->m_state = HTMLImportState::invalidState(); 96 i->m_state = HTMLImportState::invalidState();
97 } 97 }
98 98
99 // The post-visit DFS order matters here because 99 // The post-visit DFS order matters here because
100 // HTMLImportStateResolver in recalcState() Depends on 100 // HTMLImportStateResolver in recalcState() Depends on
101 // |m_state| of its children and precedents of ancestors. 101 // |m_state| of its children and precedents of ancestors.
102 // Accidental cycle dependency of state computation is prevented 102 // Accidental cycle dependency of state computation is prevented
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 child->showTree(highlight, depth + 1); 135 child->showTree(highlight, depth + 1);
136 } 136 }
137 137
138 void HTMLImport::showThis() 138 void HTMLImport::showThis()
139 { 139 {
140 fprintf(stderr, "%p state=%d", this, m_state.peekValueForDebug()); 140 fprintf(stderr, "%p state=%d", this, m_state.peekValueForDebug());
141 } 141 }
142 #endif 142 #endif
143 143
144 } // namespace blink 144 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698