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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1610063002: Revert of Remove PaintInfo's paintingRoot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
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 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // Verify that the LocalFrame has a different FrameView or 180 // Verify that the LocalFrame has a different FrameView or
181 // that it is being detached and destructed. 181 // that it is being detached and destructed.
182 ASSERT(frame().view() != this || !layoutView()); 182 ASSERT(frame().view() != this || !layoutView());
183 #endif 183 #endif
184 } 184 }
185 185
186 DEFINE_TRACE(FrameView) 186 DEFINE_TRACE(FrameView)
187 { 187 {
188 #if ENABLE(OILPAN) 188 #if ENABLE(OILPAN)
189 visitor->trace(m_frame); 189 visitor->trace(m_frame);
190 visitor->trace(m_nodeToDraw);
190 visitor->trace(m_scrollAnchor); 191 visitor->trace(m_scrollAnchor);
191 visitor->trace(m_scrollableAreas); 192 visitor->trace(m_scrollableAreas);
192 visitor->trace(m_animatingScrollableAreas); 193 visitor->trace(m_animatingScrollableAreas);
193 visitor->trace(m_autoSizeInfo); 194 visitor->trace(m_autoSizeInfo);
194 visitor->trace(m_horizontalScrollbar); 195 visitor->trace(m_horizontalScrollbar);
195 visitor->trace(m_verticalScrollbar); 196 visitor->trace(m_verticalScrollbar);
196 visitor->trace(m_children); 197 visitor->trace(m_children);
197 visitor->trace(m_viewportScrollableArea); 198 visitor->trace(m_viewportScrollableArea);
198 #endif 199 #endif
199 Widget::trace(visitor); 200 Widget::trace(visitor);
(...skipping 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 return toLocalFrame(parentFrame)->view(); 2310 return toLocalFrame(parentFrame)->view();
2310 2311
2311 return nullptr; 2312 return nullptr;
2312 } 2313 }
2313 2314
2314 bool FrameView::isPainting() const 2315 bool FrameView::isPainting() const
2315 { 2316 {
2316 return m_isPainting; 2317 return m_isPainting;
2317 } 2318 }
2318 2319
2320 void FrameView::setNodeToDraw(Node* node)
2321 {
2322 m_nodeToDraw = node;
2323 }
2324
2319 void FrameView::updateWidgetGeometriesIfNeeded() 2325 void FrameView::updateWidgetGeometriesIfNeeded()
2320 { 2326 {
2321 if (!m_needsUpdateWidgetGeometries) 2327 if (!m_needsUpdateWidgetGeometries)
2322 return; 2328 return;
2323 2329
2324 m_needsUpdateWidgetGeometries = false; 2330 m_needsUpdateWidgetGeometries = false;
2325 2331
2326 updateWidgetGeometries(); 2332 updateWidgetGeometries();
2327 } 2333 }
2328 2334
(...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after
4026 return m_hiddenForThrottling && m_crossOriginForThrottling; 4032 return m_hiddenForThrottling && m_crossOriginForThrottling;
4027 } 4033 }
4028 4034
4029 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4035 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4030 { 4036 {
4031 ASSERT(layoutView()); 4037 ASSERT(layoutView());
4032 return *layoutView(); 4038 return *layoutView();
4033 } 4039 }
4034 4040
4035 } // namespace blink 4041 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698