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

Side by Side Diff: Source/core/loader/HistoryController.cpp

Issue 14610003: Revert "Remove FrameLoadTypeSame" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
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 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 187
188 void HistoryController::restoreDocumentState() 188 void HistoryController::restoreDocumentState()
189 { 189 {
190 Document* doc = m_frame->document(); 190 Document* doc = m_frame->document();
191 191
192 HistoryItem* itemToRestore = 0; 192 HistoryItem* itemToRestore = 0;
193 193
194 switch (m_frame->loader()->loadType()) { 194 switch (m_frame->loader()->loadType()) {
195 case FrameLoadTypeReload: 195 case FrameLoadTypeReload:
196 case FrameLoadTypeReloadFromOrigin: 196 case FrameLoadTypeReloadFromOrigin:
197 case FrameLoadTypeSame:
197 case FrameLoadTypeReplace: 198 case FrameLoadTypeReplace:
198 break; 199 break;
199 case FrameLoadTypeBackForward: 200 case FrameLoadTypeBackForward:
200 case FrameLoadTypeRedirectWithLockedBackForwardList: 201 case FrameLoadTypeRedirectWithLockedBackForwardList:
201 case FrameLoadTypeInitialInChildFrame: 202 case FrameLoadTypeInitialInChildFrame:
202 case FrameLoadTypeStandard: 203 case FrameLoadTypeStandard:
203 itemToRestore = m_currentItem.get(); 204 itemToRestore = m_currentItem.get();
204 } 205 }
205 206
206 if (!itemToRestore) 207 if (!itemToRestore)
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 ASSERT(page); 363 ASSERT(page);
363 page->mainFrame()->loader()->history()->recursiveUpdateForCommit(); 364 page->mainFrame()->loader()->history()->recursiveUpdateForCommit();
364 } 365 }
365 366
366 switch (type) { 367 switch (type) {
367 case FrameLoadTypeBackForward: 368 case FrameLoadTypeBackForward:
368 updateForBackForwardNavigation(); 369 updateForBackForwardNavigation();
369 return; 370 return;
370 case FrameLoadTypeReload: 371 case FrameLoadTypeReload:
371 case FrameLoadTypeReloadFromOrigin: 372 case FrameLoadTypeReloadFromOrigin:
373 case FrameLoadTypeSame:
372 case FrameLoadTypeReplace: 374 case FrameLoadTypeReplace:
373 updateForReload(); 375 updateForReload();
374 return; 376 return;
375 case FrameLoadTypeStandard: 377 case FrameLoadTypeStandard:
376 updateForStandardLoad(); 378 updateForStandardLoad();
377 return; 379 return;
378 case FrameLoadTypeRedirectWithLockedBackForwardList: 380 case FrameLoadTypeRedirectWithLockedBackForwardList:
379 updateForRedirectWithLockedBackForwardList(); 381 updateForRedirectWithLockedBackForwardList();
380 return; 382 return;
381 case FrameLoadTypeInitialInChildFrame: 383 case FrameLoadTypeInitialInChildFrame:
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 m_currentItem->setURLString(urlString); 767 m_currentItem->setURLString(urlString);
766 m_currentItem->setTitle(title); 768 m_currentItem->setTitle(title);
767 m_currentItem->setStateObject(stateObject); 769 m_currentItem->setStateObject(stateObject);
768 m_currentItem->setFormData(0); 770 m_currentItem->setFormData(0);
769 m_currentItem->setFormContentType(String()); 771 m_currentItem->setFormContentType(String());
770 772
771 ASSERT(m_frame->page()); 773 ASSERT(m_frame->page());
772 } 774 }
773 775
774 } // namespace WebCore 776 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoaderTypes.h ('k') | Source/core/loader/cache/CachedResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698