| 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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); | |
| 191 visitor->trace(m_scrollAnchor); | 190 visitor->trace(m_scrollAnchor); |
| 192 visitor->trace(m_scrollableAreas); | 191 visitor->trace(m_scrollableAreas); |
| 193 visitor->trace(m_animatingScrollableAreas); | 192 visitor->trace(m_animatingScrollableAreas); |
| 194 visitor->trace(m_autoSizeInfo); | 193 visitor->trace(m_autoSizeInfo); |
| 195 visitor->trace(m_horizontalScrollbar); | 194 visitor->trace(m_horizontalScrollbar); |
| 196 visitor->trace(m_verticalScrollbar); | 195 visitor->trace(m_verticalScrollbar); |
| 197 visitor->trace(m_children); | 196 visitor->trace(m_children); |
| 198 visitor->trace(m_viewportScrollableArea); | 197 visitor->trace(m_viewportScrollableArea); |
| 199 #endif | 198 #endif |
| 200 Widget::trace(visitor); | 199 Widget::trace(visitor); |
| (...skipping 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2310 return toLocalFrame(parentFrame)->view(); | 2309 return toLocalFrame(parentFrame)->view(); |
| 2311 | 2310 |
| 2312 return nullptr; | 2311 return nullptr; |
| 2313 } | 2312 } |
| 2314 | 2313 |
| 2315 bool FrameView::isPainting() const | 2314 bool FrameView::isPainting() const |
| 2316 { | 2315 { |
| 2317 return m_isPainting; | 2316 return m_isPainting; |
| 2318 } | 2317 } |
| 2319 | 2318 |
| 2320 void FrameView::setNodeToDraw(Node* node) | |
| 2321 { | |
| 2322 m_nodeToDraw = node; | |
| 2323 } | |
| 2324 | |
| 2325 void FrameView::updateWidgetGeometriesIfNeeded() | 2319 void FrameView::updateWidgetGeometriesIfNeeded() |
| 2326 { | 2320 { |
| 2327 if (!m_needsUpdateWidgetGeometries) | 2321 if (!m_needsUpdateWidgetGeometries) |
| 2328 return; | 2322 return; |
| 2329 | 2323 |
| 2330 m_needsUpdateWidgetGeometries = false; | 2324 m_needsUpdateWidgetGeometries = false; |
| 2331 | 2325 |
| 2332 updateWidgetGeometries(); | 2326 updateWidgetGeometries(); |
| 2333 } | 2327 } |
| 2334 | 2328 |
| (...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4032 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4026 return m_hiddenForThrottling && m_crossOriginForThrottling; |
| 4033 } | 4027 } |
| 4034 | 4028 |
| 4035 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4029 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4036 { | 4030 { |
| 4037 ASSERT(layoutView()); | 4031 ASSERT(layoutView()); |
| 4038 return *layoutView(); | 4032 return *layoutView(); |
| 4039 } | 4033 } |
| 4040 | 4034 |
| 4041 } // namespace blink | 4035 } // namespace blink |
| OLD | NEW |