Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 270633003: Remove RenderLayerCompositor::m_viewportConstrainedLayers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 updateCompositingReasons(); 858 updateCompositingReasons();
859 } 859 }
860 860
861 void CompositedLayerMapping::registerScrollingLayers() 861 void CompositedLayerMapping::registerScrollingLayers()
862 { 862 {
863 // Register fixed position layers and their containers with the scrolling co ordinator. 863 // Register fixed position layers and their containers with the scrolling co ordinator.
864 ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m _owningLayer); 864 ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m _owningLayer);
865 if (!scrollingCoordinator) 865 if (!scrollingCoordinator)
866 return; 866 return;
867 867
868 compositor()->updateViewportConstraintStatus(&m_owningLayer);
869
870 scrollingCoordinator->updateLayerPositionConstraint(&m_owningLayer); 868 scrollingCoordinator->updateLayerPositionConstraint(&m_owningLayer);
871 869
872 // Page scale is applied as a transform on the root render view layer. Becau se the scroll 870 // Page scale is applied as a transform on the root render view layer. Becau se the scroll
873 // layer is further up in the hierarchy, we need to avoid marking the root r ender view 871 // layer is further up in the hierarchy, we need to avoid marking the root r ender view
874 // layer as a container. 872 // layer as a container.
875 bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLaye r(); 873 bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLaye r();
876 // FIXME: we should make certain that childForSuperLayers will never be the m_squashingContainmentLayer here 874 // FIXME: we should make certain that childForSuperLayers will never be the m_squashingContainmentLayer here
877 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(localRootFor OwningLayer(), isContainer); 875 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(localRootFor OwningLayer(), isContainer);
878 } 876 }
879 877
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
2113 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2111 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2114 name = "Scrolling Contents Layer"; 2112 name = "Scrolling Contents Layer";
2115 } else { 2113 } else {
2116 ASSERT_NOT_REACHED(); 2114 ASSERT_NOT_REACHED();
2117 } 2115 }
2118 2116
2119 return name; 2117 return name;
2120 } 2118 }
2121 2119
2122 } // namespace WebCore 2120 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698