| 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 m_supplements.clear(); | 339 m_supplements.clear(); |
| 340 m_supplementStatus = SupplementStatus::Cleared; | 340 m_supplementStatus = SupplementStatus::Cleared; |
| 341 WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this); | 341 WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this); |
| 342 } | 342 } |
| 343 | 343 |
| 344 bool LocalFrame::prepareForCommit() | 344 bool LocalFrame::prepareForCommit() |
| 345 { | 345 { |
| 346 return loader().prepareForCommit(); | 346 return loader().prepareForCommit(); |
| 347 } | 347 } |
| 348 | 348 |
| 349 bool LocalFrame::shouldEnforceStrictMixedContentChecking() const |
| 350 { |
| 351 return document()->shouldEnforceStrictMixedContentChecking(); |
| 352 } |
| 353 |
| 349 SecurityContext* LocalFrame::securityContext() const | 354 SecurityContext* LocalFrame::securityContext() const |
| 350 { | 355 { |
| 351 return document(); | 356 return document(); |
| 352 } | 357 } |
| 353 | 358 |
| 354 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha
r* reason) | 359 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha
r* reason) |
| 355 { | 360 { |
| 356 // URLs aren't available for RemoteFrames, so the error message uses their | 361 // URLs aren't available for RemoteFrames, so the error message uses their |
| 357 // origin instead. | 362 // origin instead. |
| 358 String targetFrameDescription = targetFrame.isLocalFrame() ? "with URL '" +
toLocalFrame(targetFrame).document()->url().string() + "'" : "with origin '" + t
argetFrame.securityContext()->securityOrigin()->toString() + "'"; | 363 String targetFrameDescription = targetFrame.isLocalFrame() ? "with URL '" +
toLocalFrame(targetFrame).document()->url().string() + "'" : "with origin '" + t
argetFrame.securityContext()->securityOrigin()->toString() + "'"; |
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 { | 918 { |
| 914 m_frame->disableNavigation(); | 919 m_frame->disableNavigation(); |
| 915 } | 920 } |
| 916 | 921 |
| 917 FrameNavigationDisabler::~FrameNavigationDisabler() | 922 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 918 { | 923 { |
| 919 m_frame->enableNavigation(); | 924 m_frame->enableNavigation(); |
| 920 } | 925 } |
| 921 | 926 |
| 922 } // namespace blink | 927 } // namespace blink |
| OLD | NEW |