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 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1524 scrollingCoordinatorFromLayer(m_owningLayer); | 1524 scrollingCoordinatorFromLayer(m_owningLayer); |
1525 if (!scrollingCoordinator) | 1525 if (!scrollingCoordinator) |
1526 return; | 1526 return; |
1527 | 1527 |
1528 scrollingCoordinator->updateLayerPositionConstraint(&m_owningLayer); | 1528 scrollingCoordinator->updateLayerPositionConstraint(&m_owningLayer); |
1529 | 1529 |
1530 // Page scale is applied as a transform on the root layout view layer. Because | 1530 // Page scale is applied as a transform on the root layout view layer. Because |
1531 // the scroll layer is further up in the hierarchy, we need to avoid marking | 1531 // the scroll layer is further up in the hierarchy, we need to avoid marking |
1532 // the root layout view layer as a container. | 1532 // the root layout view layer as a container. |
1533 bool isContainer = | 1533 bool isContainer = |
1534 m_owningLayer.layoutObject().style()->canContainFixedPositionObjects() && | 1534 m_owningLayer.layoutObject().canContainFixedPositionObjects() && |
1535 !m_owningLayer.isRootLayer(); | 1535 !m_owningLayer.isRootLayer(); |
1536 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers( | 1536 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers( |
1537 m_graphicsLayer.get(), isContainer); | 1537 m_graphicsLayer.get(), isContainer); |
1538 } | 1538 } |
1539 | 1539 |
1540 void CompositedLayerMapping::updateInternalHierarchy() { | 1540 void CompositedLayerMapping::updateInternalHierarchy() { |
1541 // m_foregroundLayer has to be inserted in the correct order with child | 1541 // m_foregroundLayer has to be inserted in the correct order with child |
1542 // layers, so it's not inserted here. | 1542 // layers, so it's not inserted here. |
1543 if (m_ancestorClippingLayer) | 1543 if (m_ancestorClippingLayer) |
1544 m_ancestorClippingLayer->removeAllChildren(); | 1544 m_ancestorClippingLayer->removeAllChildren(); |
(...skipping 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3487 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3487 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
3488 name = "Decoration Layer"; | 3488 name = "Decoration Layer"; |
3489 } else { | 3489 } else { |
3490 ASSERT_NOT_REACHED(); | 3490 ASSERT_NOT_REACHED(); |
3491 } | 3491 } |
3492 | 3492 |
3493 return name; | 3493 return name; |
3494 } | 3494 } |
3495 | 3495 |
3496 } // namespace blink | 3496 } // namespace blink |
OLD | NEW |