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

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

Issue 33523002: Have Frame::script() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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/Navigator.cpp » ('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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 (*it)->willDetachPage(); 330 (*it)->willDetachPage();
331 331
332 // FIXME: It's unclear as to why this is called more than once, but it is, 332 // FIXME: It's unclear as to why this is called more than once, but it is,
333 // so page() could be NULL. 333 // so page() could be NULL.
334 if (page() && page()->focusController().focusedFrame() == this) 334 if (page() && page()->focusController().focusedFrame() == this)
335 page()->focusController().setFocusedFrame(0); 335 page()->focusController().setFocusedFrame(0);
336 336
337 if (page() && page()->scrollingCoordinator() && m_view) 337 if (page() && page()->scrollingCoordinator() && m_view)
338 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); 338 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
339 339
340 script()->clearScriptObjects(); 340 script().clearScriptObjects();
341 } 341 }
342 342
343 void Frame::detachFromPage() 343 void Frame::detachFromPage()
344 { 344 {
345 // We should never be detatching the page during a Layout. 345 // We should never be detatching the page during a Layout.
346 RELEASE_ASSERT(!m_view || !m_view->isInLayout()); 346 RELEASE_ASSERT(!m_view || !m_view->isInLayout());
347 m_page = 0; 347 m_page = 0;
348 } 348 }
349 349
350 void Frame::disconnectOwnerElement() 350 void Frame::disconnectOwnerElement()
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 if (!m_page) 677 if (!m_page)
678 return 0; 678 return 0;
679 679
680 double ratio = m_page->deviceScaleFactor(); 680 double ratio = m_page->deviceScaleFactor();
681 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 681 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
682 ratio *= pageZoomFactor(); 682 ratio *= pageZoomFactor();
683 return ratio; 683 return ratio;
684 } 684 }
685 685
686 } // namespace WebCore 686 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/Navigator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698