[Script Spec Annotation] Annotate and refactor script element's flags

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 73 matching lines @@
   bool willExecuteWhenDocumentFinishedParsing() const {
     return m_willExecuteWhenDocumentFinishedParsing;
   }
   ScriptResource* resource() { return m_resource.get(); }
 
   void setHaveFiredLoadEvent(bool haveFiredLoad) {
     m_haveFiredLoad = haveFiredLoad;
   }
   bool isParserInserted() const { return m_parserInserted; }
   bool alreadyStarted() const { return m_alreadyStarted; }
-  bool forceAsync() const { return m_forceAsync; }
+  bool isNonBlocking() const { return m_nonBlocking; }
 
   // Helper functions used by our parent classes.
   void didNotifySubtreeInsertionsToDocument();
   void childrenChanged();
   void handleSourceAttribute(const String& sourceUrl);
   void handleAsyncAttribute();
 
   virtual bool isReady() const {
     return m_pendingScript && m_pendingScript->isReady();
   }
@@ skipping 30 matching lines @@
 
   ScriptLoaderClient* client() const;
 
   // PendingScriptClient
   void pendingScriptFinished(PendingScript*) override;
 
   Member<Element> m_element;
   Member<ScriptResource> m_resource;
   WTF::OrdinalNumber m_startLineNumber;
 
-  bool m_parserInserted : 1;
-  bool m_isExternalScript : 1;
-  bool m_alreadyStarted : 1;
-  bool m_haveFiredLoad : 1;
+  // https://html.spec.whatwg.org/#script-processing-model
+  // "A script element has several associated pieces of state.":
+
+  // https://html.spec.whatwg.org/#already-started

[kouhei (in TOK), 2017/02/13 21:31:09]

Should we // "Initially, script elements must have this flag unset" here, and =
false?

[hiroshige, 2017/02/13 21:46:53]

Done. Applied the same to other flags and modifies the constructor.
Please confirm that the modification preserves the behavior.

+  bool m_alreadyStarted;
+
+  // https://html.spec.whatwg.org/#parser-inserted
+  bool m_parserInserted;
+
+  // https://html.spec.whatwg.org/#non-blocking
+  bool m_nonBlocking;

[hiroshige, 2017/02/13 21:17:25]

Renamed from m_forceAsync.

+
+  // https://html.spec.whatwg.org/#ready-to-be-parser-executed
+  // "Initially, script elements must have this flag unset"
+  bool m_readyToBeParserExecuted = false;
+
+  // https://html.spec.whatwg.org/#concept-script-type
+  // TODO(hiroshige): Implement "script's type".

[hiroshige, 2017/02/13 21:17:25]

I'm not sure whether we'll implement the script type here, but I put this
comment just as a placeholder/reminder.

[kouhei (in TOK), 2017/02/13 21:31:09]

sgtm

+
+  // https://html.spec.whatwg.org/#concept-script-external
+  bool m_isExternalScript;
+
+  bool m_haveFiredLoad;
+
   // Same as "The parser will handle executing the script."
-  bool m_willBeParserExecuted : 1;
-  bool m_readyToBeParserExecuted : 1;
-  bool m_willExecuteWhenDocumentFinishedParsing : 1;
-  bool m_forceAsync : 1;
-  const bool m_createdDuringDocumentWrite : 1;
+  bool m_willBeParserExecuted;
+
+  bool m_willExecuteWhenDocumentFinishedParsing;
+
+  const bool m_createdDuringDocumentWrite;
 
   ScriptRunner::AsyncExecutionType m_asyncExecType;
   enum DocumentWriteIntervention {
     DocumentWriteInterventionNone = 0,
     // Based on what shouldDisallowFetchForMainFrameScript() returns.
     // This script will be blocked if not present in http cache.
     DoNotFetchDocWrittenScript,
     // If a parser blocking doc.written script was not fetched and was not
     // present in the http cache, send a GET for it with an interventions
     // header to allow the server to know of the intervention. This fetch
     // will be using DeferOption::IdleLoad to keep it out of the critical
     // path.
     FetchDocWrittenScriptDeferIdle,
   };
 
   DocumentWriteIntervention m_documentWriteIntervention;
 
   Member<PendingScript> m_pendingScript;
 };
 
 ScriptLoader* toScriptLoaderIfPossible(Element*);
 
 }  // namespace blink
 
 #endif  // ScriptLoader_h