Enable module scripts in ScriptLoader

third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2005, 2006, 2008, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 1094 matching lines @@
       script_element_base ? script_element_base->Loader() : nullptr;
   if (!script_loader) {
     PopCurrentNode();
     return;
   }
 
   // Don't load external scripts for standalone documents (for now).
   DCHECK(!pending_script_);
   requesting_script_ = true;
 
-  if (script_loader->PrepareScript(
-          script_start_position_,
-          ScriptLoader::kAllowLegacyTypeInTypeAttribute)) {
+  bool success = script_loader->PrepareScript(
+      script_start_position_, ScriptLoader::kAllowLegacyTypeInTypeAttribute);
+
+  // XMLDocumentParser does not support module scripts.
+  // FOXME: (how) should we handle this? Should we fail more gracefully?
+  CHECK_EQ(script_loader->GetScriptType(), ScriptType::kClassic);

[kouhei (in TOK), 2017/04/24 01:24:04]

If PrepareScript is ensured to fail in XML document, we should
CHECK_EQ->DCHECK_EQ(after unflag)

If PrepareScript may succeed in XML documents, we should "success = false" and
report it via VLOG

[hiroshige, 2017/04/26 01:09:34]

(Probably) no because ScriptLoader doesn't check whether it is called from
XMLDocument.
Done.

[kouhei (in TOK), 2017/04/26 02:05:27]

Sorry for the back-and-forth （≧∞≦）
Now I think PrepareScript *does* need to care if its in XML doc or not in
itself, as that may kick module tree fetch.

[hiroshige, 2017/04/26 19:10:21]

Hmm. To do so, I think PrepareScript() should take an additional parameter that
indicates whether module script should be invoked or not.

However, I'm not so sure how important that we should block fetching in this
case.
If <script module> is created by JavaScript inside an XML document, then it is
fetched and executed (because it is not processed by this code path IIUC).
I want to disable *parser-inserted* <script module> in an XML document because
we need more implementation for that.

+
+  if (success) {
     // FIXME: Script execution should be shared between
     // the libxml2 and Qt XMLDocumentParser implementations.
 
     if (script_loader->ReadyToBeParserExecuted()) {
       if (!script_loader->ExecuteScript(ClassicScript::Create(ScriptSourceCode(
               script_loader->ScriptContent(), GetDocument()->Url(),
               script_start_position_)))) {
         script_loader->DispatchErrorEvent();
         return;
       }
@@ skipping 591 matching lines @@
   RefPtr<XMLParserContext> parser =
       XMLParserContext::CreateStringParser(&sax, &state);
   String parse_string = "<?xml version=\"1.0\"?><attrs " + string + " />";
   ParseChunk(parser->Context(), parse_string);
   FinishParsing(parser->Context());
   attrs_ok = state.got_attributes;
   return state.attributes;
 }
 
 }  // namespace blink