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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 } | 363 } |
364 | 364 |
365 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { | 365 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { |
366 return m_script->windowProxy(world); | 366 return m_script->windowProxy(world); |
367 } | 367 } |
368 | 368 |
369 void LocalFrame::navigate(Document& originDocument, | 369 void LocalFrame::navigate(Document& originDocument, |
370 const KURL& url, | 370 const KURL& url, |
371 bool replaceCurrentItem, | 371 bool replaceCurrentItem, |
372 UserGestureStatus userGestureStatus) { | 372 UserGestureStatus userGestureStatus) { |
373 m_navigationScheduler->scheduleLocationChange( | 373 m_navigationScheduler->scheduleLocationChange(&originDocument, url, |
374 &originDocument, url.getString(), replaceCurrentItem); | 374 replaceCurrentItem); |
375 } | 375 } |
376 | 376 |
377 void LocalFrame::navigate(const FrameLoadRequest& request) { | 377 void LocalFrame::navigate(const FrameLoadRequest& request) { |
378 m_loader.load(request); | 378 m_loader.load(request); |
379 } | 379 } |
380 | 380 |
381 void LocalFrame::reload(FrameLoadType loadType, | 381 void LocalFrame::reload(FrameLoadType loadType, |
382 ClientRedirectPolicy clientRedirectPolicy) { | 382 ClientRedirectPolicy clientRedirectPolicy) { |
383 DCHECK(isReloadLoadType(loadType)); | 383 DCHECK(isReloadLoadType(loadType)); |
384 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 384 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 938 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
939 m_frame->client()->frameBlameContext()->Enter(); | 939 m_frame->client()->frameBlameContext()->Enter(); |
940 } | 940 } |
941 | 941 |
942 ScopedFrameBlamer::~ScopedFrameBlamer() { | 942 ScopedFrameBlamer::~ScopedFrameBlamer() { |
943 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 943 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
944 m_frame->client()->frameBlameContext()->Leave(); | 944 m_frame->client()->frameBlameContext()->Leave(); |
945 } | 945 } |
946 | 946 |
947 } // namespace blink | 947 } // namespace blink |
OLD | NEW |