| OLD | NEW |
| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 // Verify that the LocalFrame has a different FrameView or | 182 // Verify that the LocalFrame has a different FrameView or |
| 183 // that it is being detached and destructed. | 183 // that it is being detached and destructed. |
| 184 ASSERT(frame().view() != this || !layoutView()); | 184 ASSERT(frame().view() != this || !layoutView()); |
| 185 #endif | 185 #endif |
| 186 } | 186 } |
| 187 | 187 |
| 188 DEFINE_TRACE(FrameView) | 188 DEFINE_TRACE(FrameView) |
| 189 { | 189 { |
| 190 #if ENABLE(OILPAN) | 190 #if ENABLE(OILPAN) |
| 191 visitor->trace(m_frame); | 191 visitor->trace(m_frame); |
| 192 visitor->trace(m_nodeToDraw); | |
| 193 visitor->trace(m_scrollAnchor); | 192 visitor->trace(m_scrollAnchor); |
| 194 visitor->trace(m_scrollableAreas); | 193 visitor->trace(m_scrollableAreas); |
| 195 visitor->trace(m_animatingScrollableAreas); | 194 visitor->trace(m_animatingScrollableAreas); |
| 196 visitor->trace(m_autoSizeInfo); | 195 visitor->trace(m_autoSizeInfo); |
| 197 visitor->trace(m_horizontalScrollbar); | 196 visitor->trace(m_horizontalScrollbar); |
| 198 visitor->trace(m_verticalScrollbar); | 197 visitor->trace(m_verticalScrollbar); |
| 199 visitor->trace(m_children); | 198 visitor->trace(m_children); |
| 200 visitor->trace(m_viewportScrollableArea); | 199 visitor->trace(m_viewportScrollableArea); |
| 201 #endif | 200 #endif |
| 202 Widget::trace(visitor); | 201 Widget::trace(visitor); |
| (...skipping 2130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2333 return toLocalFrame(parentFrame)->view(); | 2332 return toLocalFrame(parentFrame)->view(); |
| 2334 | 2333 |
| 2335 return nullptr; | 2334 return nullptr; |
| 2336 } | 2335 } |
| 2337 | 2336 |
| 2338 bool FrameView::isPainting() const | 2337 bool FrameView::isPainting() const |
| 2339 { | 2338 { |
| 2340 return m_isPainting; | 2339 return m_isPainting; |
| 2341 } | 2340 } |
| 2342 | 2341 |
| 2343 void FrameView::setNodeToDraw(Node* node) | |
| 2344 { | |
| 2345 m_nodeToDraw = node; | |
| 2346 } | |
| 2347 | |
| 2348 void FrameView::updateWidgetGeometriesIfNeeded() | 2342 void FrameView::updateWidgetGeometriesIfNeeded() |
| 2349 { | 2343 { |
| 2350 if (!m_needsUpdateWidgetGeometries) | 2344 if (!m_needsUpdateWidgetGeometries) |
| 2351 return; | 2345 return; |
| 2352 | 2346 |
| 2353 m_needsUpdateWidgetGeometries = false; | 2347 m_needsUpdateWidgetGeometries = false; |
| 2354 | 2348 |
| 2355 updateWidgetGeometries(); | 2349 updateWidgetGeometries(); |
| 2356 } | 2350 } |
| 2357 | 2351 |
| (...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4045 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4039 return m_hiddenForThrottling && m_crossOriginForThrottling; |
| 4046 } | 4040 } |
| 4047 | 4041 |
| 4048 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4042 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4049 { | 4043 { |
| 4050 ASSERT(layoutView()); | 4044 ASSERT(layoutView()); |
| 4051 return *layoutView(); | 4045 return *layoutView(); |
| 4052 } | 4046 } |
| 4053 | 4047 |
| 4054 } // namespace blink | 4048 } // namespace blink |
| OLD | NEW |