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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 if (foundSelfReference) | 760 if (foundSelfReference) |
761 return false; | 761 return false; |
762 foundSelfReference = true; | 762 foundSelfReference = true; |
763 } | 763 } |
764 } | 764 } |
765 return true; | 765 return true; |
766 } | 766 } |
767 | 767 |
768 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const | 768 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const |
769 { | 769 { |
770 return loader().stateMachine()->isDisplayingInitialEmptyDocument() && docume
nt()->isSecureTransitionTo(url); | 770 // Secure transitions can only happen when navigating from the initial empty |
| 771 // document. |
| 772 if (!loader().stateMachine()->isDisplayingInitialEmptyDocument()) |
| 773 return false; |
| 774 |
| 775 return document()->isSecureTransitionTo(url); |
771 } | 776 } |
772 | 777 |
773 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) | 778 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) |
774 { | 779 { |
775 spellChecker().removeSpellingMarkersUnderWords(words); | 780 spellChecker().removeSpellingMarkersUnderWords(words); |
776 } | 781 } |
777 | 782 |
778 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) | 783 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) |
779 { | 784 { |
780 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); | 785 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
888 { | 893 { |
889 m_frame->disableNavigation(); | 894 m_frame->disableNavigation(); |
890 } | 895 } |
891 | 896 |
892 FrameNavigationDisabler::~FrameNavigationDisabler() | 897 FrameNavigationDisabler::~FrameNavigationDisabler() |
893 { | 898 { |
894 m_frame->enableNavigation(); | 899 m_frame->enableNavigation(); |
895 } | 900 } |
896 | 901 |
897 } // namespace blink | 902 } // namespace blink |
OLD | NEW |