[webkit-changes] [119348] trunk/Source/WebCore

[rniwa]

Title: [119348] trunk/Source/WebCore

Revision

119348

Author

rn...@webkit.org

Date

2012-06-02 19:38:34 -0700 (Sat, 02 Jun 2012)

Log Message

Windows build fix after r119330. Unnest the class for now.

* dom/SelectorQuery.cpp:
(WebCore::SelectorQueryCacheEntry::SelectorQueryCacheEntry):
(WebCore::SelectorQueryCache::add):
* dom/SelectorQuery.h:
(SelectorQueryCacheEntry):
(WebCore::SelectorQueryCacheEntry::selectorQuery):
(WebCore):
(SelectorQueryCache):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/dom/SelectorQuery.cpp
• trunk/Source/WebCore/dom/SelectorQuery.h

Diff

Modified: trunk/Source/WebCore/ChangeLog (119347 => 119348)

--- trunk/Source/WebCore/ChangeLog	2012-06-03 02:33:02 UTC (rev 119347)
+++ trunk/Source/WebCore/ChangeLog	2012-06-03 02:38:34 UTC (rev 119348)
@@ -1,3 +1,16 @@
+2012-06-02  Ryosuke Niwa  <rn...@webkit.org>
+
+        Windows build fix after r119330. Unnest the class for now.
+
+        * dom/SelectorQuery.cpp:
+        (WebCore::SelectorQueryCacheEntry::SelectorQueryCacheEntry):
+        (WebCore::SelectorQueryCache::add):
+        * dom/SelectorQuery.h:
+        (SelectorQueryCacheEntry):
+        (WebCore::SelectorQueryCacheEntry::selectorQuery):
+        (WebCore):
+        (SelectorQueryCache):
+
 2012-06-02  Geoffrey Garen  <gga...@apple.com>
 
         DOM string cache should hash pointers, not characters

Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (119347 => 119348)

--- trunk/Source/WebCore/dom/SelectorQuery.cpp	2012-06-03 02:33:02 UTC (rev 119347)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp	2012-06-03 02:38:34 UTC (rev 119348)
@@ -162,14 +162,15 @@
     return m_selectors.queryFirst(selectorChecker, rootNode);
 }
 
-SelectorQueryCache::Entry::Entry(CSSSelectorList& querySelectorList) : m_querySelectorList(querySelectorList)
+SelectorQueryCacheEntry::SelectorQueryCacheEntry(CSSSelectorList& querySelectorList)
+    : m_querySelectorList(querySelectorList)
 {
     m_selectorQuery.initialize(m_querySelectorList);
 }
 
 SelectorQuery* SelectorQueryCache::add(const AtomicString& selectors, Document* document, ExceptionCode& ec)
 {
-    HashMap<AtomicString, OwnPtr<SelectorQueryCache::Entry> >::iterator it = m_entries.find(selectors);
+    HashMap<AtomicString, OwnPtr<SelectorQueryCacheEntry> >::iterator it = m_entries.find(selectors);
     if (it != m_entries.end())
         return it->second->selectorQuery();
 
@@ -188,7 +189,7 @@
         return 0;
     }
     
-    OwnPtr<SelectorQueryCache::Entry> entry = adoptPtr(new SelectorQueryCache::Entry(querySelectorList));
+    OwnPtr<SelectorQueryCacheEntry> entry = adoptPtr(new SelectorQueryCacheEntry(querySelectorList));
     SelectorQuery* selectorQuery = entry->selectorQuery();
     m_entries.add(selectors, entry.release());
     return selectorQuery;

Modified: trunk/Source/WebCore/dom/SelectorQuery.h (119347 => 119348)

--- trunk/Source/WebCore/dom/SelectorQuery.h	2012-06-03 02:33:02 UTC (rev 119347)
+++ trunk/Source/WebCore/dom/SelectorQuery.h	2012-06-03 02:38:34 UTC (rev 119348)
@@ -76,6 +76,21 @@
     SelectorDataList m_selectors;
 };
 
+class SelectorQueryCacheEntry {
+    WTF_MAKE_NONCOPYABLE(SelectorQueryCacheEntry);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    explicit SelectorQueryCacheEntry(CSSSelectorList&);
+    SelectorQuery* selectorQuery() { return &m_selectorQuery; };
+
+private:
+    // m_querySelectorList keeps the lifetime of CSSSelectors in m_selectorQuery.
+    // Since m_selectorQuery just holds pointers to CSSSelector objects,
+    // m_querySelectorList must not be destructed before m_selectorQuery is destructed.
+    CSSSelectorList m_querySelectorList;
+    SelectorQuery m_selectorQuery;
+};
+
 class SelectorQueryCache {
     WTF_MAKE_NONCOPYABLE(SelectorQueryCache);
     WTF_MAKE_FAST_ALLOCATED;
@@ -86,23 +101,7 @@
     void invalidate();
 
 private:
-
-    class Entry {
-        WTF_MAKE_NONCOPYABLE(Entry);
-        WTF_MAKE_FAST_ALLOCATED;
-    public:
-        explicit Entry(CSSSelectorList&);
-        SelectorQuery* selectorQuery() { return &m_selectorQuery; };
-
-    private:
-        // m_querySelectorList keeps the lifetime of CSSSelectors in m_selectorQuery.
-        // Since m_selectorQuery just holds pointers to CSSSelector objects,
-        // m_querySelectorList must not be destructed before m_selectorQuery is destructed.
-        CSSSelectorList m_querySelectorList;
-        SelectorQuery m_selectorQuery;
-    };
-
-    HashMap<AtomicString, OwnPtr<SelectorQueryCache::Entry> > m_entries;
+    HashMap<AtomicString, OwnPtr<SelectorQueryCacheEntry> > m_entries;
 };
 
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes