Source/WebCore/loader/HistoryController.h - Issue 6250180: Merge 77705 - 2011-02-04 Charlie Reis <creis@chromium.org>...

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

Issue 6250180: Merge 77705 - 2011-02-04 Charlie Reis <creis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

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

OLD	NEW
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 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 void pushState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);	84 void pushState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);

85 void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, co nst String& url);	85 void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, co nst String& url);

86	86

87 private:	87 private:

88 void initializeItem(HistoryItem*);	88 void initializeItem(HistoryItem*);

89 PassRefPtr<HistoryItem> createItem();	89 PassRefPtr<HistoryItem> createItem();

90 PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget );	90 PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget );

91	91

92 void recursiveSetProvisionalItem(HistoryItem, HistoryItem, FrameLoadType);	92 void recursiveSetProvisionalItem(HistoryItem, HistoryItem, FrameLoadType);

93 void recursiveGoToItem(HistoryItem, HistoryItem, FrameLoadType);	93 void recursiveGoToItem(HistoryItem, HistoryItem, FrameLoadType);

	94 bool isReplaceLoadTypeWithProvisionalItem(FrameLoadType);

94 void recursiveUpdateForCommit();	95 void recursiveUpdateForCommit();

	96 void recursiveUpdateForSameDocumentNavigation();

95 bool itemsAreClones(HistoryItem, HistoryItem) const;	97 bool itemsAreClones(HistoryItem, HistoryItem) const;

96 bool currentFramesMatchItem(HistoryItem*) const;	98 bool currentFramesMatchItem(HistoryItem*) const;

97 void updateBackForwardListClippedAtTarget(bool doClip);	99 void updateBackForwardListClippedAtTarget(bool doClip);

98 void updateCurrentItem();	100 void updateCurrentItem();

99	101

100 Frame* m_frame;	102 Frame* m_frame;

101	103

102 RefPtr<HistoryItem> m_currentItem;	104 RefPtr<HistoryItem> m_currentItem;

103 RefPtr<HistoryItem> m_previousItem;	105 RefPtr<HistoryItem> m_previousItem;

104 RefPtr<HistoryItem> m_provisionalItem;	106 RefPtr<HistoryItem> m_provisionalItem;

105	107

106 bool m_frameLoadComplete;	108 bool m_frameLoadComplete;

107 };	109 };

108	110

109 } // namespace WebCore	111 } // namespace WebCore

110	112

111 #endif // HistoryController_h	113 #endif // HistoryController_h

OLD	NEW

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/loader/HistoryController.cpp » ('j') | no next file with comments »