[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4daea601a7940a9c40617a581e138fdaacb32b98
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 18:55:35 2010 +0000

    2010-12-24  Jan Erik Hanssen  <jhanssen at sencha.com>
    
            Reviewed by Eric Seidel.
    
            Clean up CSSRuleData in CSSStyleSelector.h
            https://bugs.webkit.org/show_bug.cgi?id=27753
    
            Move CSSRuleData and CSSRuleDataList from CSSStyleSelector.h to the .cpp file.
    
            * css/CSSStyleSelector.cpp:
            (WebCore::CSSRuleData::CSSRuleData):
            (WebCore::CSSRuleData::~CSSRuleData):
            (WebCore::CSSRuleData::position):
            (WebCore::CSSRuleData::rule):
            (WebCore::CSSRuleData::selector):
            (WebCore::CSSRuleData::next):
            (WebCore::CSSRuleDataList::CSSRuleDataList):
            (WebCore::CSSRuleDataList::~CSSRuleDataList):
            (WebCore::CSSRuleDataList::first):
            (WebCore::CSSRuleDataList::last):
            (WebCore::CSSRuleDataList::append):
            * css/CSSStyleSelector.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5540f51..c3343f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-12-24  Jan Erik Hanssen  <jhanssen at sencha.com>
+
+        Reviewed by Eric Seidel.
+
+        Clean up CSSRuleData in CSSStyleSelector.h
+        https://bugs.webkit.org/show_bug.cgi?id=27753
+
+        Move CSSRuleData and CSSRuleDataList from CSSStyleSelector.h to the .cpp file.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSRuleData::CSSRuleData):
+        (WebCore::CSSRuleData::~CSSRuleData):
+        (WebCore::CSSRuleData::position):
+        (WebCore::CSSRuleData::rule):
+        (WebCore::CSSRuleData::selector):
+        (WebCore::CSSRuleData::next):
+        (WebCore::CSSRuleDataList::CSSRuleDataList):
+        (WebCore::CSSRuleDataList::~CSSRuleDataList):
+        (WebCore::CSSRuleDataList::first):
+        (WebCore::CSSRuleDataList::last):
+        (WebCore::CSSRuleDataList::append):
+        * css/CSSStyleSelector.h:
+
 2010-12-24  Yury Semikhatsky  <yurys at chromium.org>
 
         Unreviewed. Fix compilation on Windows.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index e7d207a..1ab7f40 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -348,6 +348,64 @@ if (id == propID) { \
     return; \
 }
 
+class CSSRuleData : public Noncopyable {
+public:
+    CSSRuleData(unsigned pos, CSSStyleRule* r, CSSSelector* sel, CSSRuleData* prev = 0)
+        : m_position(pos)
+        , m_rule(r)
+        , m_selector(sel)
+        , m_next(0)
+    {
+        if (prev)
+            prev->m_next = this;
+    }
+
+    ~CSSRuleData()
+    {
+    }
+
+    unsigned position() { return m_position; }
+    CSSStyleRule* rule() { return m_rule; }
+    CSSSelector* selector() { return m_selector; }
+    CSSRuleData* next() { return m_next; }
+
+private:
+    unsigned m_position;
+    CSSStyleRule* m_rule;
+    CSSSelector* m_selector;
+    CSSRuleData* m_next;
+};
+
+class CSSRuleDataList : public Noncopyable {
+public:
+    CSSRuleDataList(unsigned pos, CSSStyleRule* rule, CSSSelector* sel)
+        : m_first(new CSSRuleData(pos, rule, sel))
+        , m_last(m_first)
+    {
+    }
+
+    ~CSSRuleDataList()
+    {
+        CSSRuleData* ptr;
+        CSSRuleData* next;
+        ptr = m_first;
+        while (ptr) {
+            next = ptr->next();
+            delete ptr;
+            ptr = next;
+        }
+    }
+
+    CSSRuleData* first() { return m_first; }
+    CSSRuleData* last() { return m_last; }
+
+    void append(unsigned pos, CSSStyleRule* rule, CSSSelector* sel) { m_last = new CSSRuleData(pos, rule, sel, m_last); }
+
+private:
+    CSSRuleData* m_first;
+    CSSRuleData* m_last;
+};
+
 class CSSRuleSet : public Noncopyable {
 public:
     CSSRuleSet();
diff --git a/WebCore/css/CSSStyleSelector.h b/WebCore/css/CSSStyleSelector.h
index b718751..87f6a95 100644
--- a/WebCore/css/CSSStyleSelector.h
+++ b/WebCore/css/CSSStyleSelector.h
@@ -315,64 +315,6 @@ public:
         Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults;
     };
 
-    class CSSRuleData : public Noncopyable {
-    public:
-        CSSRuleData(unsigned pos, CSSStyleRule* r, CSSSelector* sel, CSSRuleData* prev = 0)
-            : m_position(pos)
-            , m_rule(r)
-            , m_selector(sel)
-            , m_next(0)
-        {
-            if (prev)
-                prev->m_next = this;
-        }
-
-        ~CSSRuleData() 
-        { 
-        }
-
-        unsigned position() { return m_position; }
-        CSSStyleRule* rule() { return m_rule; }
-        CSSSelector* selector() { return m_selector; }
-        CSSRuleData* next() { return m_next; }
-
-    private:
-        unsigned m_position;
-        CSSStyleRule* m_rule;
-        CSSSelector* m_selector;
-        CSSRuleData* m_next;
-    };
-
-    class CSSRuleDataList : public Noncopyable {
-    public:
-        CSSRuleDataList(unsigned pos, CSSStyleRule* rule, CSSSelector* sel)
-            : m_first(new CSSRuleData(pos, rule, sel))
-            , m_last(m_first)
-        {
-        }
-
-        ~CSSRuleDataList() 
-        { 
-            CSSRuleData* ptr;
-            CSSRuleData* next;
-            ptr = m_first;
-            while (ptr) {
-                next = ptr->next();
-                delete ptr;
-                ptr = next;
-            }
-        }
-
-        CSSRuleData* first() { return m_first; }
-        CSSRuleData* last() { return m_last; }
-
-        void append(unsigned pos, CSSStyleRule* rule, CSSSelector* sel) { m_last = new CSSRuleData(pos, rule, sel, m_last); }
-
-    private:
-        CSSRuleData* m_first;
-        CSSRuleData* m_last;
-    };
-
 } // namespace WebCore
 
 #endif // CSSStyleSelector_h

-- 
WebKit Debian packaging