Review URL: http://codereview.chromium.org/12503

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6148 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 298 deletions

diff --git a/webkit/port/history/CachedPage.cpp b/webkit/port/history/CachedPage.cpp
index f5e6874..8d1531d 100644
--- a/webkit/port/history/CachedPage.cpp
+++ b/webkit/port/history/CachedPage.cpp
@@ -31,6 +31,7 @@
 
 #include "CachedPage.h"
 #include "Document.h"
+#include "DocumentLoader.h"
 #include "FrameView.h"
 #include "CachedPagePlatformData.h"
 
diff --git a/webkit/port/history/CachedPage.h b/webkit/port/history/CachedPage.h
deleted file mode 100644
index de8ffbd..0000000
--- a/webkit/port/history/CachedPage.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple 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 CachedPage_h
-#define CachedPage_h
-
-// DocumentLoder.h includes IconDatabase.h, which needs HashMap.
-// TODO(evanm): fix upstream.
-#include <wtf/HashMap.h>
-#include "DocumentLoader.h"
-#include <wtf/RefCounted.h>
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
-#include <wtf/OwnPtr.h>
-
-#if PLATFORM(MAC)
-#include <wtf/RetainPtr.h>
-typedef struct objc_object* id;
-#endif
-
-namespace WebCore {
-    
-    class CachedPagePlatformData;
-    class Document;
-    class FrameView;
-    class Node;
-    class Page;
-
-class CachedPage : public RefCounted<CachedPage> {
-public:
-    static PassRefPtr<CachedPage> create(Page*);
-    ~CachedPage();
-    
-    void clear();
-    Document* document() const { return m_document.get(); }
-    FrameView* view() const { return m_view.get(); }
-    Node* mousePressNode() const { return m_mousePressNode.get(); }
-    const KURL& url() const { return m_URL; }
-    void restore(Page*);
-        
-    void setTimeStamp(double);
-    void setTimeStampToNow();
-    double timeStamp() const;
-    void setDocumentLoader(PassRefPtr<DocumentLoader>);
-    DocumentLoader* documentLoader();
-
-    void setCachedPagePlatformData(CachedPagePlatformData*);
-    CachedPagePlatformData* cachedPagePlatformData();
-private:
-    CachedPage(Page*);
-    RefPtr<DocumentLoader> m_documentLoader;
-    double m_timeStamp;
-
-    RefPtr<Document> m_document;
-    RefPtr<FrameView> m_view;
-    RefPtr<Node> m_mousePressNode;
-    KURL m_URL;
-};
-
-} // namespace WebCore
-
-#endif // CachedPage_h
-
diff --git a/webkit/port/history/HistoryItem.h b/webkit/port/history/HistoryItem.h
deleted file mode 100644
index 7d86f0c..0000000
--- a/webkit/port/history/HistoryItem.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 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. 
- */
-
-#ifndef HistoryItem_h
-#define HistoryItem_h
-
-#include "CachedPage.h"
-#include "FormData.h"
-#include "IntPoint.h"
-#include "PlatformString.h"
-#include <wtf/RefCounted.h>
-#include "StringHash.h"
-#include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-#if PLATFORM(MAC)
-#import <wtf/RetainPtr.h>
-typedef struct objc_object* id;
-#endif
-
-namespace WebCore {
-
-class Document;
-class Image;
-class KURL;
-class ResourceRequest;
-
-class HistoryItem;
-typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
-
-extern void (*notifyHistoryItemChanged)();
-
-class HistoryItem : public RefCounted<HistoryItem> {
-    friend class PageCache;
-
-public: 
-    static PassRefPtr<HistoryItem> create() { return adoptRef(new HistoryItem); }
-    static PassRefPtr<HistoryItem> create(const String& urlString, const String& title, double lastVisited)
-    {
-        return adoptRef(new HistoryItem(urlString, title, lastVisited));
-    }
-    static PassRefPtr<HistoryItem> create(const String& urlString, const String& title, const String& alternateTitle, double lastVisited)
-    {
-        return adoptRef(new HistoryItem(urlString, title, alternateTitle, lastVisited));
-    }
-    static PassRefPtr<HistoryItem> create(const KURL& url, const String& target, const String& parent, const String& title)
-    {
-        return adoptRef(new HistoryItem(url, target, parent, title));
-    }
-    
-    ~HistoryItem();
-    
-    PassRefPtr<HistoryItem> copy() const;
-    
-    const String& originalURLString() const;
-    const String& urlString() const;
-    const String& title() const;
-    
-    void setInPageCache(bool inPageCache) { m_isInPageCache = inPageCache; }
-    bool isInPageCache() const { return m_isInPageCache; }
-    
-    double lastVisitedTime() const;
-    
-    void setAlternateTitle(const String& alternateTitle);
-    const String& alternateTitle() const;
-    
-    Image* icon() const;
-    
-    const String& parent() const;
-    KURL url() const;
-    KURL originalURL() const;
-    const String& target() const;
-    bool isTargetItem() const;
-    
-    FormData* formData();
-    String formContentType() const;
-    String formReferrer() const;
-    String rssFeedReferrer() const;
-    
-    int visitCount() const;
-    bool lastVisitWasFailure() const { return m_lastVisitWasFailure; }
-
-    void mergeAutoCompleteHints(HistoryItem* otherItem);
-    
-    const IntPoint& scrollPoint() const;
-    void setScrollPoint(const IntPoint&);
-    void clearScrollPoint();
-    const Vector<String>& documentState() const;
-    void setDocumentState(const Vector<String>&);
-    void clearDocumentState();
-
-    void setURL(const KURL&);
-    void setURLString(const String&);
-    void setOriginalURLString(const String&);
-    void setTarget(const String&);
-    void setParent(const String&);
-    void setTitle(const String&);
-    void setIsTargetItem(bool);
-    
-    void setFormInfoFromRequest(const ResourceRequest&);
-
-    void setRSSFeedReferrer(const String&);
-    void setVisitCount(int);
-    void setLastVisitWasFailure(bool wasFailure) { m_lastVisitWasFailure = wasFailure; }
-
-    void addChildItem(PassRefPtr<HistoryItem>);
-    HistoryItem* childItemWithName(const String&) const;
-    HistoryItem* targetItem();
-    HistoryItem* recurseToFindTargetItem();
-    const HistoryItemVector& children() const;
-    bool hasChildren() const;
-
-    // This should not be called directly for HistoryItems that are already included
-    // in GlobalHistory. The WebKit api for this is to use -[WebHistory setLastVisitedTimeInterval:forItem:] instead.
-    void setLastVisitedTime(double);
-    
-    bool isCurrentDocument(Document*) const;
-    
-#if PLATFORM(MAC)
-    id viewState() const;
-    void setViewState(id);
-    
-    // Transient properties may be of any ObjC type.  They are intended to be used to store state per back/forward list entry.
-    // The properties will not be persisted; when the history item is removed, the properties will be lost.
-    id getTransientProperty(const String&) const;
-    void setTransientProperty(const String&, id);
-#endif
-
-#ifndef NDEBUG
-    int showTree() const;
-    int showTreeWithIndent(unsigned indentLevel) const;
-#endif
-
-private:
-    HistoryItem();
-    HistoryItem(const String& urlString, const String& title, double lastVisited);
-    HistoryItem(const String& urlString, const String& title, const String& alternateTitle, double lastVisited);
-    HistoryItem(const KURL& url, const String& target, const String& parent, const String& title);
-
-    HistoryItem(const HistoryItem&);
-    
-    String m_urlString;
-    String m_originalURLString;
-    String m_target;
-    String m_parent;
-    String m_title;
-    String m_displayTitle;
-    
-    double m_lastVisitedTime;
-
-    IntPoint m_scrollPoint;
-    Vector<String> m_documentState;
-    
-    HistoryItemVector m_subItems;
-    
-    bool m_lastVisitWasFailure;
-    bool m_isInPageCache;
-    bool m_isTargetItem;
-    int m_visitCount;
-    
-    // info used to repost form data
-    RefPtr<FormData> m_formData;
-    String m_formContentType;
-    String m_formReferrer;
-    
-    // info used to support RSS feeds
-    String m_rssFeedReferrer;
-
-    // PageCache controls these fields.
-    HistoryItem* m_next;
-    HistoryItem* m_prev;
-    RefPtr<CachedPage> m_cachedPage;
-    
-#if PLATFORM(MAC)
-    RetainPtr<id> m_viewState;
-    OwnPtr<HashMap<String, RetainPtr<id> > > m_transientProperties;
-#endif
-}; //class HistoryItem
-
-} //namespace WebCore
-
-#ifndef NDEBUG
-// Outside the WebCore namespace for ease of invocation from gdb.
-extern "C" int showTree(const WebCore::HistoryItem*);
-#endif
-
-#endif // HISTORYITEM_H
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index c635227..9547069 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -2305,7 +2305,6 @@
 		7B0E59620DB3D195007D4907 /* PageURLRecord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PageURLRecord.cpp; path = icon/PageURLRecord.cpp; sourceTree = "<group>"; };
 		7B0E59630DB3D195007D4907 /* PageURLRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageURLRecord.h; path = icon/PageURLRecord.h; sourceTree = "<group>"; };
 		7B14AA450DE323CD00F4E646 /* CachedPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedPage.cpp; sourceTree = "<group>"; };
-		7B14AA460DE323CD00F4E646 /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; };
 		7B14AAA80DE3340400F4E646 /* CharsetData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CharsetData.cpp; sourceTree = "<group>"; };
 		7B27489D0E43815F009BCE03 /* libpcre.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpcre.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7B2B0A3F0E3143CF00D4C6B7 /* ImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDecoder.h; sourceTree = "<group>"; };
@@ -4567,7 +4566,6 @@
 				7B5E8BCA0D7F3B39001ECF42 /* BackForwardList.cpp */,
 				7B5E8BCB0D7F3B39001ECF42 /* BackForwardList.h */,
 				7B14AA450DE323CD00F4E646 /* CachedPage.cpp */,
-				7B14AA460DE323CD00F4E646 /* CachedPage.h */,
 			);
 			path = history;
 			sourceTree = "<group>";