Introduce ScriptLoader::script_type_

third_party/WebKit/Source/core/dom/ScriptLoader.h

 /*
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 40 matching lines @@
   ~ScriptLoader() override;
   DECLARE_VIRTUAL_TRACE();
 
   enum LegacyTypeSupport {
     kDisallowLegacyTypeInTypeAttribute,
     kAllowLegacyTypeInTypeAttribute
   };
   static bool IsValidScriptTypeAndLanguage(
       const String& type_attribute_value,
       const String& language_attribute_value,
-      LegacyTypeSupport support_legacy_types);
+      LegacyTypeSupport support_legacy_types,
+      ScriptType& out_script_type);
 
   // https://html.spec.whatwg.org/#prepare-a-script
   bool PrepareScript(const TextPosition& script_start_position =
                          TextPosition::MinimumPosition(),
                      LegacyTypeSupport = kDisallowLegacyTypeInTypeAttribute);
 
   String ScriptContent() const;
 
   // Creates a PendingScript for external script whose fetch is started in
   // fetchScript().
   PendingScript* CreatePendingScript();
 
   // Returns false if and only if execution was blocked.
   bool ExecuteScript(const Script*);
   virtual void Execute();
 
   // XML parser calls these
   void DispatchLoadEvent();
   void DispatchErrorEvent();
-  bool IsScriptTypeSupported(LegacyTypeSupport) const;
+  bool IsScriptTypeSupported(LegacyTypeSupport,
+                             ScriptType& out_script_type) const;
 
   bool HaveFiredLoadEvent() const { return have_fired_load_; }
   bool WillBeParserExecuted() const { return will_be_parser_executed_; }
   bool ReadyToBeParserExecuted() const { return ready_to_be_parser_executed_; }
   bool WillExecuteWhenDocumentFinishedParsing() const {
     return will_execute_when_document_finished_parsing_;
   }
   ScriptResource* GetResource() { return resource_.Get(); }
 
   void SetHaveFiredLoadEvent(bool have_fired_load) {
     have_fired_load_ = have_fired_load;
   }
   bool IsParserInserted() const { return parser_inserted_; }
   bool AlreadyStarted() const { return already_started_; }
   bool IsNonBlocking() const { return non_blocking_; }
+  ScriptType GetScriptType() const { return script_type_; }
 
   // Helper functions used by our parent classes.
   void DidNotifySubtreeInsertionsToDocument();
   void ChildrenChanged();
   void HandleSourceAttribute(const String& source_url);
   void HandleAsyncAttribute();
 
   virtual bool IsReady() const {
     return pending_script_ && pending_script_->IsReady();
   }
@@ skipping 49 matching lines @@
 
   // https://html.spec.whatwg.org/#non-blocking
   // "Initially, script elements must have this flag set."
   bool non_blocking_ = true;
 
   // https://html.spec.whatwg.org/#ready-to-be-parser-executed
   // "Initially, script elements must have this flag unset"
   bool ready_to_be_parser_executed_ = false;
 
   // https://html.spec.whatwg.org/#concept-script-type
-  // TODO(hiroshige): Implement "script's type".
+  // "It is determined when the script is prepared"
+  // TODO(hiroshige): Currently |script_type_| is set but ignored, and
+  // thus is handled as if it is a classic script even if type is "module"
+  // and module scripts is enabled.
+  ScriptType script_type_ = ScriptType::kClassic;

[kouhei (in TOK), 2017/04/15 01:18:23]

Should we have "invalid" ScriptType so that we can ensure that script_type_ was
determined somewhere in the pipeline?

 
   // https://html.spec.whatwg.org/#concept-script-external
   // "It is determined when the script is prepared"
   bool is_external_script_ = false;
 
   bool have_fired_load_;
 
   // Same as "The parser will handle executing the script."
   bool will_be_parser_executed_;
 
@@ skipping 16 matching lines @@
   };
 
   DocumentWriteIntervention document_write_intervention_;
 
   Member<PendingScript> pending_script_;
 };
 
 }  // namespace blink
 
 #endif  // ScriptLoader_h