| 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 // client redirect, which is observable via the webNavigation extension api. | 244 // client redirect, which is observable via the webNavigation extension api. |
| 245 if (isMainFrame() && !m_loader.stateMachine()->committedFirstRealDocumentLoa
d()) { | 245 if (isMainFrame() && !m_loader.stateMachine()->committedFirstRealDocumentLoa
d()) { |
| 246 FrameLoadRequest request(&originDocument, url); | 246 FrameLoadRequest request(&originDocument, url); |
| 247 request.resourceRequest().setHasUserGesture(userGestureStatus == UserGes
tureStatus::Active); | 247 request.resourceRequest().setHasUserGesture(userGestureStatus == UserGes
tureStatus::Active); |
| 248 m_loader.load(request); | 248 m_loader.load(request); |
| 249 } else { | 249 } else { |
| 250 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string
(), lockBackForwardList); | 250 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string
(), lockBackForwardList); |
| 251 } | 251 } |
| 252 } | 252 } |
| 253 | 253 |
| 254 void LocalFrame::navigate(const FrameLoadRequest& request) |
| 255 { |
| 256 m_loader.load(request); |
| 257 } |
| 258 |
| 254 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe
directPolicy) | 259 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe
directPolicy) |
| 255 { | 260 { |
| 256 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe
load); | 261 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe
load); |
| 257 if (clientRedirectPolicy == NotClientRedirect) | 262 if (clientRedirectPolicy == NotClientRedirect) |
| 258 m_loader.reload(reloadPolicy); | 263 m_loader.reload(reloadPolicy); |
| 259 else | 264 else |
| 260 m_navigationScheduler.scheduleReload(); | 265 m_navigationScheduler.scheduleReload(); |
| 261 } | 266 } |
| 262 | 267 |
| 263 void LocalFrame::detach() | 268 void LocalFrame::detach() |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 , m_textZoomFactor(parentTextZoomFactor(this)) | 817 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 813 , m_inViewSourceMode(false) | 818 , m_inViewSourceMode(false) |
| 814 { | 819 { |
| 815 if (isLocalRoot()) | 820 if (isLocalRoot()) |
| 816 m_instrumentingAgents = InstrumentingAgents::create(); | 821 m_instrumentingAgents = InstrumentingAgents::create(); |
| 817 else | 822 else |
| 818 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 823 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 819 } | 824 } |
| 820 | 825 |
| 821 } // namespace blink | 826 } // namespace blink |
| OLD | NEW |