OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 if (Frame* frame = renderer()->frame()) | 204 if (Frame* frame = renderer()->frame()) |
205 frame->eventHandler()->resizeLayerDestroyed(); | 205 frame->eventHandler()->resizeLayerDestroyed(); |
206 } | 206 } |
207 | 207 |
208 if (m_page) | 208 if (m_page) |
209 m_page->removeScrollableArea(this); | 209 m_page->removeScrollableArea(this); |
210 | 210 |
211 destroyScrollbar(HorizontalScrollbar); | 211 destroyScrollbar(HorizontalScrollbar); |
212 destroyScrollbar(VerticalScrollbar); | 212 destroyScrollbar(VerticalScrollbar); |
213 | 213 |
| 214 if (m_reflection) |
| 215 removeReflection(); |
| 216 |
214 // Child layers will be deleted by their corresponding render objects, so | 217 // Child layers will be deleted by their corresponding render objects, so |
215 // we don't need to delete them ourselves. | 218 // we don't need to delete them ourselves. |
216 | 219 |
217 delete m_posZOrderList; | 220 delete m_posZOrderList; |
218 delete m_negZOrderList; | 221 delete m_negZOrderList; |
219 delete m_normalFlowList; | 222 delete m_normalFlowList; |
220 delete m_marquee; | 223 delete m_marquee; |
221 | 224 |
222 #if USE(ACCELERATED_COMPOSITING) | 225 #if USE(ACCELERATED_COMPOSITING) |
223 clearBacking(); | 226 clearBacking(); |
224 #endif | 227 #endif |
225 | 228 |
226 // Make sure we have no lingering clip rects. | 229 // Make sure we have no lingering clip rects. |
227 ASSERT(!m_clipRects); | 230 ASSERT(!m_clipRects); |
228 | 231 |
229 if (m_reflection) | |
230 removeReflection(); | |
231 | |
232 if (m_scrollCorner) | 232 if (m_scrollCorner) |
233 m_scrollCorner->destroy(); | 233 m_scrollCorner->destroy(); |
234 if (m_resizer) | 234 if (m_resizer) |
235 m_resizer->destroy(); | 235 m_resizer->destroy(); |
236 } | 236 } |
237 | 237 |
238 #if USE(ACCELERATED_COMPOSITING) | 238 #if USE(ACCELERATED_COMPOSITING) |
239 RenderLayerCompositor* RenderLayer::compositor() const | 239 RenderLayerCompositor* RenderLayer::compositor() const |
240 { | 240 { |
241 ASSERT(renderer()->view()); | 241 ASSERT(renderer()->view()); |
(...skipping 3888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4130 } | 4130 } |
4131 } | 4131 } |
4132 | 4132 |
4133 void showLayerTree(const WebCore::RenderObject* renderer) | 4133 void showLayerTree(const WebCore::RenderObject* renderer) |
4134 { | 4134 { |
4135 if (!renderer) | 4135 if (!renderer) |
4136 return; | 4136 return; |
4137 showLayerTree(renderer->enclosingLayer()); | 4137 showLayerTree(renderer->enclosingLayer()); |
4138 } | 4138 } |
4139 #endif | 4139 #endif |
OLD | NEW |