| 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 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 m_backgroundLayer->setPosition(FloatPoint()); | 914 m_backgroundLayer->setPosition(FloatPoint()); |
| 915 if (backgroundSize != m_backgroundLayer->size()) { | 915 if (backgroundSize != m_backgroundLayer->size()) { |
| 916 m_backgroundLayer->setSize(backgroundSize); | 916 m_backgroundLayer->setSize(backgroundSize); |
| 917 m_backgroundLayer->setNeedsDisplay(); | 917 m_backgroundLayer->setNeedsDisplay(); |
| 918 } | 918 } |
| 919 m_backgroundLayer->setOffsetFromRenderer(m_graphicsLayer->offsetFromRenderer
()); | 919 m_backgroundLayer->setOffsetFromRenderer(m_graphicsLayer->offsetFromRenderer
()); |
| 920 } | 920 } |
| 921 | 921 |
| 922 void CompositedLayerMapping::registerScrollingLayers() | 922 void CompositedLayerMapping::registerScrollingLayers() |
| 923 { | 923 { |
| 924 // FIXME(sky): Remove this whole function. I think this doesn't do anything
now that we don't support position:fixed. |
| 925 |
| 924 // Register fixed position layers and their containers with the scrolling co
ordinator. | 926 // Register fixed position layers and their containers with the scrolling co
ordinator. |
| 925 ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m
_owningLayer); | 927 ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m
_owningLayer); |
| 926 if (!scrollingCoordinator) | 928 if (!scrollingCoordinator) |
| 927 return; | 929 return; |
| 928 | 930 |
| 929 scrollingCoordinator->updateLayerPositionConstraint(&m_owningLayer); | |
| 930 | |
| 931 // Page scale is applied as a transform on the root render view layer. Becau
se the scroll | 931 // Page scale is applied as a transform on the root render view layer. Becau
se the scroll |
| 932 // layer is further up in the hierarchy, we need to avoid marking the root r
ender view | 932 // layer is further up in the hierarchy, we need to avoid marking the root r
ender view |
| 933 // layer as a container. | 933 // layer as a container. |
| 934 bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLaye
r(); | 934 bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLaye
r(); |
| 935 // FIXME: we should make certain that childForSuperLayers will never be the
m_squashingContainmentLayer here | 935 // FIXME: we should make certain that childForSuperLayers will never be the
m_squashingContainmentLayer here |
| 936 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSupe
rlayers(), isContainer); | 936 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSupe
rlayers(), isContainer); |
| 937 } | 937 } |
| 938 | 938 |
| 939 void CompositedLayerMapping::updateInternalHierarchy() | 939 void CompositedLayerMapping::updateInternalHierarchy() |
| 940 { | 940 { |
| (...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2244 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2245 name = "Scrolling Block Selection Layer"; | 2245 name = "Scrolling Block Selection Layer"; |
| 2246 } else { | 2246 } else { |
| 2247 ASSERT_NOT_REACHED(); | 2247 ASSERT_NOT_REACHED(); |
| 2248 } | 2248 } |
| 2249 | 2249 |
| 2250 return name; | 2250 return name; |
| 2251 } | 2251 } |
| 2252 | 2252 |
| 2253 } // namespace blink | 2253 } // namespace blink |
| OLD | NEW |