Script-based imports should basically work

sky/engine/core/html/parser/HTMLDocumentParser.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
 #else
     ASSERT(!m_parserScheduler);
     ASSERT(!m_pumpSessionNestingLevel);
     ASSERT(!m_haveBackgroundParser);
     // FIXME: We should be able to ASSERT(m_speculations.isEmpty()),
     // but there are cases where that's not true currently. For example,
     // we we're told to stop parsing before we've consumed all the input.
 #endif
 }
 
-void HTMLDocumentParser::parse(mojo::ScopedDataPipeConsumerHandle source)
+void HTMLDocumentParser::parse(mojo::ScopedDataPipeConsumerHandle source,
+                               const base::Closure& completionCallback)
 {
     ASSERT(!isStopped());
     ASSERT(!m_haveBackgroundParser);
     m_haveBackgroundParser = true;
 
+    m_completionCallback = completionCallback;
+
     OwnPtr<BackgroundHTMLParser::Configuration> config = adoptPtr(new BackgroundHTMLParser::Configuration);
     config->source = source.Pass();
     config->parser = m_weakFactory.GetWeakPtr();
 
     m_backgroundParser = BackgroundHTMLParser::create(config.release());
     HTMLParserThread::taskRunner()->PostTask(FROM_HERE,
         base::Bind(&BackgroundHTMLParser::start, m_backgroundParser));
 }
 
 void HTMLDocumentParser::detach()
@@ skipping 256 matching lines @@
 }
 
 void HTMLDocumentParser::end()
 {
     ASSERT(!isDetached());
     ASSERT(!isScheduledForResume());
 
     if (m_haveBackgroundParser)
         stopBackgroundParser();
 
+    // Notice that we copy the compleition callback into a local variable
+    // because we might be deleted after we call ffinish() below.
+    base::Closure completionCallback = m_completionCallback;
+
     // Informs the the rest of WebCore that parsing is really finished (and deletes this).
     m_treeBuilder->finished();
+
+    completionCallback.Run();
 }
 
 void HTMLDocumentParser::attemptToEnd()
 {
     if (shouldDelayEnd()) {
         m_endWasDelayed = true;
         return;
     }
     prepareToStopParsing();
 }
@@ skipping 51 matching lines @@
 {
     if (!m_scriptRunner.hasPendingScripts())
         return;
     RefPtr<HTMLDocumentParser> protect(this);
     m_scriptRunner.executePendingScripts();
     if (!isWaitingForScripts())
         resumeParsingAfterScriptExecution();
 }
 
 }