Changeset 204006 in webkit

Timestamp:

Aug 1, 2016 6:44:43 PM (8 years ago)

Author:

akling@apple.com

Message:

Shrink MediaQuerySets to fit after parsing.
<​https://webkit.org/b/160419>

Reviewed by Antti Koivisto.

Add shrinkToFit() helpers to MediaQuerySet and MediaQuery
and call it after parsing to remove extra capacity from their
internal vectors.

This reduces memory usage by 1.24MB on theverge.com.

• css/CSSParser.cpp:

(WebCore::CSSParser::createMediaRule):

• css/MediaList.cpp:

(WebCore::MediaQuerySet::parse):
(WebCore::MediaQuerySet::shrinkToFit):

• css/MediaList.h:
• css/MediaQuery.h:

(WebCore::MediaQuery::shrinkToFit):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• css/MediaList.cpp (modified) (2 diffs)
• css/MediaList.h (modified) (1 diff)
• css/MediaQuery.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-01  Andreas Kling  <akling@apple.com>
+
+        Shrink MediaQuerySets to fit after parsing.
+        <https://webkit.org/b/160419>
+
+        Reviewed by Antti Koivisto.
+
+        Add shrinkToFit() helpers to MediaQuerySet and MediaQuery
+        and call it after parsing to remove extra capacity from their
+        internal vectors.
+
+        This reduces memory usage by 1.24MB on theverge.com.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createMediaRule):
+        * css/MediaList.cpp:
+        (WebCore::MediaQuerySet::parse):
+        (WebCore::MediaQuerySet::shrinkToFit):
+        * css/MediaList.h:
+        * css/MediaQuery.h:
+        (WebCore::MediaQuery::shrinkToFit):
+
 2016-08-01  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -12906 +12906 @@
         // even when it is syntactically incorrect.
         rule = StyleRuleMedia::create(MediaQuerySet::create(), emptyRules);
-    } else
+    } else {
+        media->shrinkToFit();
         rule = StyleRuleMedia::create(media.releaseNonNull(), rules ? *rules : emptyRules);
+    }
     processAndAddNewRuleToSourceTreeIfNeeded();
     return rule.releaseNonNull();

trunk/Source/WebCore/css/MediaList.cpp

@@ -159 +159 @@
     }
     m_queries = WTFMove(result);
+    shrinkToFit();
     return true;
 }
@@ -197 +198 @@
     }
     return text.toString();
+}
+
+void MediaQuerySet::shrinkToFit()
+{
+    m_queries.shrinkToFit();
+    for (auto& query : m_queries)
+        query.shrinkToFit();
 }
 

trunk/Source/WebCore/css/MediaList.h

@@ -67 +67 @@
     Ref<MediaQuerySet> copy() const { return adoptRef(*new MediaQuerySet(*this)); }
 
+    void shrinkToFit();
+
 private:
     MediaQuerySet();

trunk/Source/WebCore/css/MediaQuery.h

@@ -50 +50 @@
     bool operator==(const MediaQuery& other) const;
 
+    void shrinkToFit() { m_expressions.shrinkToFit(); }
+
 private:
     String serialize() const;