| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 // on painting phases, so we need to update when either are updated. | 558 // on painting phases, so we need to update when either are updated. |
| 559 if (layerConfigChanged || maskLayerChanged) | 559 if (layerConfigChanged || maskLayerChanged) |
| 560 updatePaintingPhases(); | 560 updatePaintingPhases(); |
| 561 | 561 |
| 562 return layerConfigChanged; | 562 return layerConfigChanged; |
| 563 } | 563 } |
| 564 | 564 |
| 565 static IntRect clipBox(LayoutBox* layoutObject) | 565 static IntRect clipBox(LayoutBox* layoutObject) |
| 566 { | 566 { |
| 567 LayoutRect result = LayoutRect(LayoutRect::infiniteIntRect()); | 567 LayoutRect result = LayoutRect(LayoutRect::infiniteIntRect()); |
| 568 if (layoutObject->hasOverflowClip()) | 568 if (layoutObject->hasOverflowClip() || layoutObject->style()->containsPaint(
)) |
| 569 result = layoutObject->overflowClipRect(LayoutPoint()); | 569 result = layoutObject->overflowClipRect(LayoutPoint()); |
| 570 | 570 |
| 571 if (layoutObject->hasClip()) | 571 if (layoutObject->hasClip()) |
| 572 result.intersect(layoutObject->clipRect(LayoutPoint())); | 572 result.intersect(layoutObject->clipRect(LayoutPoint())); |
| 573 | 573 |
| 574 return pixelSnappedIntRect(result); | 574 return pixelSnappedIntRect(result); |
| 575 } | 575 } |
| 576 | 576 |
| 577 static LayoutPoint computeOffsetFromCompositedAncestor(const PaintLayer* layer,
const PaintLayer* compositedAncestor) | 577 static LayoutPoint computeOffsetFromCompositedAncestor(const PaintLayer* layer,
const PaintLayer* compositedAncestor) |
| 578 { | 578 { |
| (...skipping 1986 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2565 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2565 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2566 name = "Scrolling Block Selection Layer"; | 2566 name = "Scrolling Block Selection Layer"; |
| 2567 } else { | 2567 } else { |
| 2568 ASSERT_NOT_REACHED(); | 2568 ASSERT_NOT_REACHED(); |
| 2569 } | 2569 } |
| 2570 | 2570 |
| 2571 return name; | 2571 return name; |
| 2572 } | 2572 } |
| 2573 | 2573 |
| 2574 } // namespace blink | 2574 } // namespace blink |
| OLD | NEW |