| 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 959 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 970 m_progressTracker->progressStarted(); | 970 m_progressTracker->progressStarted(); |
| 971 m_client->dispatchDidStartProvisionalLoad(); | 971 m_client->dispatchDidStartProvisionalLoad(); |
| 972 | 972 |
| 973 // Notify accessibility. | 973 // Notify accessibility. |
| 974 if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) { | 974 if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) { |
| 975 AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadType
Reload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted; | 975 AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadType
Reload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted; |
| 976 cache->frameLoadingEventNotification(m_frame, loadingEvent); | 976 cache->frameLoadingEventNotification(m_frame, loadingEvent); |
| 977 } | 977 } |
| 978 } | 978 } |
| 979 | 979 |
| 980 void FrameLoader::setupForReplace() | |
| 981 { | |
| 982 setState(FrameStateProvisional); | |
| 983 m_provisionalDocumentLoader = m_documentLoader; | |
| 984 m_documentLoader = 0; | |
| 985 detachChildren(); | |
| 986 } | |
| 987 | |
| 988 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockBac
kForwardList, | 980 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockBac
kForwardList, |
| 989 PassRefPtr<Event> event, PassRefPtr<FormState> formState, ShouldSendReferrer
shouldSendReferrer) | 981 PassRefPtr<Event> event, PassRefPtr<FormState> formState, ShouldSendReferrer
shouldSendReferrer) |
| 990 { | 982 { |
| 991 // Protect frame from getting blown away inside dispatchBeforeLoadEvent in l
oadWithDocumentLoader. | 983 // Protect frame from getting blown away inside dispatchBeforeLoadEvent in l
oadWithDocumentLoader. |
| 992 RefPtr<Frame> protect(m_frame); | 984 RefPtr<Frame> protect(m_frame); |
| 993 | 985 |
| 994 KURL url = request.resourceRequest().url(); | 986 KURL url = request.resourceRequest().url(); |
| 995 | 987 |
| 996 ASSERT(m_frame->document()); | 988 ASSERT(m_frame->document()); |
| 997 if (!request.requester()->canDisplay(url)) { | 989 if (!request.requester()->canDisplay(url)) { |
| (...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2547 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); | 2539 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); |
| 2548 | 2540 |
| 2549 page->chrome().setWindowRect(newWindowRect); | 2541 page->chrome().setWindowRect(newWindowRect); |
| 2550 page->chrome().show(); | 2542 page->chrome().show(); |
| 2551 | 2543 |
| 2552 created = true; | 2544 created = true; |
| 2553 return frame; | 2545 return frame; |
| 2554 } | 2546 } |
| 2555 | 2547 |
| 2556 } // namespace WebCore | 2548 } // namespace WebCore |
| OLD | NEW |