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

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

Issue 451013003: Rename V8WindowShell to WindowProxy (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 resultSize.setHeight(floorf(expectedSize.height())); 228 resultSize.setHeight(floorf(expectedSize.height()));
229 resultSize.setWidth(floorf(resultSize.height() * ratio)); 229 resultSize.setWidth(floorf(resultSize.height() * ratio));
230 } 230 }
231 return resultSize; 231 return resultSize;
232 } 232 }
233 233
234 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) 234 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow)
235 { 235 {
236 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); 236 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get());
237 if (domWindow) 237 if (domWindow)
238 script().clearWindowShell(); 238 script().clearWindowProxy();
239 Frame::setDOMWindow(domWindow); 239 Frame::setDOMWindow(domWindow);
240 } 240 }
241 241
242 void LocalFrame::didChangeVisibilityState() 242 void LocalFrame::didChangeVisibilityState()
243 { 243 {
244 if (document()) 244 if (document())
245 document()->didChangeVisibilityState(); 245 document()->didChangeVisibilityState();
246 246
247 Vector<RefPtr<LocalFrame> > childFrames; 247 Vector<RefPtr<LocalFrame> > childFrames;
248 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) { 248 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) {
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 LocalFrame* LocalFrame::localFrameRoot() 660 LocalFrame* LocalFrame::localFrameRoot()
661 { 661 {
662 LocalFrame* curFrame = this; 662 LocalFrame* curFrame = this;
663 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame()) 663 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame())
664 curFrame = toLocalFrame(curFrame->tree().parent()); 664 curFrame = toLocalFrame(curFrame->tree().parent());
665 665
666 return curFrame; 666 return curFrame;
667 } 667 }
668 668
669 } // namespace blink 669 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/tests/results/V8TestInterfaceDocument.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698