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

Side by Side Diff: Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

Issue 6541090: Merge 79107 - 2011-02-19 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
« no previous file with comments | « Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h ('k') | Source/WebKit/win/ChangeLog » ('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 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 5 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
6 * Coypright (C) 2008 Holger Hans Peter Freyther 6 * Coypright (C) 2008 Holger Hans Peter Freyther
7 * Coypright (C) 2009, 2010 Girish Ramakrishnan <girish@forwardbias.in> 7 * Coypright (C) 2009, 2010 Girish Ramakrishnan <girish@forwardbias.in>
8 * 8 *
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 qPrintable(QString(loader->serverRedirectDestinationForHistory ()))); 819 qPrintable(QString(loader->serverRedirectDestinationForHistory ())));
820 } 820 }
821 } 821 }
822 } 822 }
823 823
824 bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem *) const 824 bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem *) const
825 { 825 {
826 return true; 826 return true;
827 } 827 }
828 828
829 bool FrameLoaderClientQt::shouldStopLoadingForHistoryItem(WebCore::HistoryItem * ) const
830 {
831 return true;
832 }
833
829 void FrameLoaderClientQt::dispatchDidAddBackForwardItem(WebCore::HistoryItem*) c onst 834 void FrameLoaderClientQt::dispatchDidAddBackForwardItem(WebCore::HistoryItem*) c onst
830 { 835 {
831 } 836 }
832 837
833 void FrameLoaderClientQt::dispatchDidRemoveBackForwardItem(WebCore::HistoryItem* ) const 838 void FrameLoaderClientQt::dispatchDidRemoveBackForwardItem(WebCore::HistoryItem* ) const
834 { 839 {
835 } 840 }
836 841
837 void FrameLoaderClientQt::dispatchDidChangeBackForwardIndex() const 842 void FrameLoaderClientQt::dispatchDidChangeBackForwardIndex() const
838 { 843 {
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 } 1619 }
1615 1620
1616 PassRefPtr<FrameNetworkingContext> FrameLoaderClientQt::createNetworkingContext( ) 1621 PassRefPtr<FrameNetworkingContext> FrameLoaderClientQt::createNetworkingContext( )
1617 { 1622 {
1618 return FrameNetworkingContextQt::create(m_frame, m_webFrame, m_webFrame->pag e()->networkAccessManager()); 1623 return FrameNetworkingContextQt::create(m_frame, m_webFrame, m_webFrame->pag e()->networkAccessManager());
1619 } 1624 }
1620 1625
1621 } 1626 }
1622 1627
1623 #include "moc_FrameLoaderClientQt.cpp" 1628 #include "moc_FrameLoaderClientQt.cpp"
OLDNEW
« no previous file with comments | « Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h ('k') | Source/WebKit/win/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698