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 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1504 ApplyToGraphicsLayers(this, functor, mode); | 1504 ApplyToGraphicsLayers(this, functor, mode); |
1505 | 1505 |
1506 // Note, if we apply perspective, we have to set should flatten differently | 1506 // Note, if we apply perspective, we have to set should flatten differently |
1507 // so that the transform propagates to child layers correctly. | 1507 // so that the transform propagates to child layers correctly. |
1508 if (hasChildTransformLayer()) { | 1508 if (hasChildTransformLayer()) { |
1509 ApplyToGraphicsLayers(this, [](GraphicsLayer* layer) { | 1509 ApplyToGraphicsLayers(this, [](GraphicsLayer* layer) { |
1510 layer->setShouldFlattenTransform(false); | 1510 layer->setShouldFlattenTransform(false); |
1511 }, ApplyToChildContainingLayers); | 1511 }, ApplyToChildContainingLayers); |
1512 } | 1512 } |
1513 | 1513 |
1514 // Regardless, mark the scrolling contents layer and scrolling block | 1514 // Regardless, mark the graphics layer, scrolling layer and scrolling block |
1515 // selection layer (if they exist) as not flattening. Having them flatten | 1515 // selection layer (if they exist) as not flattening. Having them flatten |
1516 // causes unclipped render surfaces which cause bugs. | 1516 // causes unclipped render surfaces which cause bugs. |
1517 // http://crbug.com/521768 | 1517 // http://crbug.com/521768 |
1518 if (hasScrollingLayer()) { | 1518 if (hasScrollingLayer()) { |
1519 m_scrollingContentsLayer->setShouldFlattenTransform(false); | 1519 m_graphicsLayer->setShouldFlattenTransform(false); |
| 1520 m_scrollingLayer->setShouldFlattenTransform(false); |
1520 if (m_scrollingBlockSelectionLayer) | 1521 if (m_scrollingBlockSelectionLayer) |
1521 m_scrollingBlockSelectionLayer->setShouldFlattenTransform(false); | 1522 m_scrollingBlockSelectionLayer->setShouldFlattenTransform(false); |
1522 } | 1523 } |
1523 } | 1524 } |
1524 | 1525 |
1525 void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties() | 1526 void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties() |
1526 { | 1527 { |
1527 if (!RuntimeEnabledFeatures::compositorWorkerEnabled()) | 1528 if (!RuntimeEnabledFeatures::compositorWorkerEnabled()) |
1528 return; | 1529 return; |
1529 | 1530 |
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2601 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2602 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
2602 name = "Scrolling Block Selection Layer"; | 2603 name = "Scrolling Block Selection Layer"; |
2603 } else { | 2604 } else { |
2604 ASSERT_NOT_REACHED(); | 2605 ASSERT_NOT_REACHED(); |
2605 } | 2606 } |
2606 | 2607 |
2607 return name; | 2608 return name; |
2608 } | 2609 } |
2609 | 2610 |
2610 } // namespace blink | 2611 } // namespace blink |
OLD | NEW |