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 738 matching lines...) Loading... |
749 if (foundSelfReference) | 749 if (foundSelfReference) |
750 return false; | 750 return false; |
751 foundSelfReference = true; | 751 foundSelfReference = true; |
752 } | 752 } |
753 } | 753 } |
754 return true; | 754 return true; |
755 } | 755 } |
756 | 756 |
757 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const | 757 bool LocalFrame::shouldReuseDefaultView(const KURL& url) const |
758 { | 758 { |
759 return loader().stateMachine()->isDisplayingInitialEmptyDocument() && docume
nt()->isSecureTransitionTo(url); | 759 // Secure transitions can only happen when navigating from the initial empty |
| 760 // document. |
| 761 if (!loader().stateMachine()->isDisplayingInitialEmptyDocument()) |
| 762 return false; |
| 763 |
| 764 return document()->isSecureTransitionTo(url); |
760 } | 765 } |
761 | 766 |
762 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) | 767 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) |
763 { | 768 { |
764 spellChecker().removeSpellingMarkersUnderWords(words); | 769 spellChecker().removeSpellingMarkersUnderWords(words); |
765 } | 770 } |
766 | 771 |
767 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) | 772 static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const Fl
oatSize& delta, ScrollableArea& view) |
768 { | 773 { |
769 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); | 774 ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft,
granularity, delta.width()); |
(...skipping 107 matching lines...) Loading... |
877 { | 882 { |
878 m_frame->disableNavigation(); | 883 m_frame->disableNavigation(); |
879 } | 884 } |
880 | 885 |
881 FrameNavigationDisabler::~FrameNavigationDisabler() | 886 FrameNavigationDisabler::~FrameNavigationDisabler() |
882 { | 887 { |
883 m_frame->enableNavigation(); | 888 m_frame->enableNavigation(); |
884 } | 889 } |
885 | 890 |
886 } // namespace blink | 891 } // namespace blink |
OLD | NEW |