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
+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.
}
}
-
-DeprecatedStringList Document::availableStyleSheets() const
-{
- return m_availableSheets;
-}
-
void Document::recalcStyleSelector()
{
if (!renderer() || !attached())
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;
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;
sheet = 0; // don't use it
title = title.replace('&', "&&");
-
- if (!m_availableSheets.contains(title))
- m_availableSheets.append(title);
}
}
#endif
#include "Attr.h"
#include "Color.h"
#include "DeprecatedPtrList.h"
-#include "DeprecatedStringList.h"
+#include "DeprecatedValueList.h"
#include "DocumentMarker.h"
#include "HTMLCollection.h"
#include "StringHash.h"
String selectedStylesheetSet() const;
void setSelectedStylesheetSet(const String&);
- DeprecatedStringList availableStyleSheets() const;
-
Node* focusNode() const { return m_focusNode.get(); }
bool setFocusNode(PassRefPtr<Node>);
void clearSelectionIfNeeded(Node*);
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.
class AtomicString;
class ContainerNode;
-class DeprecatedStringList;
class Document;
class Element;
class Event;
#include "CSSStyleRule.h"
#include "cssstyleselector.h"
#include "Comment.h"
+#include "DeprecatedStringList.h"
#include "Document.h"
#include "DocumentFragment.h"
#include "DocumentType.h"
} 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
class AffineTransform;
class Color;
- class DeprecatedStringList;
class FloatPoint;
class FloatRect;
class FloatSize;
// 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)
{
#include "Cache.h"
#include "CachedImage.h"
#include "CachedResource.h"
+#include "DeprecatedStringList.h"
#include "DocLoader.h"
#include "Frame.h"
#include "HTMLDocument.h"
#include "CSSPropertyNames.h"
#include "Cache.h"
#include "CachedCSSStyleSheet.h"
+#include "DeprecatedStringList.h"
#include "DOMImplementation.h"
#include "DOMWindow.h"
#include "Decoder.h"
#include "BrowserExtension.h"
#include "Color.h"
-#include "DeprecatedStringList.h"
#include "EditAction.h"
#include "FrameView.h"
#include "Node.h"
class CSSProperty;
class CSSStyleSelector;
class Clipboard;
-class DeprecatedStringList;
class Document;
class Element;
class Event;