| 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 clipRects = *parentLayer->clipper().cachedClipRects(context); | 293 clipRects = *parentLayer->clipper().cachedClipRects(context); |
| 294 } else { | 294 } else { |
| 295 parentLayer->clipper().calculateClipRects(context, clipRects); | 295 parentLayer->clipper().calculateClipRects(context, clipRects); |
| 296 } | 296 } |
| 297 } else { | 297 } else { |
| 298 clipRects.reset(LayoutRect::infiniteIntRect()); | 298 clipRects.reset(LayoutRect::infiniteIntRect()); |
| 299 } | 299 } |
| 300 | 300 |
| 301 adjustClipRectsForChildren(m_renderer, clipRects); | 301 adjustClipRectsForChildren(m_renderer, clipRects); |
| 302 | 302 |
| 303 // FIXME: This logic looks wrong. We'll apply overflow clip rects even if we
were told to IgnoreOverflowClip if m_renderer.hasClip(). | |
| 304 if ((m_renderer.hasOverflowClip() && (context.respectOverflowClip == Respect
OverflowClip || !isClippingRoot)) || m_renderer.hasClip()) { | 303 if ((m_renderer.hasOverflowClip() && (context.respectOverflowClip == Respect
OverflowClip || !isClippingRoot)) || m_renderer.hasClip()) { |
| 305 // This offset cannot use convertToLayerCoords, because sometimes our ro
otLayer may be across | 304 // This offset cannot use convertToLayerCoords, because sometimes our ro
otLayer may be across |
| 306 // some transformed layer boundary, for example, in the RenderLayerCompo
sitor overlapMap, where | 305 // some transformed layer boundary, for example, in the RenderLayerCompo
sitor overlapMap, where |
| 307 // clipRects are needed in view space. | 306 // clipRects are needed in view space. |
| 308 applyClipRects(context, m_renderer, roundedLayoutPoint(m_renderer.localT
oContainerPoint(FloatPoint(), context.rootLayer->renderer())), clipRects); | 307 applyClipRects(context, m_renderer, roundedLayoutPoint(m_renderer.localT
oContainerPoint(FloatPoint(), context.rootLayer->renderer())), clipRects); |
| 309 } | 308 } |
| 310 } | 309 } |
| 311 | 310 |
| 312 static ClipRect backgroundClipRectForPosition(const ClipRects& parentRects, EPos
ition position) | 311 static ClipRect backgroundClipRectForPosition(const ClipRects& parentRects, EPos
ition position) |
| 313 { | 312 { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 ASSERT(current); | 365 ASSERT(current); |
| 367 if (current->transform() || current->isPaintInvalidationContainer()) | 366 if (current->transform() || current->isPaintInvalidationContainer()) |
| 368 return const_cast<RenderLayer*>(current); | 367 return const_cast<RenderLayer*>(current); |
| 369 } | 368 } |
| 370 | 369 |
| 371 ASSERT_NOT_REACHED(); | 370 ASSERT_NOT_REACHED(); |
| 372 return 0; | 371 return 0; |
| 373 } | 372 } |
| 374 | 373 |
| 375 } // namespace blink | 374 } // namespace blink |
| OLD | NEW |