Eliminate DeprecatedPtrList
authorbenjamin.poulain@nokia.com <benjamin.poulain@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Feb 2011 18:59:01 +0000 (18:59 +0000)
committerbenjamin.poulain@nokia.com <benjamin.poulain@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Feb 2011 18:59:01 +0000 (18:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=17425

Reviewed by Andreas Kling.

Remove the implementation of DeprecatedPtrList and all its references
from the build systems.

* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.order:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* platform/DeprecatedPtrList.h: Removed.
* platform/DeprecatedPtrListImpl.cpp: Removed.
* platform/DeprecatedPtrListImpl.h: Removed.

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

12 files changed:
Source/WebCore/Android.mk
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.order
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/DeprecatedPtrList.h [deleted file]
Source/WebCore/platform/DeprecatedPtrListImpl.cpp [deleted file]
Source/WebCore/platform/DeprecatedPtrListImpl.h [deleted file]

index 9cd3022..a91e1bb 100644 (file)
@@ -459,7 +459,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/Arena.cpp \
        platform/ContentType.cpp \
        platform/CrossThreadCopier.cpp \
-       platform/DeprecatedPtrListImpl.cpp \
        platform/DragData.cpp \
        platform/DragImage.cpp \
        platform/FileChooser.cpp \
index 3500dda..5265f7e 100644 (file)
@@ -1181,7 +1181,6 @@ SET(WebCore_SOURCES
     platform/ContextMenuItem.cpp
     platform/ContentType.cpp
     platform/CrossThreadCopier.cpp
-    platform/DeprecatedPtrListImpl.cpp
     platform/DragData.cpp
     platform/DragImage.cpp
     platform/FileChooser.cpp
index 804ec15..580ef9d 100644 (file)
@@ -1,3 +1,25 @@
+2011-02-27  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Eliminate DeprecatedPtrList
+        https://bugs.webkit.org/show_bug.cgi?id=17425
+
+        Remove the implementation of DeprecatedPtrList and all its references
+        from the build systems.
+
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.order:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/DeprecatedPtrList.h: Removed.
+        * platform/DeprecatedPtrListImpl.cpp: Removed.
+        * platform/DeprecatedPtrListImpl.h: Removed.
+
 2011-02-27  Andreas Kling  <kling@webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index 73bc4c0..0fecec9 100644 (file)
@@ -2319,9 +2319,6 @@ webcore_sources += \
        Source/WebCore/platform/CrossThreadCopier.h \
        Source/WebCore/platform/Cursor.cpp \
        Source/WebCore/platform/Cursor.h \
-       Source/WebCore/platform/DeprecatedPtrList.h \
-       Source/WebCore/platform/DeprecatedPtrListImpl.cpp \
-       Source/WebCore/platform/DeprecatedPtrListImpl.h \
        Source/WebCore/platform/DragData.cpp \
        Source/WebCore/platform/DragData.h \
        Source/WebCore/platform/DragImage.cpp \
index 3b8ef95..d2ff6e6 100644 (file)
             'platform/CrossThreadCopier.h',
             'platform/CrossThreadCopier.cpp',
             'platform/Cursor.h',
-            'platform/DeprecatedPtrList.h',
-            'platform/DeprecatedPtrListImpl.cpp',
-            'platform/DeprecatedPtrListImpl.h',
             'platform/DragData.cpp',
             'platform/DragData.h',
             'platform/DragImage.cpp',
index 136a34d..83a7f77 100644 (file)
@@ -4397,8 +4397,6 @@ __ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore9RenderBoxEEES6_NS_17Identity
 __ZN3WTF11ListHashSetIPN7WebCore9RenderBoxENS_7PtrHashIS3_EEE10appendNodeEPNS_15ListHashSetNodeIS3_EE
 __ZN7WebCore11RenderBlock21adjustPositionedBlockEPNS_9RenderBoxERKNS0_10MarginInfoE
 __ZN7WebCore11RenderBlock20insertFloatingObjectEPNS_9RenderBoxE
-__ZN7WebCore21DeprecatedPtrListImplC1EPFvPvE
-__ZN7WebCore21DeprecatedPtrListImplC2EPFvPvE
 __ZN7WebCore11RenderBlock14calcPrefWidthsEv
 __ZN7WebCore11RenderBlock20calcInlinePrefWidthsEv
 __ZN7WebCore20InlineMinMaxIterator4nextEv
@@ -4412,24 +4410,9 @@ __ZN7WebCore9InlineBox6removeEv
 __ZN7WebCore13InlineFlowBox11removeChildEPNS_9InlineBoxE
 __ZN7WebCore9InlineBox14dirtyLineBoxesEv
 __ZN7WebCore13RootInlineBox12childRemovedEPNS_9InlineBoxE
-__ZN7WebCore21DeprecatedPtrListImpl6appendEPKv
-__ZN7WebCore21DeprecatedPtrListImpl6insertEjPKv
 __ZN7WebCore11RenderBlock19adjustFloatingBlockERKNS0_10MarginInfoE
-__ZN7WebCore21DeprecatedPtrListImpl4lastEv
-__ZNK7WebCore21DeprecatedPtrListImpl7currentEv
-__ZNK7WebCore21DeprecatedPtrListImpl7getPrevEv
-__ZN7WebCore29DeprecatedPtrListImplIteratorC1ERKNS_21DeprecatedPtrListImplE
-__ZN7WebCore29DeprecatedPtrListImplIteratorC2ERKNS_21DeprecatedPtrListImplE
-__ZNK7WebCore21DeprecatedPtrListImpl11addIteratorEPNS_29DeprecatedPtrListImplIteratorE
-__ZNK7WebCore29DeprecatedPtrListImplIterator7currentEv
-__ZN7WebCore29DeprecatedPtrListImplIteratorppEv
-__ZN7WebCore29DeprecatedPtrListImplIteratorD1Ev
-__ZN7WebCore29DeprecatedPtrListImplIteratorD2Ev
-__ZNK7WebCore21DeprecatedPtrListImpl14removeIteratorEPNS_29DeprecatedPtrListImplIteratorE
-__ZN7WebCore21DeprecatedPtrListImpl4nextEv
 __ZN7WebCore11RenderBlock37markAllDescendantsWithFloatsForLayoutEPNS_9RenderBoxEb
 __ZN7WebCore11RenderBlock18addIntrudingFloatsEPS0_ii
-__ZN7WebCore21DeprecatedPtrListImpl5firstEv
 __ZNK3WTF7HashMapIPN7WebCore12RenderObjectEPNS1_11RenderBlock14FloatingObjectENS_7PtrHashIS3_EENS_10HashTraitsIS3_EENS9_IS6_EEE
 __ZN7WebCore14RenderReplaced6layoutEv
 __ZNK7WebCore11RenderImage21minimumReplacedHeightEv
@@ -5563,10 +5546,6 @@ __ZN7WebCore7cookiesEPKNS_8DocumentERKNS_4KURLE
 __ZThn120_N7WebCore17HTMLScriptElement17dispatchLoadEventEv
 __ZN7WebCore17HTMLScriptElement17dispatchLoadEventEv
 __ZN3WTF6VectorISt4pairIPN7WebCore17ScriptElementDataENS2_20CachedResourceHandleINS2_12CachedScriptEEEELm0EE6shrinkEm
-__ZN7WebCore21DeprecatedPtrListImpl5clearEb
-__ZN7WebCore17DeprecatedPtrListINS_11RenderBlock14FloatingObjectEE10deleteFuncEPv
-__ZN7WebCore21DeprecatedPtrListImpl4takeEv
-__ZN7WebCore21DeprecatedPtrListImpl6removeEb
 __ZN3WTF7HashMapIPN7WebCore12RenderObjectEPNS1_11RenderBlock14FloatingObjectENS_7PtrHashIS3_EENS_10HashTraitsIS3_EENS9_IS6_EEE3
 __ZN7WebCore15RenderTableCell29clippedOverflowRectForRepaintEPNS_20RenderBoxModelObjectE
 __ZN7WebCore9RenderBox12imageChangedEPvPKNS_7IntRectE
@@ -6906,8 +6885,6 @@ __ZN7WebCore12PluginHalter13didStopPluginEPNS_14HaltablePluginE
 __ZN7WebCore16ScriptController29cleanupScriptObjectsForPluginEPv
 __ZN7WebCore11RenderFrameD0Ev
 __ZN7WebCore14RenderFrameSetD0Ev
-__ZN7WebCore21DeprecatedPtrListImplD1Ev
-__ZN7WebCore21DeprecatedPtrListImplD2Ev
 __ZN7WebCore29CSSMappedAttributeDeclarationD0Ev
 __ZN7WebCore13StyledElement25removeMappedAttributeDeclENS_20MappedAttributeEntryERKNS_13QualifiedNameERKNS_12AtomicStringE
 __ZN7WebCore15HTMLLinkElementD0Ev
@@ -8434,7 +8411,6 @@ __ZThn440_N7WebCore11CachedImage20shouldPauseAnimationEPKNS_5ImageE
 __ZN7WebCore11CachedImage20shouldPauseAnimationEPKNS_5ImageE
 __ZN7WebCore12RenderObject15willRenderImageEPNS_11CachedImageE
 __ZN7WebCore20CachedResourceClient15willRenderImageEPNS_11CachedImageE
-__ZN7WebCore21DeprecatedPtrListImpl4prevEv
 __ZNK7WebCore13RootInlineBox19lineBreakBidiStatusEv
 __ZNK7WebCore13InlineFlowBox13lastLeafChildEv
 __ZN7WebCore9RenderBox19clearLayoutOverflowEv
@@ -9093,8 +9069,6 @@ __ZN7WebCore27JSHTMLLabelElementPrototypeD1Ev
 __ZN7WebCore18JSHTMLLabelElementD1Ev
 __ZN7WebCore27JSHTMLDListElementPrototypeD1Ev
 __ZN7WebCore18JSHTMLDListElementD1Ev
-__ZN7WebCore29DeprecatedPtrListImplIterator6toLastEv
-__ZN7WebCore29DeprecatedPtrListImplIteratormmEv
 __ZN7WebCore15DatabaseTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0EEE
 __ZN7WebCore17HTMLButtonElementD0Ev
 __ZN7WebCore12RenderInline11nodeAtPointERKNS_14HitTestRequestERNS_13HitTestResultEiiiiNS_13HitTestActionE
@@ -9862,7 +9836,6 @@ __ZNK7WebCore5XPath9LogicalOp14shortCircuitOnEv
 __ZN7WebCore5XPath9LogicalOpD0Ev
 __ZN7WebCore5XPath12FunLocalNameD0Ev
 __ZN7WebCore14RenderListItem11updateValueEv
-__ZN7WebCore21DeprecatedPtrListImpl9removeRefEPKvb
 __ZN7WebCore23jsHTMLAnchorElementHrefEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore38jsDocumentPrototypeFunctionCreateEventEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueERKNS0_7ArgListE
 __ZN7WebCore8Document11createEventERKNS_6StringERi
index 891f942..9ca1e8b 100644 (file)
@@ -925,7 +925,6 @@ SOURCES += \
     platform/text/LocalizedNumberNone.cpp \
     platform/ContentType.cpp \
     platform/CrossThreadCopier.cpp \
-    platform/DeprecatedPtrListImpl.cpp \
     platform/DragData.cpp \
     platform/DragImage.cpp \
     platform/FileChooser.cpp \
@@ -1838,7 +1837,6 @@ HEADERS += \
     platform/ContentType.h \
     platform/ContextMenu.h \
     platform/CrossThreadCopier.h \
-    platform/DeprecatedPtrListImpl.h \
     platform/DragData.h \
     platform/DragImage.h \
     platform/FileChooser.h \
index ca31904..ba11d06 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\DeprecatedPtrList.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\platform\DeprecatedPtrListImpl.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\platform\DeprecatedPtrListImpl.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\platform\DragData.cpp"
                                >
                        </File>
index 4c4d105..c44c195 100644 (file)
                93F1994F08245E59001E9ABC /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* Settings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1995008245E59001E9ABC /* CachePolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* CachePolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
-               93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */ = {isa = PBXBuildFile; fileRef = 93955A4103D72932008635CE /* RenderTreeAsText.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199A808245E59001E9ABC /* WebCoreFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = F587854C02DE375901EA4122 /* WebCoreFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */; };
                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = BE855F7F0701E83500239769 /* WebCoreView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
-               93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23B02DE4396018635CA /* HTMLDocument.cpp */; };
                93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23E02DE4396018635CA /* HTMLElement.cpp */; };
                F55B3DAB1251F12D003EF269 /* WeekInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeekInputType.cpp; sourceTree = "<group>"; };
                F55B3DAC1251F12D003EF269 /* WeekInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeekInputType.h; sourceTree = "<group>"; };
                F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587854C02DE375901EA4122 /* WebCoreFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855402DE375901EA4122 /* WebCoreViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864902DE3A9A01EA4122 /* CachePolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CachePolicy.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Cursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F59C95FD1255B23F000623C0 /* BaseDateAndTimeInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseDateAndTimeInputType.cpp; sourceTree = "<group>"; };
                F59C95FE1255B23F000623C0 /* BaseDateAndTimeInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseDateAndTimeInputType.h; sourceTree = "<group>"; };
                F5A154251279534D00D0B0C0 /* ValidationMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidationMessage.cpp; sourceTree = "<group>"; };
                                2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */,
                                E11AF15011B9A1A300805103 /* Cursor.cpp */,
                                F587868402DE3B8601EA4122 /* Cursor.h */,
-                               F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */,
-                               F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */,
-                               F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */,
                                A79546420B5C4CB4007B438F /* DragData.cpp */,
                                A7B6E69D0B291A9600D0529F /* DragData.h */,
                                A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */,
                                1C4C8F020AD85D87009475CE /* DeleteButtonController.h in Headers */,
                                93309DDF099E64920056E581 /* DeleteFromTextNodeCommand.h in Headers */,
                                93309DE1099E64920056E581 /* DeleteSelectionCommand.h in Headers */,
-                               93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */,
-                               93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */,
                                31FB1A57120A5D0600DC02A0 /* DeviceMotionClient.h in Headers */,
                                31FB1A59120A5D0600DC02A0 /* DeviceMotionController.h in Headers */,
                                31FB1A5B120A5D0600DC02A0 /* DeviceMotionData.h in Headers */,
                                1CE83AC30ADAFFD7009354F6 /* DeleteButtonController.cpp in Sources */,
                                93309DDE099E64920056E581 /* DeleteFromTextNodeCommand.cpp in Sources */,
                                93309DE0099E64920056E581 /* DeleteSelectionCommand.cpp in Sources */,
-                               93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
                                31FB1A58120A5D0600DC02A0 /* DeviceMotionController.cpp in Sources */,
                                31FB1A5A120A5D0600DC02A0 /* DeviceMotionData.cpp in Sources */,
                                31FB1A5C120A5D0600DC02A0 /* DeviceMotionEvent.cpp in Sources */,
diff --git a/Source/WebCore/platform/DeprecatedPtrList.h b/Source/WebCore/platform/DeprecatedPtrList.h
deleted file mode 100644 (file)
index c07d173..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef DeprecatedPtrList_h
-#define DeprecatedPtrList_h
-
-#include "DeprecatedPtrListImpl.h"
-#include <wtf/FastAllocBase.h>
-
-namespace WebCore {
-
-template <class T> class DeprecatedPtrListIterator;
-
-template <class T> class DeprecatedPtrList {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    DeprecatedPtrList() : impl(deleteFunc), del_item(false) { }
-    ~DeprecatedPtrList() { impl.clear(del_item); }
-    
-    DeprecatedPtrList(const DeprecatedPtrList& l) : impl(l.impl), del_item(false) { }
-    DeprecatedPtrList& operator=(const DeprecatedPtrList &l) { impl.assign(l.impl, del_item); return *this; }
-
-    bool isEmpty() const { return impl.isEmpty(); }
-    unsigned count() const { return impl.count(); }
-    void clear() { impl.clear(del_item); }
-
-    T *at(unsigned n) { return (T *)impl.at(n); }
-
-    bool insert(unsigned n, const T *item) { return impl.insert(n, item); }
-    bool remove() { return impl.remove(del_item); }
-    bool remove(unsigned n) { return impl.remove(n, del_item); }
-    bool remove(const T *item) { return impl.removeRef(item, del_item); }
-    bool removeFirst() { return impl.removeFirst(del_item); }
-    bool removeLast() { return impl.removeLast(del_item); }
-    bool removeRef(const T *item) { return impl.removeRef(item, del_item); }
-
-    T *getFirst() const { return (T *)impl.getFirst(); }
-    T *getLast() const { return (T *)impl.getLast(); }
-    T *getNext() const { return (T *)impl.getNext(); }
-    T *getPrev() const { return (T *)impl.getPrev(); }
-    T *current() const { return (T *)impl.current(); }
-    T *first() { return (T *)impl.first(); }
-    T *last() { return (T *)impl.last(); }
-    T *next() { return (T *)impl.next(); }
-    T *prev() { return (T *)impl.prev(); }
-    T *take(unsigned n) { return (T *)impl.take(n); }
-    T *take() { return (T *)impl.take(); }
-
-    void append(const T *item) { impl.append(item); }
-    void prepend(const T *item) { impl.prepend(item); }
-
-    unsigned containsRef(const T *item) const { return impl.containsRef(item); }
-    int findRef(const T *item) { return impl.findRef(item); }
-
-    typedef DeprecatedPtrListIterator<T> Iterator;
-    typedef DeprecatedPtrListIterator<T> ConstIterator;
-    ConstIterator begin() const { return ConstIterator(*this); }
-    ConstIterator end() const { ConstIterator itr(*this); itr.toLast(); ++itr; return itr; }
-
-    bool autoDelete() const { return del_item; }
-    void setAutoDelete(bool autoDelete) { del_item = autoDelete; }
-
- private:
-    static void deleteFunc(void *item) { delete (T *)item; }
-
-    friend class DeprecatedPtrListIterator<T>;
-
-    DeprecatedPtrListImpl impl;
-    bool del_item;
-};
-
-template <class T> class DeprecatedPtrListIterator {
-public:
-    DeprecatedPtrListIterator() { }
-    DeprecatedPtrListIterator(const DeprecatedPtrList<T> &l) : impl(l.impl) { }
-
-    unsigned count() const { return impl.count(); }
-    T *toFirst() { return (T *)impl.toFirst(); }
-    T *toLast() { return (T *)impl.toLast(); }
-    T *current() const { return (T *)impl.current(); }
-
-    operator T *() const { return (T *)impl.current(); }
-    T *operator*() const { return (T *)impl.current(); }
-    T *operator--() { return (T *)--impl; }
-    T *operator++()  { return (T *)++impl; }
-
-private:
-    DeprecatedPtrListImplIterator impl;
-};
-
-}
-
-#endif
diff --git a/Source/WebCore/platform/DeprecatedPtrListImpl.cpp b/Source/WebCore/platform/DeprecatedPtrListImpl.cpp
deleted file mode 100644 (file)
index c633741..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "DeprecatedPtrListImpl.h"
-
-#include <cstddef>
-#include <algorithm>
-#include <wtf/Assertions.h>
-#include <wtf/FastAllocBase.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebCore {
-
-class DeprecatedListNode {
-    WTF_MAKE_NONCOPYABLE(DeprecatedListNode); WTF_MAKE_FAST_ALLOCATED;
-public:
-    DeprecatedListNode(void *d) : data(d), next(0), prev(0) { }
-
-    void *data;
-    DeprecatedListNode *next;
-    DeprecatedListNode *prev;
-};
-
-
-static DeprecatedListNode *copyList(DeprecatedListNode *l, DeprecatedListNode *&tail)
-{
-    DeprecatedListNode *node = l;
-    DeprecatedListNode *copyHead = 0;
-    DeprecatedListNode *last = 0;
-
-    while (node != 0) {
-        DeprecatedListNode *copy = new DeprecatedListNode(node->data);
-        if (last != 0) {
-            last->next = copy;
-        } else {
-            copyHead = copy;
-        }
-
-        copy->prev = last;
-        
-        last = copy;
-        node = node->next;
-    }
-
-    tail = last;
-    return copyHead;
-}
-
-
-DeprecatedPtrListImpl::DeprecatedPtrListImpl(void (*deleteFunc)(void *)) :
-    head(0),
-    tail(0),
-    cur(0),
-    nodeCount(0),
-    deleteItem(deleteFunc),
-    iterators(0)
-{
-}
-
-DeprecatedPtrListImpl::DeprecatedPtrListImpl(const DeprecatedPtrListImpl &impl) :
-    cur(0),
-    nodeCount(impl.nodeCount),
-    deleteItem(impl.deleteItem),
-    iterators(0)
-{
-    head = copyList(impl.head, tail);
-}
-
-DeprecatedPtrListImpl::~DeprecatedPtrListImpl()
-{
-    clear(false);
-    
-    DeprecatedPtrListImplIterator *next;
-    for (DeprecatedPtrListImplIterator *it = iterators; it; it = next) {
-        next = it->next;
-        it->list = 0;
-        ASSERT(!it->node);
-        it->next = 0;
-        it->prev = 0;
-    }
-}
-     
-void DeprecatedPtrListImpl::clear(bool deleteItems)
-{
-    DeprecatedListNode *next;
-    
-    for (DeprecatedListNode *node = head; node; node = next) {
-        next = node->next;
-        if (deleteItems)
-            deleteItem(node->data);
-        delete node;
-    }
-
-    head = 0;
-    tail = 0;
-    cur = 0;
-    nodeCount = 0;
-
-    for (DeprecatedPtrListImplIterator *it = iterators; it; it = it->next)
-        it->node = 0;
-}
-
-void *DeprecatedPtrListImpl::at(unsigned n)
-{
-    DeprecatedListNode *node;
-    if (n >= nodeCount - 1) {
-        node = tail;
-    } else {
-        node = head;
-        for (unsigned i = 0; i < n && node; i++) {
-            node = node->next;
-        }
-    }
-
-    cur = node;
-    return node ? node->data : 0;
-}
-
-bool DeprecatedPtrListImpl::insert(unsigned n, const void *item)
-{
-    if (n > nodeCount) {
-        return false;
-    }
-
-    DeprecatedListNode *node = new DeprecatedListNode(const_cast<void*>(item));
-
-    if (n == 0) {
-        // inserting at head
-        node->next = head;
-        if (head) {
-            head->prev = node;
-        }
-        head = node;
-        if (tail == 0) {
-            tail = node;
-        }
-    } else if (n == nodeCount) {
-        // inserting at tail
-        node->prev = tail;
-        if (tail) {
-            tail->next = node;
-        }
-        tail = node;
-    } else {
-        // general insertion
-        
-        // iterate to one node before the insertion point, can't be null
-        // since we know n > 0 and n < nodeCount
-        DeprecatedListNode *prevNode = head;
-
-        for (unsigned i = 0; i < n - 1; i++) {
-            prevNode = prevNode->next;
-        }
-        node->prev = prevNode;
-        node->next = prevNode->next;
-        if (node->next) {
-            node->next->prev = node;
-        }
-        prevNode->next = node;
-    }
-
-    nodeCount++;
-    cur = node;
-    return true;
-}
-
-bool DeprecatedPtrListImpl::remove(bool shouldDeleteItem)
-{
-    DeprecatedListNode *node = cur;
-    if (node == 0) {
-        return false;
-    }
-
-    if (node->prev == 0) {
-        head = node->next;
-    } else {
-        node->prev->next = node->next;
-    }
-
-    if (node->next == 0) {
-        tail = node->prev;
-    } else {
-        node->next->prev = node->prev;
-    }
-
-    if (node->next) {
-        cur = node->next;
-    } else {
-        cur = node->prev;
-    }
-
-    for (DeprecatedPtrListImplIterator *it = iterators; it; it = it->next) {
-        if (it->node == node) {
-            it->node = cur;
-        }
-    }
-
-    if (shouldDeleteItem) {
-        deleteItem(node->data);
-    }
-    delete node;
-
-    nodeCount--;
-
-    return true;
-}
-
-bool DeprecatedPtrListImpl::remove(unsigned n, bool deleteItem)
-{
-    if (n >= nodeCount) {
-        return false;
-    }
-
-    at(n);
-    return remove(deleteItem);
-}
-
-bool DeprecatedPtrListImpl::removeFirst(bool deleteItem)
-{
-    return remove(0, deleteItem);
-}
-
-bool DeprecatedPtrListImpl::removeLast(bool deleteItem)
-{
-    return remove(nodeCount - 1, deleteItem);
-}
-
-bool DeprecatedPtrListImpl::removeRef(const void *item, bool deleteItem)
-{
-    DeprecatedListNode *node;
-
-    node = head;
-
-    while (node && item != node->data) {
-        node = node->next;
-    }
-    
-    if (node == 0) {
-        return false;
-    }
-
-    cur = node;
-
-    return remove(deleteItem);
-}
-
-void *DeprecatedPtrListImpl::getFirst() const
-{
-    return head ? head->data : 0;
-}
-
-void *DeprecatedPtrListImpl::getLast() const
-{
-    return tail ? tail->data : 0;
-}
-
-void *DeprecatedPtrListImpl::getNext() const
-{
-    return cur && cur->next ? cur->next->data : 0;
-}
-
-void *DeprecatedPtrListImpl::getPrev() const
-{
-    return cur && cur->prev ? cur->prev->data : 0;
-}
-
-void *DeprecatedPtrListImpl::current() const
-{
-    if (cur) {
-        return cur->data;
-    } else {
-        return 0;
-    }
-}
-
-void *DeprecatedPtrListImpl::first()
-{
-    cur = head;
-    return current();
-}
-
-void *DeprecatedPtrListImpl::last()
-{
-    cur = tail;
-    return current();
-}
-
-void *DeprecatedPtrListImpl::next()
-{
-    if (cur) {
-        cur = cur->next;
-    }
-    return current();
-}
-
-void *DeprecatedPtrListImpl::prev()
-{
-    if (cur) {
-        cur = cur->prev;
-    }
-    return current();
-}
-
-void *DeprecatedPtrListImpl::take(unsigned n)
-{
-    void *retval = at(n);
-    remove(false);
-    return retval;
-}
-
-void *DeprecatedPtrListImpl::take()
-{
-    void *retval = current();
-    remove(false);
-    return retval;
-}
-
-void DeprecatedPtrListImpl::append(const void *item)
-{
-    insert(nodeCount, item);
-}
-
-void DeprecatedPtrListImpl::prepend(const void *item)
-{
-    insert(0, item);
-}
-
-unsigned DeprecatedPtrListImpl::containsRef(const void *item) const
-{
-    unsigned count = 0;
-    
-    for (DeprecatedListNode *node = head; node; node = node->next) {
-        if (item == node->data) {
-            ++count;
-        }
-    }
-    
-    return count;
-}
-
-int DeprecatedPtrListImpl::findRef(const void *item)
-{
-    DeprecatedListNode *node = head;
-    int index = 0;
-    
-    while (node && item != node->data) {
-        node = node->next;
-        index++;
-    }
-    
-    cur = node;
-    
-    if (node == 0) {
-        return -1;
-    }
-    
-    return index;
-}
-
-DeprecatedPtrListImpl &DeprecatedPtrListImpl::assign(const DeprecatedPtrListImpl &impl, bool deleteItems)
-{
-    clear(deleteItems);
-    DeprecatedPtrListImpl(impl).swap(*this);
-    return *this;
-}
-
-void DeprecatedPtrListImpl::addIterator(DeprecatedPtrListImplIterator *iter) const
-{
-    iter->next = iterators;
-    iter->prev = 0;
-    
-    if (iterators) {
-        iterators->prev = iter;
-    }
-    iterators = iter;
-}
-
-void DeprecatedPtrListImpl::removeIterator(DeprecatedPtrListImplIterator *iter) const
-{
-    if (iter->prev == 0) {
-        iterators = iter->next;
-    } else {
-        iter->prev->next = iter->next;
-    }
-
-    if (iter->next) {
-        iter->next->prev = iter->prev;
-    }
-}
-
-void DeprecatedPtrListImpl::swap(DeprecatedPtrListImpl &other)
-{
-    using std::swap;
-    
-    ASSERT(iterators == 0);
-    ASSERT(other.iterators == 0);
-    
-    swap(head, other.head);
-    swap(tail, other.tail);
-    swap(cur, other.cur);
-    swap(nodeCount, other.nodeCount);
-    swap(deleteItem, other.deleteItem);
-}
-
-
-DeprecatedPtrListImplIterator::DeprecatedPtrListImplIterator() :
-    list(0),
-    node(0)
-{
-}
-
-DeprecatedPtrListImplIterator::DeprecatedPtrListImplIterator(const DeprecatedPtrListImpl &impl)  :
-    list(&impl),
-    node(impl.head)
-{
-    impl.addIterator(this);
-}
-
-DeprecatedPtrListImplIterator::~DeprecatedPtrListImplIterator()
-{
-    if (list) {
-        list->removeIterator(this);
-    }
-}
-
-DeprecatedPtrListImplIterator::DeprecatedPtrListImplIterator(const DeprecatedPtrListImplIterator &impl) :
-    list(impl.list),
-    node(impl.node)
-{
-    if (list) {
-        list->addIterator(this);
-    }
-}
-
-unsigned DeprecatedPtrListImplIterator::count() const
-{
-    return list == 0 ? 0 : list->count();
-}
-
-void *DeprecatedPtrListImplIterator::toFirst()
-{
-    if (list) {
-        node = list->head;
-    }
-    return current();
-}
-
-void *DeprecatedPtrListImplIterator::toLast()
-{
-    if (list) {
-        node = list->tail;
-    }
-    return current();
-}
-
-void *DeprecatedPtrListImplIterator::current() const
-{
-    return node == 0 ? 0 : node->data;
-}
-
-void *DeprecatedPtrListImplIterator::operator--()
-{
-    if (node) {
-        node = node->prev;
-    }
-    return current();
-}
-
-void *DeprecatedPtrListImplIterator::operator++()
-{
-    if (node) {
-        node = node->next;
-    }
-    return current();
-}
-
-DeprecatedPtrListImplIterator &DeprecatedPtrListImplIterator::operator=(const DeprecatedPtrListImplIterator &impl)
-{
-    if (list) {
-        list->removeIterator(this);
-    }
-    
-    list = impl.list;
-    node = impl.node;
-    
-    if (list) {
-        list->addIterator(this);
-    }
-
-    return *this;
-}
-
-}
diff --git a/Source/WebCore/platform/DeprecatedPtrListImpl.h b/Source/WebCore/platform/DeprecatedPtrListImpl.h
deleted file mode 100644 (file)
index 5e4121b..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef DeprecatedPtrListImpl_h
-#define DeprecatedPtrListImpl_h
-
-namespace WebCore {
-
-class DeprecatedListNode;
-class DeprecatedPtrListImplIterator;
-
-class DeprecatedPtrListImpl
-{
-public:
-    
-    DeprecatedPtrListImpl(void (*deleteFunc)(void *));
-    DeprecatedPtrListImpl(const DeprecatedPtrListImpl &impl);
-    ~DeprecatedPtrListImpl();
-     
-    bool isEmpty() const { return nodeCount == 0; }
-    unsigned count() const { return nodeCount; }
-    void clear(bool deleteItems);
-
-    void *at(unsigned n);
-
-    bool insert(unsigned n, const void *item);
-    bool remove(bool deleteItem);
-    bool remove(unsigned n, bool deleteItem);
-    bool removeFirst(bool deleteItem);
-    bool removeLast(bool deleteItem);
-    bool removeRef(const void *item, bool deleteItem);
-
-    void *getFirst() const;
-    void *getLast() const;
-    void *getNext() const;
-    void *getPrev() const;
-    void *current() const;
-    void *first();
-    void *last();
-    void *next();
-    void *prev();
-    void *take(unsigned n);
-    void *take();
-
-    void append(const void *item);
-    void prepend(const void *item);
-
-    unsigned containsRef(const void *item) const;
-    int findRef(const void *item);
-
-    DeprecatedPtrListImpl &assign(const DeprecatedPtrListImpl &impl, bool deleteItems);
-
- private:
-    DeprecatedPtrListImpl &operator =(const DeprecatedPtrListImpl &impl);
-
-    void swap(DeprecatedPtrListImpl &impl);
-
-    void addIterator(DeprecatedPtrListImplIterator *iter) const;
-    void removeIterator(DeprecatedPtrListImplIterator *iter) const;
-
-    DeprecatedListNode *head;
-    DeprecatedListNode *tail;
-    DeprecatedListNode *cur;
-    unsigned nodeCount;
-    void (*deleteItem)(void *);
-    mutable DeprecatedPtrListImplIterator *iterators;
-
-    friend class DeprecatedPtrListImplIterator;
-};
-
-
-class DeprecatedPtrListImplIterator {
-public:
-    DeprecatedPtrListImplIterator();
-    DeprecatedPtrListImplIterator(const DeprecatedPtrListImpl &impl);
-    ~DeprecatedPtrListImplIterator();
-
-    DeprecatedPtrListImplIterator(const DeprecatedPtrListImplIterator &impl);
-    DeprecatedPtrListImplIterator &operator=(const DeprecatedPtrListImplIterator &impl);
-
-    unsigned count() const;
-    void *toFirst();
-    void *toLast();
-    void *current() const;
-
-    void *operator--();
-    void *operator++();
-
-private:
-    const DeprecatedPtrListImpl *list;
-    DeprecatedListNode *node;
-    DeprecatedPtrListImplIterator *next;
-    DeprecatedPtrListImplIterator *prev;
-
-    friend class DeprecatedPtrListImpl;
-};
-
-}
-
-#endif