OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 { | 344 { |
345 if (context.usesCache()) | 345 if (context.usesCache()) |
346 clipRects = *getClipRects(context); | 346 clipRects = *getClipRects(context); |
347 else | 347 else |
348 calculateClipRects(context, clipRects); | 348 calculateClipRects(context, clipRects); |
349 } | 349 } |
350 | 350 |
351 RenderLayer* RenderLayerClipper::clippingRootForPainting() const | 351 RenderLayer* RenderLayerClipper::clippingRootForPainting() const |
352 { | 352 { |
353 const RenderLayer* current = m_renderer.layer(); | 353 const RenderLayer* current = m_renderer.layer(); |
354 // FIXME: getting rid of current->hasCompositedLayerMapping() here breaks th
e | 354 // FIXME: getting rid of current->compositedLayerMapping() here breaks the |
355 // compositing/backing/no-backing-for-clip.html layout test, because there i
s a | 355 // compositing/backing/no-backing-for-clip.html layout test, because there i
s a |
356 // "composited but paints into ancestor" layer involved. However, it doesn't
make sense that | 356 // "composited but paints into ancestor" layer involved. However, it doesn't
make sense that |
357 // that check would be appropriate here but not inside the while loop below. | 357 // that check would be appropriate here but not inside the while loop below. |
358 if (current->isPaintInvalidationContainer() || current->hasCompositedLayerMa
pping()) | 358 if (current->isPaintInvalidationContainer() || current->compositedLayerMappi
ng()) |
359 return const_cast<RenderLayer*>(current); | 359 return const_cast<RenderLayer*>(current); |
360 | 360 |
361 while (current) { | 361 while (current) { |
362 if (current->isRootLayer()) | 362 if (current->isRootLayer()) |
363 return const_cast<RenderLayer*>(current); | 363 return const_cast<RenderLayer*>(current); |
364 | 364 |
365 current = current->compositingContainer(); | 365 current = current->compositingContainer(); |
366 ASSERT(current); | 366 ASSERT(current); |
367 if (current->transform() || current->isPaintInvalidationContainer()) | 367 if (current->transform() || current->isPaintInvalidationContainer()) |
368 return const_cast<RenderLayer*>(current); | 368 return const_cast<RenderLayer*>(current); |
369 } | 369 } |
370 | 370 |
371 ASSERT_NOT_REACHED(); | 371 ASSERT_NOT_REACHED(); |
372 return 0; | 372 return 0; |
373 } | 373 } |
374 | 374 |
375 } // namespace blink | 375 } // namespace blink |
OLD | NEW |