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

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

Issue 334283004: Rename DOMWindow to LocalDOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 6 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
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/LocalDOMWindow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
25 * along with this library; see the file COPYING.LIB. If not, write to 25 * along with this library; see the file COPYING.LIB. If not, write to
26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
27 * Boston, MA 02110-1301, USA. 27 * Boston, MA 02110-1301, USA.
28 */ 28 */
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "core/frame/Frame.h" 31 #include "core/frame/Frame.h"
32 32
33 #include "core/dom/DocumentType.h" 33 #include "core/dom/DocumentType.h"
34 #include "core/events/Event.h" 34 #include "core/events/Event.h"
35 #include "core/frame/DOMWindow.h" 35 #include "core/frame/LocalDOMWindow.h"
36 #include "core/frame/FrameDestructionObserver.h" 36 #include "core/frame/FrameDestructionObserver.h"
37 #include "core/frame/FrameHost.h" 37 #include "core/frame/FrameHost.h"
38 #include "core/frame/Settings.h" 38 #include "core/frame/Settings.h"
39 #include "core/html/HTMLFrameElementBase.h" 39 #include "core/html/HTMLFrameElementBase.h"
40 #include "core/inspector/InspectorInstrumentation.h" 40 #include "core/inspector/InspectorInstrumentation.h"
41 #include "core/loader/EmptyClients.h" 41 #include "core/loader/EmptyClients.h"
42 #include "core/loader/FrameLoaderClient.h" 42 #include "core/loader/FrameLoaderClient.h"
43 #include "core/page/Chrome.h" 43 #include "core/page/Chrome.h"
44 #include "core/page/ChromeClient.h" 44 #include "core/page/ChromeClient.h"
45 #include "core/page/EventHandler.h" 45 #include "core/page/EventHandler.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 return 0; 114 return 0;
115 } 115 }
116 116
117 Settings* Frame::settings() const 117 Settings* Frame::settings() const
118 { 118 {
119 if (m_host) 119 if (m_host)
120 return &m_host->settings(); 120 return &m_host->settings();
121 return 0; 121 return 0;
122 } 122 }
123 123
124 void Frame::setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow> domWindow) 124 void Frame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow)
125 { 125 {
126 if (m_domWindow) 126 if (m_domWindow)
127 m_domWindow->reset(); 127 m_domWindow->reset();
128 m_domWindow = domWindow; 128 m_domWindow = domWindow;
129 } 129 }
130 130
131 static ChromeClient& emptyChromeClient() 131 static ChromeClient& emptyChromeClient()
132 { 132 {
133 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, ()); 133 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, ());
134 return client; 134 return client;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 192 }
193 m_owner = 0; 193 m_owner = 0;
194 } 194 }
195 195
196 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const 196 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const
197 { 197 {
198 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0; 198 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0;
199 } 199 }
200 200
201 } // namespace WebCore 201 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/LocalDOMWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698