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

Side by Side Diff: page/Frame.cpp

Issue 113554: For local review prior to sending to webkit (Closed) Base URL: http://svn.webkit.org/repository/webkit/trunk/WebCore/
Patch Set: '' Created 11 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
« no previous file with comments | « page/Frame.h ('k') | platform/network/ResourceRequestBase.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 Apple Inc. All rights reserv ed. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 return 0; 1141 return 0;
1142 ASSERT(object->isRenderView()); 1142 ASSERT(object->isRenderView());
1143 return toRenderView(object); 1143 return toRenderView(object);
1144 } 1144 }
1145 1145
1146 HTMLFrameOwnerElement* Frame::ownerElement() const 1146 HTMLFrameOwnerElement* Frame::ownerElement() const
1147 { 1147 {
1148 return m_ownerElement; 1148 return m_ownerElement;
1149 } 1149 }
1150 1150
1151 Frame* Frame::parentFrame() const
1152 {
1153 return parentFromOwnerElement(ownerElement());
1154 }
1155
1151 RenderPart* Frame::ownerRenderer() const 1156 RenderPart* Frame::ownerRenderer() const
1152 { 1157 {
1153 HTMLFrameOwnerElement* ownerElement = m_ownerElement; 1158 HTMLFrameOwnerElement* ownerElement = m_ownerElement;
1154 if (!ownerElement) 1159 if (!ownerElement)
1155 return 0; 1160 return 0;
1156 RenderObject* object = ownerElement->renderer(); 1161 RenderObject* object = ownerElement->renderer();
1157 if (!object) 1162 if (!object)
1158 return 0; 1163 return 0;
1159 // FIXME: If <object> is ever fixed to disassociate itself from frames 1164 // FIXME: If <object> is ever fixed to disassociate itself from frames
1160 // that it has started but canceled, then this can turn into an ASSERT 1165 // that it has started but canceled, then this can turn into an ASSERT
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1781 frameView->setParentVisible(true); 1786 frameView->setParentVisible(true);
1782 1787
1783 if (ownerRenderer()) 1788 if (ownerRenderer())
1784 ownerRenderer()->setWidget(frameView); 1789 ownerRenderer()->setWidget(frameView);
1785 1790
1786 if (HTMLFrameOwnerElement* owner = ownerElement()) 1791 if (HTMLFrameOwnerElement* owner = ownerElement())
1787 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 1792 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
1788 } 1793 }
1789 1794
1790 } // namespace WebCore 1795 } // namespace WebCore
OLDNEW
« no previous file with comments | « page/Frame.h ('k') | platform/network/ResourceRequestBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698