| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@web.de> | 10 * Christian Biesinger <cbiesinger@web.de> |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 return parentRects.posClipRect(); | 438 return parentRects.posClipRect(); |
| 439 | 439 |
| 440 return parentRects.overflowClipRect(); | 440 return parentRects.overflowClipRect(); |
| 441 } | 441 } |
| 442 | 442 |
| 443 ClipRect PaintLayerClipper::clipRectWithGeometryMapper( | 443 ClipRect PaintLayerClipper::clipRectWithGeometryMapper( |
| 444 const ClipRectsContext& context, | 444 const ClipRectsContext& context, |
| 445 bool isForeground) const { | 445 bool isForeground) const { |
| 446 DCHECK(m_geometryMapper); | 446 DCHECK(m_geometryMapper); |
| 447 const auto* properties = m_layer.layoutObject()->paintProperties(); | 447 const auto* properties = m_layer.layoutObject()->paintProperties(); |
| 448 // TODO(chrishtr): fix the underlying bug that causes this situation. | |
| 449 DCHECK(properties && properties->localBorderBoxProperties()); | 448 DCHECK(properties && properties->localBorderBoxProperties()); |
| 450 | 449 |
| 451 PropertyTreeState propertyTreeState = *properties->localBorderBoxProperties(); | 450 PropertyTreeState propertyTreeState = *properties->localBorderBoxProperties(); |
| 452 const auto* ancestorProperties = | 451 const auto* ancestorProperties = |
| 453 context.rootLayer->layoutObject()->paintProperties(); | 452 context.rootLayer->layoutObject()->paintProperties(); |
| 454 DCHECK(ancestorProperties && ancestorProperties->localBorderBoxProperties()); | 453 DCHECK(ancestorProperties && ancestorProperties->localBorderBoxProperties()); |
| 455 PropertyTreeState destinationPropertyTreeState = | 454 PropertyTreeState destinationPropertyTreeState = |
| 456 *ancestorProperties->localBorderBoxProperties(); | 455 *ancestorProperties->localBorderBoxProperties(); |
| 457 | 456 |
| 458 if (&m_layer == context.rootLayer) { | 457 if (&m_layer == context.rootLayer) { |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 const LayoutSize& subpixelAccumulation) const { | 582 const LayoutSize& subpixelAccumulation) const { |
| 584 DCHECK(!m_geometryMapper); | 583 DCHECK(!m_geometryMapper); |
| 585 ClipRectsContext context(rootLayer, PaintingClipRects, | 584 ClipRectsContext context(rootLayer, PaintingClipRects, |
| 586 IgnoreOverlayScrollbarSize, subpixelAccumulation); | 585 IgnoreOverlayScrollbarSize, subpixelAccumulation); |
| 587 if (respectOverflowClip == IgnoreOverflowClip) | 586 if (respectOverflowClip == IgnoreOverflowClip) |
| 588 context.setIgnoreOverflowClip(); | 587 context.setIgnoreOverflowClip(); |
| 589 return getClipRects(context); | 588 return getClipRects(context); |
| 590 } | 589 } |
| 591 | 590 |
| 592 } // namespace blink | 591 } // namespace blink |
| OLD | NEW |