2006-10-01 Anders Carlsson <acarlsson@apple.com>

        Reviewed by Geoff.

        * dom/Document.cpp:
        (WebCore::Document::recalcStyleSelector):
        * dom/Document.h:
        Get rid of availableStyleSheets() and remove DeprecatedStringList.h include.

        * dom/Node.h:
        Remove DeprecatedStringList class forward declaration.

        * editing/markup.cpp:
        Include DeprecatedStringList.h here since it's not included by Document.h anymore.

        * kcanvas/KCanvasTreeDebug.cpp:
        * kcanvas/KCanvasTreeDebug.h:
        Remove unused functions.

        * loader/loader.cpp:
        * page/Frame.cpp:
        * page/Frame.h:
        * page/FrameView.h:
        Fixup DeprecatedStringList.h includes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d756016337bebd4ba4b9aebcd2518c9f616de89a..fa734792ab08c1cb237b703a33ed3c6be49d9b87 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2006-10-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Geoff.
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyleSelector):
+        * dom/Document.h:
+        Get rid of availableStyleSheets() and remove DeprecatedStringList.h include.
+        
+        * dom/Node.h:
+        Remove DeprecatedStringList class forward declaration.
+        
+        * editing/markup.cpp:
+        Include DeprecatedStringList.h here since it's not included by Document.h anymore.
+        
+        * kcanvas/KCanvasTreeDebug.cpp:
+        * kcanvas/KCanvasTreeDebug.h:
+        Remove unused functions.
+        
+        * loader/loader.cpp:
+        * page/Frame.cpp:
+        * page/Frame.h:
+        * page/FrameView.h:
+        Fixup DeprecatedStringList.h includes.
+
 2006-09-30  David Harrison  <harrison@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 8377f1dd17a359bc55202eb24c84d2f4b1172893..670c1a9a1eb60355b6d39c33c1073e45e7d52607 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -1806,12 +1806,6 @@ void Document::updateStyleSelector()
     }
 }
 
-
-DeprecatedStringList Document::availableStyleSheets() const
-{
-    return m_availableSheets;
-}
-
 void Document::recalcStyleSelector()
 {
     if (!renderer() || !attached())
@@ -1819,7 +1813,6 @@ void Document::recalcStyleSelector()
 
     DeprecatedPtrList<StyleSheet> oldStyleSheets = m_styleSheets->styleSheets;
     m_styleSheets->styleSheets.clear();
-    m_availableSheets.clear();
     Node *n;
     for (n = this; n; n = n->traverseNextNode()) {
         StyleSheet *sheet = 0;
@@ -1897,9 +1890,6 @@ void Document::recalcStyleSelector()
                     if (e->hasLocalName(styleTag) || !rel.contains("alternate"))
                         m_preferredStylesheetSet = m_selectedStylesheetSet = title;
                 }
-                      
-                if (!m_availableSheets.contains(title))
-                    m_availableSheets.append(title);
                 
                 if (title != m_preferredStylesheetSet)
                     sheet = 0;
@@ -1924,9 +1914,6 @@ void Document::recalcStyleSelector()
                     sheet = 0; // don't use it
 
                 title = title.replace('&', "&&");
-
-                if (!m_availableSheets.contains(title))
-                    m_availableSheets.append(title);
             }
        }
 #endif

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 91da5b020a6a623bcb8b86a2baad002b58966939..19dcf291062473efd3f87b017f5fa97412bb6db2 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -29,7 +29,7 @@
 #include "Attr.h"
 #include "Color.h"
 #include "DeprecatedPtrList.h"
-#include "DeprecatedStringList.h"
+#include "DeprecatedValueList.h"
 #include "DocumentMarker.h"
 #include "HTMLCollection.h"
 #include "StringHash.h"
@@ -393,8 +393,6 @@ public:
     String selectedStylesheetSet() const;
     void setSelectedStylesheetSet(const String&);
 
-    DeprecatedStringList availableStyleSheets() const;
-
     Node* focusNode() const { return m_focusNode.get(); }
     bool setFocusNode(PassRefPtr<Node>);
     void clearSelectionIfNeeded(Node*);
@@ -616,7 +614,6 @@ protected:
     RefPtr<StyleSheet> m_sheet;
     String m_usersheet;
     String m_printSheet;
-    DeprecatedStringList m_availableSheets;
 
     // Track the number of currently loading top-level stylesheets.  Sheets
     // loaded using the @import directive are not included in this count.

diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index f1624aa081c796d1aa94c10bbaeeb6debda79ed1..8aad4c4085070da82f65c85ed55a1f7b754b787b 100644 (file)
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -37,7 +37,6 @@ namespace WebCore {
 
 class AtomicString;
 class ContainerNode;
-class DeprecatedStringList;
 class Document;
 class Element;
 class Event;

diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index 1d76b2c4bab59d8fbede899ebcbe7a36240320f3..3b3986f5869b09b276ba9302c967927cfd9644f0 100644 (file)
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -32,6 +32,7 @@
 #include "CSSStyleRule.h"
 #include "cssstyleselector.h"
 #include "Comment.h"
+#include "DeprecatedStringList.h"
 #include "Document.h"
 #include "DocumentFragment.h"
 #include "DocumentType.h"

diff --git a/WebCore/kcanvas/KCanvasTreeDebug.cpp b/WebCore/kcanvas/KCanvasTreeDebug.cpp
index 8203b055b235fa4543f91fcc14516b5011044aeb..f03a954530a2ab52d351790b2d91adfa1010ba61 100644 (file)
--- a/WebCore/kcanvas/KCanvasTreeDebug.cpp
+++ b/WebCore/kcanvas/KCanvasTreeDebug.cpp
@@ -369,22 +369,6 @@ void writeRenderResources(TextStream& ts, Node *parent)
     } while ((node = node->traverseNextNode(parent)));
 }
 
-TextStream& operator<<(TextStream& ts, const DeprecatedStringList &l)
-{
-    ts << "[";
-    DeprecatedStringList::ConstIterator it = l.begin();
-    DeprecatedStringList::ConstIterator it_e = l.end();
-    while (it != it_e)
-    {
-        ts << *it;
-        ++it;
-        if (it != it_e) ts << ", ";
-    }
-    ts << "]";
-    
-    return ts;
-}
-
 }
 
 #endif // SVG_SUPPORT

diff --git a/WebCore/kcanvas/KCanvasTreeDebug.h b/WebCore/kcanvas/KCanvasTreeDebug.h
index 54f8994ac525c21ad112e8ca8427d3f799b33d8b..5930baf339218ca1164d162ef44fb4152590a817 100644 (file)
--- a/WebCore/kcanvas/KCanvasTreeDebug.h
+++ b/WebCore/kcanvas/KCanvasTreeDebug.h
@@ -31,7 +31,6 @@ namespace WebCore {
 
     class AffineTransform;
     class Color;
-    class DeprecatedStringList;
     class FloatPoint;
     class FloatRect;
     class FloatSize;
@@ -60,8 +59,6 @@ TextStream& operator<<(TextStream&, const FloatPoint&);
 // helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
 // these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
     
-TextStream& operator<<(TextStream&, const DeprecatedStringList&);
-    
 template<typename Item>
 TextStream& operator<<(TextStream& ts, const DeprecatedValueList<Item*>& l)
 {

diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index 77ddafb75baed2d49d5218ae6ffbab45289f95e2..90bfb7cc334053203e63e2a2331ce17e2cde7cf5 100644 (file)
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -32,6 +32,7 @@
 #include "Cache.h"
 #include "CachedImage.h"
 #include "CachedResource.h"
+#include "DeprecatedStringList.h"
 #include "DocLoader.h"
 #include "Frame.h"
 #include "HTMLDocument.h"

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index eec78e8be1efd8e045bbaed951e0724e5ec170fd..afd2f36886bc691173abd369b6a445b472478122 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -35,6 +35,7 @@
 #include "CSSPropertyNames.h"
 #include "Cache.h"
 #include "CachedCSSStyleSheet.h"
+#include "DeprecatedStringList.h"
 #include "DOMImplementation.h"
 #include "DOMWindow.h"
 #include "Decoder.h"

diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index ea42b24a6119ed652ddde5b0f750f8cf7216d4a9..d19115555224ded0dc29367e84d263c073126789 100644 (file)
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -30,7 +30,6 @@
 
 #include "BrowserExtension.h"
 #include "Color.h"
-#include "DeprecatedStringList.h"
 #include "EditAction.h"
 #include "FrameView.h"
 #include "Node.h"

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index 139d212aa48ffc372822129d7619b38786433a73..8e2033a9a3923380ab7fbdc0ef6add70d513f6a9 100644 (file)
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -37,7 +37,6 @@ class Color;
 class CSSProperty;
 class CSSStyleSelector;
 class Clipboard;
-class DeprecatedStringList;
 class Document;
 class Element;
 class Event;