OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
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 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
9 * | 9 * |
10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 // Still waiting for elements that don't go through a FrameLoader? | 729 // Still waiting for elements that don't go through a FrameLoader? |
730 if (m_frame->document()->isDelayingLoadEvent()) | 730 if (m_frame->document()->isDelayingLoadEvent()) |
731 return; | 731 return; |
732 | 732 |
733 // Any frame that hasn't completed yet? | 733 // Any frame that hasn't completed yet? |
734 if (!allChildrenAreComplete()) | 734 if (!allChildrenAreComplete()) |
735 return; | 735 return; |
736 | 736 |
737 // OK, completed. | 737 // OK, completed. |
738 m_isComplete = true; | 738 m_isComplete = true; |
| 739 m_requestedHistoryItem = 0; |
739 m_frame->document()->setReadyState(Document::Complete); | 740 m_frame->document()->setReadyState(Document::Complete); |
740 | 741 |
741 RefPtr<Frame> protect(m_frame); | 742 RefPtr<Frame> protect(m_frame); |
742 checkCallImplicitClose(); // if we didn't do it before | 743 checkCallImplicitClose(); // if we didn't do it before |
743 | 744 |
744 m_frame->navigationScheduler()->startTimer(); | 745 m_frame->navigationScheduler()->startTimer(); |
745 | 746 |
746 completed(); | 747 completed(); |
747 if (m_frame->page()) | 748 if (m_frame->page()) |
748 checkLoadComplete(); | 749 checkLoadComplete(); |
(...skipping 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3159 requestForOriginalURL.setURL(itemOriginalURL); | 3160 requestForOriginalURL.setURL(itemOriginalURL); |
3160 action = NavigationAction(requestForOriginalURL, loadType, false); | 3161 action = NavigationAction(requestForOriginalURL, loadType, false); |
3161 } | 3162 } |
3162 | 3163 |
3163 loadWithNavigationAction(request, action, false, loadType, 0); | 3164 loadWithNavigationAction(request, action, false, loadType, 0); |
3164 } | 3165 } |
3165 | 3166 |
3166 // Loads content into this frame, as specified by history item | 3167 // Loads content into this frame, as specified by history item |
3167 void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType) | 3168 void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType) |
3168 { | 3169 { |
| 3170 m_requestedHistoryItem = item; |
3169 HistoryItem* currentItem = history()->currentItem(); | 3171 HistoryItem* currentItem = history()->currentItem(); |
3170 bool sameDocumentNavigation = currentItem && item->shouldDoSameDocumentNavig
ationTo(currentItem); | 3172 bool sameDocumentNavigation = currentItem && item->shouldDoSameDocumentNavig
ationTo(currentItem); |
3171 | 3173 |
3172 if (sameDocumentNavigation) | 3174 if (sameDocumentNavigation) |
3173 loadSameDocumentItem(item); | 3175 loadSameDocumentItem(item); |
3174 else | 3176 else |
3175 loadDifferentDocumentItem(item, loadType); | 3177 loadDifferentDocumentItem(item, loadType); |
3176 } | 3178 } |
3177 | 3179 |
3178 void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const Resour
ceError&) | 3180 void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const Resour
ceError&) |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3370 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); | 3372 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); |
3371 page->chrome()->setWindowRect(windowRect); | 3373 page->chrome()->setWindowRect(windowRect); |
3372 | 3374 |
3373 page->chrome()->show(); | 3375 page->chrome()->show(); |
3374 | 3376 |
3375 created = true; | 3377 created = true; |
3376 return frame; | 3378 return frame; |
3377 } | 3379 } |
3378 | 3380 |
3379 } // namespace WebCore | 3381 } // namespace WebCore |
OLD | NEW |