Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 1109213002: Make createWindow (mostly) work with OOPIF (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 DOMWindow* LocalFrame::domWindow() const 226 DOMWindow* LocalFrame::domWindow() const
227 { 227 {
228 return m_domWindow.get(); 228 return m_domWindow.get();
229 } 229 }
230 230
231 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) 231 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world)
232 { 232 {
233 return m_script->windowProxy(world); 233 return m_script->windowProxy(world);
234 } 234 }
235 235
236 Widget* LocalFrame::widget() const
237 {
238 return view();
239 }
240
236 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa ckForwardList) 241 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa ckForwardList)
237 { 242 {
238 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), lockBackForwardList); 243 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), lockBackForwardList);
239 } 244 }
240 245
241 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe directPolicy) 246 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRe directPolicy)
242 { 247 {
243 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe load); 248 ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalRe load);
244 if (clientRedirectPolicy == NotClientRedirect) 249 if (clientRedirectPolicy == NotClientRedirect)
245 m_loader.reload(reloadPolicy); 250 m_loader.reload(reloadPolicy);
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 , m_textZoomFactor(parentTextZoomFactor(this)) 829 , m_textZoomFactor(parentTextZoomFactor(this))
825 , m_inViewSourceMode(false) 830 , m_inViewSourceMode(false)
826 { 831 {
827 if (isLocalRoot()) 832 if (isLocalRoot())
828 m_instrumentingAgents = InstrumentingAgents::create(); 833 m_instrumentingAgents = InstrumentingAgents::create();
829 else 834 else
830 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 835 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
831 } 836 }
832 837
833 } // namespace blink 838 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698