Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1145)

Side by Side Diff: WebCore/loader/HistoryController.h

Issue 6500005: Revert 78236 - Merge r76205, crbug 54262 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebCore/history/HistoryItem.cpp ('k') | WebCore/loader/HistoryController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 HistoryItem* previousItem() const { return m_previousItem.get(); } 78 HistoryItem* previousItem() const { return m_previousItem.get(); }
79 79
80 HistoryItem* provisionalItem() const { return m_provisionalItem.get(); } 80 HistoryItem* provisionalItem() const { return m_provisionalItem.get(); }
81 void setProvisionalItem(HistoryItem*); 81 void setProvisionalItem(HistoryItem*);
82 82
83 void pushState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url); 83 void pushState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);
84 void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, co nst String& url); 84 void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, co nst String& url);
85 85
86 private: 86 private:
87 void initializeItem(HistoryItem*); 87 PassRefPtr<HistoryItem> createItem(bool useOriginal);
88 PassRefPtr<HistoryItem> createItem();
89 PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget ); 88 PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget );
90 89
91 void recursiveGoToItem(HistoryItem*, HistoryItem*, FrameLoadType); 90 void recursiveGoToItem(HistoryItem*, HistoryItem*, FrameLoadType);
92 bool currentFramesMatchItem(HistoryItem*) const; 91 bool currentFramesMatchItem(HistoryItem*) const;
93 void updateBackForwardListClippedAtTarget(bool doClip); 92 void updateBackForwardListClippedAtTarget(bool doClip);
94 void updateCurrentItem();
95 93
96 Frame* m_frame; 94 Frame* m_frame;
97 95
98 RefPtr<HistoryItem> m_currentItem; 96 RefPtr<HistoryItem> m_currentItem;
99 RefPtr<HistoryItem> m_previousItem; 97 RefPtr<HistoryItem> m_previousItem;
100 RefPtr<HistoryItem> m_provisionalItem; 98 RefPtr<HistoryItem> m_provisionalItem;
101 99
102 bool m_frameLoadComplete; 100 bool m_frameLoadComplete;
103 }; 101 };
104 102
105 } // namespace WebCore 103 } // namespace WebCore
106 104
107 #endif // HistoryController_h 105 #endif // HistoryController_h
OLDNEW
« no previous file with comments | « WebCore/history/HistoryItem.cpp ('k') | WebCore/loader/HistoryController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698