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

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

Issue 1035803002: Remove ResourceFetcher's access to a real FetchContext at frame detach time (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moved ASSERT(!m_importsController) to #if !ENABLE(OILPAN) block 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/html/imports/LinkImport.cpp » ('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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 { 55 {
56 #if !ENABLE(OILPAN) 56 #if !ENABLE(OILPAN)
57 dispose(); 57 dispose();
58 #endif 58 #endif
59 } 59 }
60 60
61 void HTMLImportLoader::dispose() 61 void HTMLImportLoader::dispose()
62 { 62 {
63 m_controller = nullptr; 63 m_controller = nullptr;
64 if (m_document) { 64 if (m_document) {
65 if (m_document->parser())
66 m_document->parser()->removeClient(this);
65 m_document->setImportsController(nullptr); 67 m_document->setImportsController(nullptr);
66 m_document->cancelParsing(); 68 m_document->cancelParsing();
67 m_document.clear(); 69 m_document.clear();
68 } 70 }
69 } 71 }
70 72
71 void HTMLImportLoader::startLoading(const ResourcePtr<RawResource>& resource) 73 void HTMLImportLoader::startLoading(const ResourcePtr<RawResource>& resource)
72 { 74 {
73 setResource(resource); 75 setResource(resource);
74 } 76 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 #if ENABLE(OILPAN) 224 #if ENABLE(OILPAN)
223 visitor->trace(m_imports); 225 visitor->trace(m_imports);
224 #endif 226 #endif
225 visitor->trace(m_document); 227 visitor->trace(m_document);
226 visitor->trace(m_writer); 228 visitor->trace(m_writer);
227 visitor->trace(m_microtaskQueue); 229 visitor->trace(m_microtaskQueue);
228 DocumentParserClient::trace(visitor); 230 DocumentParserClient::trace(visitor);
229 } 231 }
230 232
231 } // namespace blink 233 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/html/imports/LinkImport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698