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 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2098 | 2098 |
2099 IntSize offset = paintInfo.offsetFromLayoutObject; | 2099 IntSize offset = paintInfo.offsetFromLayoutObject; |
2100 AffineTransform translation; | 2100 AffineTransform translation; |
2101 translation.translate(-offset.width(), -offset.height()); | 2101 translation.translate(-offset.width(), -offset.height()); |
2102 TransformRecorder transformRecorder(*context, *this, translation); | 2102 TransformRecorder transformRecorder(*context, *this, translation); |
2103 | 2103 |
2104 // The dirtyRect is in the coords of the painting root. | 2104 // The dirtyRect is in the coords of the painting root. |
2105 IntRect dirtyRect(clip); | 2105 IntRect dirtyRect(clip); |
2106 dirtyRect.move(offset); | 2106 dirtyRect.move(offset); |
2107 | 2107 |
2108 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents)) { | 2108 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents) && !RuntimeEnabl edFeatures::slimmingPaintV2Enabled()) { |
chrishtr
2015/09/17 00:53:46
Why this change?
trchen
2015/09/17 01:56:04
In rootLayerScrolls-mode the composited bounds wil
chrishtr
2015/09/17 18:07:53
What does this have to do with this CL?
Furtherm
| |
2109 LayoutRect bounds = paintInfo.compositedBounds; | 2109 LayoutRect bounds = paintInfo.compositedBounds; |
2110 bounds.move(paintInfo.paintLayer->subpixelAccumulation()); | 2110 bounds.move(paintInfo.paintLayer->subpixelAccumulation()); |
2111 dirtyRect.intersect(pixelSnappedIntRect(bounds)); | 2111 dirtyRect.intersect(pixelSnappedIntRect(bounds)); |
2112 } else { | 2112 } else { |
2113 dirtyRect.move(roundedIntSize(paintInfo.paintLayer->subpixelAccumulation ())); | 2113 dirtyRect.move(roundedIntSize(paintInfo.paintLayer->subpixelAccumulation ())); |
2114 } | 2114 } |
2115 | 2115 |
2116 #if ENABLE(ASSERT) | 2116 #if ENABLE(ASSERT) |
2117 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut(); | 2117 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut(); |
2118 #endif | 2118 #endif |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2384 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2384 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
2385 name = "Scrolling Block Selection Layer"; | 2385 name = "Scrolling Block Selection Layer"; |
2386 } else { | 2386 } else { |
2387 ASSERT_NOT_REACHED(); | 2387 ASSERT_NOT_REACHED(); |
2388 } | 2388 } |
2389 | 2389 |
2390 return name; | 2390 return name; |
2391 } | 2391 } |
2392 | 2392 |
2393 } // namespace blink | 2393 } // namespace blink |
OLD | NEW |