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

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

Issue 53303002: Have HTMLFrameOwnerElement / SubframeLoadingDisabler deal with references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tiny fix Created 7 years, 1 month 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
« no previous file with comments | « Source/core/dom/ContainerNodeAlgorithms.h ('k') | Source/core/html/HTMLFrameElementBase.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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 , m_textZoomFactor(parentTextZoomFactor(this)) 117 , m_textZoomFactor(parentTextZoomFactor(this))
118 #if ENABLE(ORIENTATION_EVENTS) 118 #if ENABLE(ORIENTATION_EVENTS)
119 , m_orientation(0) 119 , m_orientation(0)
120 #endif 120 #endif
121 , m_inViewSourceMode(false) 121 , m_inViewSourceMode(false)
122 { 122 {
123 ASSERT(page); 123 ASSERT(page);
124 124
125 if (ownerElement) { 125 if (ownerElement) {
126 page->incrementSubframeCount(); 126 page->incrementSubframeCount();
127 ownerElement->setContentFrame(this); 127 ownerElement->setContentFrame(*this);
128 } 128 }
129 129
130 #ifndef NDEBUG 130 #ifndef NDEBUG
131 frameCounter.increment(); 131 frameCounter.increment();
132 #endif 132 #endif
133 } 133 }
134 134
135 PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client) 135 PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
136 { 136 {
137 RefPtr<Frame> frame = adoptRef(new Frame(page, ownerElement, client)); 137 RefPtr<Frame> frame = adoptRef(new Frame(page, ownerElement, client));
(...skipping 539 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/dom/ContainerNodeAlgorithms.h ('k') | Source/core/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698