Changeset 149707 in webkit

Timestamp:

May 7, 2013 6:47:57 PM (11 years ago)

Author:

andersca@apple.com

Message:

Store the quotes in the same allocation as the QuotesData object
​https://bugs.webkit.org/show_bug.cgi?id=115768

Reviewed by Andreas Kling.

Since the QuotesData object is immutable we don't need a Vector to store the quote pairs,
they can just be stored after the class data.

• rendering/style/QuotesData.cpp:

(WebCore::sizeForQuotesDataWithQuoteCount):
Helper function for computing the allocation size.

(WebCore::QuotesData::create):
Use fastMalloc + placement new.

(WebCore::QuotesData::QuotesData):
Use placement new to allocate the quote pairs.

(WebCore::QuotesData::~QuotesData):
Destroy the quote pairs.

(WebCore::QuotesData::openQuote):
Stop using Vector.

(WebCore::QuotesData::closeQuote):
Ditto.

(WebCore::operator==):
Ditto.

• rendering/style/QuotesData.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/QuotesData.cpp (modified) (3 diffs)
• rendering/style/QuotesData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-07  Anders Carlsson  <andersca@apple.com>
+
+        Store the quotes in the same allocation as the QuotesData object
+        https://bugs.webkit.org/show_bug.cgi?id=115768
+
+        Reviewed by Andreas Kling.
+
+        Since the QuotesData object is immutable we don't need a Vector to store the quote pairs,
+        they can just be stored after the class data.
+
+        * rendering/style/QuotesData.cpp:
+        (WebCore::sizeForQuotesDataWithQuoteCount):
+        Helper function for computing the allocation size.
+
+        (WebCore::QuotesData::create):
+        Use fastMalloc + placement new.
+
+        (WebCore::QuotesData::QuotesData):
+        Use placement new to allocate the quote pairs.
+
+        (WebCore::QuotesData::~QuotesData):
+        Destroy the quote pairs.
+
+        (WebCore::QuotesData::openQuote):
+        Stop using Vector.
+
+        (WebCore::QuotesData::closeQuote):
+        Ditto.
+
+        (WebCore::operator==):
+        Ditto.
+
+        * rendering/style/QuotesData.h:
+
 2013-05-07  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/rendering/style/QuotesData.cpp

@@ -25 +25 @@
 namespace WebCore {
 
+static size_t sizeForQuotesDataWithQuoteCount(unsigned count)
+{
+    return sizeof(QuotesData) + sizeof(std::pair<String, String>) * count;
+}
+
 PassRefPtr<QuotesData> QuotesData::create(const String& open1, const String& close1, const String& open2, const String& close2)
 {
@@ -37 +42 @@
 PassRefPtr<QuotesData> QuotesData::create(const Vector<std::pair<String, String> >& quotes)
 {
-    RefPtr<QuotesData> quotesData = adoptRef(new QuotesData);
-    quotesData->m_quotePairs = quotes;
+    void* slot = fastMalloc(sizeForQuotesDataWithQuoteCount(quotes.size()));
+    return adoptRef(new (NotNull, slot) QuotesData(quotes));
+}
 
-    return quotesData.release();
+QuotesData::QuotesData(const Vector<std::pair<String, String> >& quotes)
+    : m_quoteCount(quotes.size())
+{
+    for (unsigned i = 0; i < m_quoteCount; ++i)
+        new (NotNull, &m_quotePairs[i]) std::pair<String, String>(quotes[i]);
+}
+
+QuotesData::~QuotesData()
+{
+    for (unsigned i = 0; i < m_quoteCount; ++i)
+        m_quotePairs[i].~pair<String, String>();
 }
 
 const String& QuotesData::openQuote(unsigned index) const
 {
-    if (!m_quotePairs.isEmpty())
+    if (!m_quoteCount)
         return emptyString();
 
-    if (index >= m_quotePairs.size())
-        return m_quotePairs.last().first;
+    if (index >= m_quoteCount)
+        return m_quotePairs[m_quoteCount - 1].first;
 
     return m_quotePairs[index].first;
@@ -56 +72 @@
 const String& QuotesData::closeQuote(unsigned index) const
 {
-    if (m_quotePairs.isEmpty())
+    if (!m_quoteCount)
         return emptyString();
 
-    if (index >= m_quotePairs.size())
-        return m_quotePairs.last().second;
+    if (index >= m_quoteCount)
+        return m_quotePairs[m_quoteCount - 1].second;
 
-    return m_quotePairs.at(index).second;
+    return m_quotePairs[index].second;
 }
 
 bool operator==(const QuotesData& a, const QuotesData& b)
 {
-    return a.m_quotePairs == b.m_quotePairs;
+    if (a.m_quoteCount != b.m_quoteCount)
+        return false;
+
+    for (unsigned i = 0; i < a.m_quoteCount; ++i) {
+        if (a.m_quotePairs[i] != b.m_quotePairs[i])
+            return false;
+    }
+
+    return true;
 }
 

trunk/Source/WebCore/rendering/style/QuotesData.h

@@ -30 +30 @@
 namespace WebCore {
 
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
+#endif
+
 class QuotesData : public RefCounted<QuotesData> {
 public:
     static PassRefPtr<QuotesData> create(const String& open1, const String& close1, const String& open2, const String& close2);
     static PassRefPtr<QuotesData> create(const Vector<std::pair<String, String> >& quotes);
+    ~QuotesData();
 
     friend bool operator==(const QuotesData&, const QuotesData&);
@@ -41 +47 @@
 
 private:
-    QuotesData() { }
+    explicit QuotesData(const Vector<std::pair<String, String> >& quotes);
 
-    Vector<std::pair<String, String> > m_quotePairs;
+    unsigned m_quoteCount;
+    std::pair<String, String> m_quotePairs[0];
 };
+
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
 
 inline bool operator!=(const QuotesData& a, const QuotesData& b)