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

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

Issue 297863004: Merge 174141 "HTML Imports: Take care of cycles according to the..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1985/
Patch Set: Created 6 years, 7 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 * 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 } 201 }
202 202
203 void HTMLImportLoader::removeImport(HTMLImportChild* client) 203 void HTMLImportLoader::removeImport(HTMLImportChild* client)
204 { 204 {
205 ASSERT(kNotFound != m_imports.find(client)); 205 ASSERT(kNotFound != m_imports.find(client));
206 m_imports.remove(m_imports.find(client)); 206 m_imports.remove(m_imports.find(client));
207 } 207 }
208 208
209 bool HTMLImportLoader::shouldBlockScriptExecution() const 209 bool HTMLImportLoader::shouldBlockScriptExecution() const
210 { 210 {
211 for (size_t i = 0; i < m_imports.size(); ++i) { 211 return firstImport()->state().shouldBlockScriptExecution();
212 if (!m_imports[i]->state().shouldBlockScriptExecution())
213 return false;
214 }
215
216 return true;
217 } 212 }
218 213
219 PassRefPtr<CustomElementMicrotaskQueue> HTMLImportLoader::microtaskQueue() const 214 PassRefPtr<CustomElementMicrotaskQueue> HTMLImportLoader::microtaskQueue() const
220 { 215 {
221 return m_microtaskQueue; 216 return m_microtaskQueue;
222 } 217 }
223 218
224 } // namespace WebCore 219 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/imports/HTMLImportLoader.h ('k') | Source/core/html/imports/HTMLImportStateResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698