OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
761 if (foundSelfReference) | 761 if (foundSelfReference) |
762 return false; | 762 return false; |
763 foundSelfReference = true; | 763 foundSelfReference = true; |
764 } | 764 } |
765 } | 765 } |
766 return true; | 766 return true; |
767 } | 767 } |
768 | 768 |
769 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const | 769 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const |
770 { | 770 { |
771 return loader().stateMachine()->isDisplayingInitialEmptyDocument() && docume
nt()->isSecureTransitionTo(url); | 771 // Secure transitions can only happen when navigating from the initial empty |
| 772 // document. |
| 773 if (!loader().stateMachine()->isDisplayingInitialEmptyDocument()) |
| 774 return false; |
| 775 |
| 776 return document()->isSecureTransitionTo(url); |
772 } | 777 } |
773 | 778 |
774 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) | 779 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) |
775 { | 780 { |
776 spellChecker().removeSpellingMarkersUnderWords(words); | 781 spellChecker().removeSpellingMarkersUnderWords(words); |
777 } | 782 } |
778 | 783 |
779 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) | 784 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) |
780 { | 785 { |
781 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); | 786 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 { | 894 { |
890 m_frame->disableNavigation(); | 895 m_frame->disableNavigation(); |
891 } | 896 } |
892 | 897 |
893 FrameNavigationDisabler::~FrameNavigationDisabler() | 898 FrameNavigationDisabler::~FrameNavigationDisabler() |
894 { | 899 { |
895 m_frame->enableNavigation(); | 900 m_frame->enableNavigation(); |
896 } | 901 } |
897 | 902 |
898 } // namespace blink | 903 } // namespace blink |
OLD | NEW |