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

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

Issue 21639002: Remove the last remnants of client redirect callbacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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
« no previous file with comments | « no previous file | Source/core/loader/FrameLoaderClient.h » ('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, 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 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 795
796 // Generate start and stop notifications only when loader is completed so th at we 796 // Generate start and stop notifications only when loader is completed so th at we
797 // don't fire them for fragment redirection that happens in window.onload ha ndler. 797 // don't fire them for fragment redirection that happens in window.onload ha ndler.
798 // See https://bugs.webkit.org/show_bug.cgi?id=31838 798 // See https://bugs.webkit.org/show_bug.cgi?id=31838
799 if (m_documentLoader->wasOnloadHandled()) 799 if (m_documentLoader->wasOnloadHandled())
800 m_client->postProgressStartedNotification(); 800 m_client->postProgressStartedNotification();
801 801
802 m_documentLoader->clearRedirectChain(); 802 m_documentLoader->clearRedirectChain();
803 m_documentLoader->setIsClientRedirect((m_startingClientRedirect && !isNewNav igation) || !UserGestureIndicator::processingUserGesture()); 803 m_documentLoader->setIsClientRedirect((m_startingClientRedirect && !isNewNav igation) || !UserGestureIndicator::processingUserGesture());
804 m_documentLoader->setReplacesCurrentHistoryItem(!isNewNavigation); 804 m_documentLoader->setReplacesCurrentHistoryItem(!isNewNavigation);
805 if (m_documentLoader->isClientRedirect()) { 805 if (m_documentLoader->isClientRedirect())
806 m_client->dispatchDidCompleteClientRedirect(oldURL);
807 m_documentLoader->appendRedirect(oldURL); 806 m_documentLoader->appendRedirect(oldURL);
808 }
809 m_documentLoader->appendRedirect(url); 807 m_documentLoader->appendRedirect(url);
810 808
811 m_client->dispatchDidNavigateWithinPage(); 809 m_client->dispatchDidNavigateWithinPage();
812 810
813 if (m_documentLoader->wasOnloadHandled()) 811 if (m_documentLoader->wasOnloadHandled())
814 m_client->postProgressFinishedNotification(); 812 m_client->postProgressFinishedNotification();
815 813
816 m_frame->document()->statePopped(stateObject ? stateObject : SerializedScrip tValue::nullValue()); 814 m_frame->document()->statePopped(stateObject ? stateObject : SerializedScrip tValue::nullValue());
817 815
818 if (hashChange) { 816 if (hashChange) {
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 setPolicyDocumentLoader(0); 1859 setPolicyDocumentLoader(0);
1862 1860
1863 if (formState) 1861 if (formState)
1864 m_client->dispatchWillSubmitForm(formState); 1862 m_client->dispatchWillSubmitForm(formState);
1865 1863
1866 m_progressTracker->progressStarted(); 1864 m_progressTracker->progressStarted();
1867 if (m_provisionalDocumentLoader->isClientRedirect()) 1865 if (m_provisionalDocumentLoader->isClientRedirect())
1868 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); 1866 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
1869 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req uest().url()); 1867 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req uest().url());
1870 m_client->dispatchDidStartProvisionalLoad(); 1868 m_client->dispatchDidStartProvisionalLoad();
1871 if (m_provisionalDocumentLoader->isClientRedirect())
1872 m_client->dispatchDidCompleteClientRedirect(m_frame->document()->url());
1873 ASSERT(m_provisionalDocumentLoader); 1869 ASSERT(m_provisionalDocumentLoader);
1874 m_provisionalDocumentLoader->startLoadingMainResource(); 1870 m_provisionalDocumentLoader->startLoadingMainResource();
1875 } 1871 }
1876 1872
1877 void FrameLoader::checkNewWindowPolicyAndContinue(PassRefPtr<FormState> formStat e, const String& frameName, const NavigationAction& action) 1873 void FrameLoader::checkNewWindowPolicyAndContinue(PassRefPtr<FormState> formStat e, const String& frameName, const NavigationAction& action)
1878 { 1874 {
1879 if (m_pageDismissalEventBeingDispatched != NoDismissal) 1875 if (m_pageDismissalEventBeingDispatched != NoDismissal)
1880 return; 1876 return;
1881 1877
1882 if (m_frame->document() && m_frame->document()->isSandboxed(SandboxPopups)) 1878 if (m_frame->document() && m_frame->document()->isSandboxed(SandboxPopups))
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get()); 2192 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
2197 2193
2198 m_frame->page()->didCommitLoad(m_frame); 2194 m_frame->page()->didCommitLoad(m_frame);
2199 2195
2200 if (m_frame->page()->mainFrame() == m_frame) 2196 if (m_frame->page()->mainFrame() == m_frame)
2201 m_frame->page()->useCounter()->didCommitLoad(); 2197 m_frame->page()->useCounter()->didCommitLoad();
2202 2198
2203 } 2199 }
2204 2200
2205 } // namespace WebCore 2201 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698