Changeset 192989 in webkit

Timestamp:

Dec 2, 2015 7:29:24 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Reduce size of ScriptElement
​https://bugs.webkit.org/show_bug.cgi?id=151786

Patch by Alex Christensen <​achristensen@webkit.org> on 2015-12-02
Reviewed by Andreas Kling.

• dom/ScriptElement.cpp:

(WebCore::ScriptElement::ScriptElement):
(WebCore::ScriptElement::requestScript):

• dom/ScriptElement.h:

Use callOnMainThread instead of a Timer to save memory on a timer that is rarely used.
Use bit fields for the boolean values to save another 8 bytes per ScriptElement.
This reduces sizeof(ScriptElement) from 168 to 48 bytes.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ScriptElement.cpp (modified) (2 diffs)
• dom/ScriptElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-02  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce size of ScriptElement
+        https://bugs.webkit.org/show_bug.cgi?id=151786
+
+        Reviewed by Andreas Kling.
+
+        * dom/ScriptElement.cpp:
+        (WebCore::ScriptElement::ScriptElement):
+        (WebCore::ScriptElement::requestScript):
+        * dom/ScriptElement.h:
+        Use callOnMainThread instead of a Timer to save memory on a timer that is rarely used.
+        Use bit fields for the boolean values to save another 8 bytes per ScriptElement.
+        This reduces sizeof(ScriptElement) from 168 to 48 bytes.
+
 2015-12-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/dom/ScriptElement.cpp

@@ -60 +60 @@
     , m_startLineNumber(WTF::OrdinalNumber::beforeFirst())
     , m_parserInserted(parserInserted)
+    , m_isExternalScript(false)
     , m_alreadyStarted(alreadyStarted)
+    , m_haveFiredLoad(false)
+    , m_willBeParserExecuted(false)
+    , m_readyToBeParserExecuted(false)
+    , m_willExecuteWhenDocumentFinishedParsing(false)
     , m_forceAsync(!parserInserted)
-    , m_errorEventTimer(*this, &ScriptElement::dispatchErrorEvent)
+    , m_willExecuteInOrder(false)
+    , m_requestUsesAccessControl(false)
 {
     if (parserInserted && m_element.document().scriptableDocumentParser() && !m_element.document().isInDocumentWrite())
@@ -270 +276 @@
         return true;
 
-    m_errorEventTimer.startOneShot(0);
+    RefPtr<Element> element = &m_element;
+    callOnMainThread([this, element] {
+        dispatchErrorEvent();
+    });
     return false;
 }

trunk/Source/WebCore/dom/ScriptElement.h

@@ -99 +99 @@
     CachedResourceHandle<CachedScript> m_cachedScript;
     WTF::OrdinalNumber m_startLineNumber;
-    bool m_parserInserted { false };
-    bool m_isExternalScript { false };
-    bool m_alreadyStarted  { false };
-    bool m_haveFiredLoad  { false };
-    bool m_willBeParserExecuted { false }; // Same as "The parser will handle executing the script."
-    bool m_readyToBeParserExecuted { false };
-    bool m_willExecuteWhenDocumentFinishedParsing { false };
-    bool m_forceAsync { false };
-    bool m_willExecuteInOrder { false };
-    bool m_requestUsesAccessControl { false };
+    bool m_parserInserted : 1;
+    bool m_isExternalScript : 1;
+    bool m_alreadyStarted : 1;
+    bool m_haveFiredLoad : 1;
+    bool m_willBeParserExecuted : 1; // Same as "The parser will handle executing the script."
+    bool m_readyToBeParserExecuted : 1;
+    bool m_willExecuteWhenDocumentFinishedParsing : 1;
+    bool m_forceAsync : 1;
+    bool m_willExecuteInOrder : 1;
+    bool m_requestUsesAccessControl : 1;
     String m_characterEncoding;
     String m_fallbackCharacterEncoding;
-    Timer m_errorEventTimer;
 };