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

Side by Side Diff: Source/core/rendering/RenderView.cpp

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 years, 3 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/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 867
868 bool RenderView::printing() const 868 bool RenderView::printing() const
869 { 869 {
870 return document().printing(); 870 return document().printing();
871 } 871 }
872 872
873 bool RenderView::shouldUsePrintingLayout() const 873 bool RenderView::shouldUsePrintingLayout() const
874 { 874 {
875 if (!printing() || !m_frameView) 875 if (!printing() || !m_frameView)
876 return false; 876 return false;
877 return m_frameView->frame()->shouldUsePrintingLayout(); 877 return m_frameView->frame().shouldUsePrintingLayout();
878 } 878 }
879 879
880 size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets) 880 size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets)
881 { 881 {
882 size_t size = m_widgets.size(); 882 size_t size = m_widgets.size();
883 883
884 renderWidgets.reserveCapacity(size); 884 renderWidgets.reserveCapacity(size);
885 885
886 RenderWidgetSet::const_iterator end = m_widgets.end(); 886 RenderWidgetSet::const_iterator end = m_widgets.end();
887 for (RenderWidgetSet::const_iterator it = m_widgets.begin(); it != end; ++it ) { 887 for (RenderWidgetSet::const_iterator it = m_widgets.begin(); it != end; ++it ) {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 if (hasColumns() && !style()->hasInlineColumnAxis()) { 1003 if (hasColumns() && !style()->hasInlineColumnAxis()) {
1004 if (int pageLength = m_frameView->pagination().pageLength) 1004 if (int pageLength = m_frameView->pagination().pageLength)
1005 height = pageLength; 1005 height = pageLength;
1006 } 1006 }
1007 1007
1008 return height; 1008 return height;
1009 } 1009 }
1010 1010
1011 float RenderView::zoomFactor() const 1011 float RenderView::zoomFactor() const
1012 { 1012 {
1013 return m_frameView->frame()->pageZoomFactor(); 1013 return m_frameView->frame().pageZoomFactor();
1014 } 1014 }
1015 1015
1016 void RenderView::pushLayoutState(RenderObject* root) 1016 void RenderView::pushLayoutState(RenderObject* root)
1017 { 1017 {
1018 ASSERT(m_layoutStateDisableCount == 0); 1018 ASSERT(m_layoutStateDisableCount == 0);
1019 ASSERT(m_layoutState == 0); 1019 ASSERT(m_layoutState == 0);
1020 1020
1021 m_layoutState = new LayoutState(root); 1021 m_layoutState = new LayoutState(root);
1022 } 1022 }
1023 1023
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 if (!m_intervalArena) 1106 if (!m_intervalArena)
1107 m_intervalArena = IntervalArena::create(); 1107 m_intervalArena = IntervalArena::create();
1108 return m_intervalArena.get(); 1108 return m_intervalArena.get();
1109 } 1109 }
1110 1110
1111 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const 1111 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const
1112 { 1112 {
1113 // FIXME: Remove this main frame check. Same concept applies to subframes to o. 1113 // FIXME: Remove this main frame check. Same concept applies to subframes to o.
1114 Page* page = document().page(); 1114 Page* page = document().page();
1115 Frame* mainFrame = page ? page->mainFrame() : 0; 1115 Frame* mainFrame = page ? page->mainFrame() : 0;
1116 if (!m_frameView || m_frameView->frame() != mainFrame) 1116 if (!m_frameView || &m_frameView->frame() != mainFrame)
1117 return false; 1117 return false;
1118 1118
1119 return m_frameView->hasOpaqueBackground(); 1119 return m_frameView->hasOpaqueBackground();
1120 } 1120 }
1121 1121
1122 FragmentationDisabler::FragmentationDisabler(RenderObject* root) 1122 FragmentationDisabler::FragmentationDisabler(RenderObject* root)
1123 { 1123 {
1124 RenderView* renderView = root->view(); 1124 RenderView* renderView = root->view();
1125 ASSERT(renderView); 1125 ASSERT(renderView);
1126 1126
(...skipping 24 matching lines...) Expand all
1151 #endif 1151 #endif
1152 1152
1153 if (layoutState) 1153 if (layoutState)
1154 layoutState->m_isPaginated = m_fragmenting; 1154 layoutState->m_isPaginated = m_fragmenting;
1155 1155
1156 if (m_flowThreadState != RenderObject::NotInsideFlowThread) 1156 if (m_flowThreadState != RenderObject::NotInsideFlowThread)
1157 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); 1157 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
1158 } 1158 }
1159 1159
1160 } // namespace WebCore 1160 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698