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

Side by Side Diff: Source/core/html/HTMLImportsController.cpp

Issue 19762002: [HTML Imports] Let script of imported document running. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Made a test more robust. Created 7 years, 4 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/html/HTMLImport.h ('k') | Source/core/html/parser/HTMLDocumentParser.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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 HTMLImportLoader::State HTMLImportLoader::finishParsing() 202 HTMLImportLoader::State HTMLImportLoader::finishParsing()
203 { 203 {
204 if (!m_parent) 204 if (!m_parent)
205 return StateError; 205 return StateError;
206 return StateReady; 206 return StateReady;
207 } 207 }
208 208
209 Document* HTMLImportLoader::importedDocument() const 209 Document* HTMLImportLoader::importedDocument() const
210 { 210 {
211 if (m_state != StateReady) 211 if (m_state == StateError)
212 return 0; 212 return 0;
213 return m_importedDocument.get(); 213 return m_importedDocument.get();
214 } 214 }
215 215
216 void HTMLImportLoader::importDestroyed() 216 void HTMLImportLoader::importDestroyed()
217 { 217 {
218 m_parent = 0; 218 m_parent = 0;
219 if (RefPtr<Document> document = m_importedDocument.release()) 219 if (RefPtr<Document> document = m_importedDocument.release())
220 document->setImport(0); 220 document->setImport(0);
221 } 221 }
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 void HTMLImportsController::wasDetachedFromDocument() 346 void HTMLImportsController::wasDetachedFromDocument()
347 { 347 {
348 clear(); 348 clear();
349 } 349 }
350 350
351 void HTMLImportsController::didFinishParsing() 351 void HTMLImportsController::didFinishParsing()
352 { 352 {
353 } 353 }
354 354
355 } // namespace WebCore 355 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLImport.h ('k') | Source/core/html/parser/HTMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698