| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 DOMWindow* LocalFrame::domWindow() const | 225 DOMWindow* LocalFrame::domWindow() const |
| 226 { | 226 { |
| 227 return m_domWindow.get(); | 227 return m_domWindow.get(); |
| 228 } | 228 } |
| 229 | 229 |
| 230 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) | 230 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) |
| 231 { | 231 { |
| 232 return m_script->windowProxy(world); | 232 return m_script->windowProxy(world); |
| 233 } | 233 } |
| 234 | 234 |
| 235 Widget* LocalFrame::widget() const |
| 236 { |
| 237 return view(); |
| 238 } |
| 239 |
| 235 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa
ckForwardList) | 240 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa
ckForwardList) |
| 236 { | 241 { |
| 237 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(),
lockBackForwardList); | 242 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(),
lockBackForwardList); |
| 238 } | 243 } |
| 239 | 244 |
| 240 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe
directPolicy) | 245 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe
directPolicy) |
| 241 { | 246 { |
| 242 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe
load); | 247 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe
load); |
| 243 if (clientRedirectPolicy == NotClientRedirect) | 248 if (clientRedirectPolicy == NotClientRedirect) |
| 244 m_loader.reload(reloadPolicy); | 249 m_loader.reload(reloadPolicy); |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 , m_textZoomFactor(parentTextZoomFactor(this)) | 828 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 824 , m_inViewSourceMode(false) | 829 , m_inViewSourceMode(false) |
| 825 { | 830 { |
| 826 if (isLocalRoot()) | 831 if (isLocalRoot()) |
| 827 m_instrumentingAgents = InstrumentingAgents::create(); | 832 m_instrumentingAgents = InstrumentingAgents::create(); |
| 828 else | 833 else |
| 829 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 834 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 830 } | 835 } |
| 831 | 836 |
| 832 } // namespace blink | 837 } // namespace blink |
| OLD | NEW |