| 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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 } | 354 } |
| 355 | 355 |
| 356 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { | 356 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { |
| 357 return m_script->windowProxy(world); | 357 return m_script->windowProxy(world); |
| 358 } | 358 } |
| 359 | 359 |
| 360 void LocalFrame::navigate(Document& originDocument, | 360 void LocalFrame::navigate(Document& originDocument, |
| 361 const KURL& url, | 361 const KURL& url, |
| 362 bool replaceCurrentItem, | 362 bool replaceCurrentItem, |
| 363 UserGestureStatus userGestureStatus) { | 363 UserGestureStatus userGestureStatus) { |
| 364 KURL upgradedURL(url); |
| 365 upgradeInsecureRequest(upgradedURL, originDocument); |
| 366 |
| 364 m_navigationScheduler->scheduleLocationChange( | 367 m_navigationScheduler->scheduleLocationChange( |
| 365 &originDocument, url.getString(), replaceCurrentItem); | 368 &originDocument, upgradedURL.getString(), replaceCurrentItem); |
| 366 } | 369 } |
| 367 | 370 |
| 368 void LocalFrame::navigate(const FrameLoadRequest& request) { | 371 void LocalFrame::navigate(const FrameLoadRequest& request) { |
| 369 m_loader.load(request); | 372 m_loader.load(request); |
| 370 } | 373 } |
| 371 | 374 |
| 372 void LocalFrame::reload(FrameLoadType loadType, | 375 void LocalFrame::reload(FrameLoadType loadType, |
| 373 ClientRedirectPolicy clientRedirectPolicy) { | 376 ClientRedirectPolicy clientRedirectPolicy) { |
| 374 DCHECK(isReloadLoadType(loadType)); | 377 DCHECK(isReloadLoadType(loadType)); |
| 375 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 378 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 932 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 930 m_frame->client()->frameBlameContext()->Enter(); | 933 m_frame->client()->frameBlameContext()->Enter(); |
| 931 } | 934 } |
| 932 | 935 |
| 933 ScopedFrameBlamer::~ScopedFrameBlamer() { | 936 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 934 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 937 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 935 m_frame->client()->frameBlameContext()->Leave(); | 938 m_frame->client()->frameBlameContext()->Leave(); |
| 936 } | 939 } |
| 937 | 940 |
| 938 } // namespace blink | 941 } // namespace blink |
| OLD | NEW |