| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 return parentRects.overflowClipRect(); | 430 return parentRects.overflowClipRect(); |
| 431 } | 431 } |
| 432 | 432 |
| 433 ClipRect PaintLayerClipper::clipRectWithGeometryMapper( | 433 ClipRect PaintLayerClipper::clipRectWithGeometryMapper( |
| 434 const ClipRectsContext& context, | 434 const ClipRectsContext& context, |
| 435 bool isForeground) const { | 435 bool isForeground) const { |
| 436 DCHECK(m_geometryMapper); | 436 DCHECK(m_geometryMapper); |
| 437 LayoutRect source(LayoutRect::infiniteIntRect()); | 437 LayoutRect source(LayoutRect::infiniteIntRect()); |
| 438 bool success = false; | 438 bool success = false; |
| 439 const auto* properties = m_layer.layoutObject()->paintProperties(); | 439 const auto* properties = m_layer.layoutObject()->paintProperties(); |
| 440 DCHECK(properties && properties->localBorderBoxProperties()); |
| 440 PropertyTreeState propertyTreeState = | 441 PropertyTreeState propertyTreeState = |
| 441 properties->localBorderBoxProperties()->propertyTreeState; | 442 properties->localBorderBoxProperties()->propertyTreeState; |
| 442 | 443 |
| 443 if (isForeground && shouldClipOverflow(context) && properties->overflowClip()) | 444 if (isForeground && shouldClipOverflow(context) && properties->overflowClip()) |
| 444 propertyTreeState.setClip(properties->overflowClip()); | 445 propertyTreeState.setClip(properties->overflowClip()); |
| 445 | 446 |
| 446 const auto* ancestorProperties = | 447 const auto* ancestorProperties = |
| 447 context.rootLayer->layoutObject()->paintProperties(); | 448 context.rootLayer->layoutObject()->paintProperties(); |
| 449 DCHECK(ancestorProperties && ancestorProperties->localBorderBoxProperties()); |
| 448 PropertyTreeState destinationPropertyTreeState = | 450 PropertyTreeState destinationPropertyTreeState = |
| 449 ancestorProperties->localBorderBoxProperties()->propertyTreeState; | 451 ancestorProperties->localBorderBoxProperties()->propertyTreeState; |
| 450 if (!context.rootLayer->clipper().shouldRespectOverflowClip(context)) { | 452 if (!context.rootLayer->clipper().shouldRespectOverflowClip(context)) { |
| 451 if (ancestorProperties->overflowClip()) | 453 if (ancestorProperties->overflowClip()) |
| 452 destinationPropertyTreeState.setClip(ancestorProperties->overflowClip()); | 454 destinationPropertyTreeState.setClip(ancestorProperties->overflowClip()); |
| 453 } | 455 } |
| 454 FloatRect clippedRectInRootLayerSpace = | 456 FloatRect clippedRectInRootLayerSpace = |
| 455 m_geometryMapper->mapToVisualRectInDestinationSpace( | 457 m_geometryMapper->mapToVisualRectInDestinationSpace( |
| 456 FloatRect(source), propertyTreeState, destinationPropertyTreeState, | 458 FloatRect(source), propertyTreeState, destinationPropertyTreeState, |
| 457 success); | 459 success); |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 const LayoutSize& subpixelAccumulation) const { | 554 const LayoutSize& subpixelAccumulation) const { |
| 553 DCHECK(!m_geometryMapper); | 555 DCHECK(!m_geometryMapper); |
| 554 ClipRectsContext context(rootLayer, PaintingClipRects, | 556 ClipRectsContext context(rootLayer, PaintingClipRects, |
| 555 IgnoreOverlayScrollbarSize, subpixelAccumulation); | 557 IgnoreOverlayScrollbarSize, subpixelAccumulation); |
| 556 if (respectOverflowClip == IgnoreOverflowClip) | 558 if (respectOverflowClip == IgnoreOverflowClip) |
| 557 context.setIgnoreOverflowClip(); | 559 context.setIgnoreOverflowClip(); |
| 558 return getClipRects(context); | 560 return getClipRects(context); |
| 559 } | 561 } |
| 560 | 562 |
| 561 } // namespace blink | 563 } // namespace blink |
| OLD | NEW |