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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2244873002: Fix PaintPropertyTreeBuilder for root layer scrolling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@rls-enable
Patch Set: Disabled exact geometry checks when RLS is enabled Created 4 years, 4 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
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 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 bottomLayer = layer; 1129 bottomLayer = layer;
1130 } 1130 }
1131 }; 1131 };
1132 1132
1133 updateBottomLayer(m_childTransformLayer.get()); 1133 updateBottomLayer(m_childTransformLayer.get());
1134 updateBottomLayer(m_childContainmentLayer.get()); 1134 updateBottomLayer(m_childContainmentLayer.get());
1135 updateBottomLayer(m_scrollingLayer.get()); 1135 updateBottomLayer(m_scrollingLayer.get());
1136 1136
1137 // Now constructing the subtree for the overflow controls. 1137 // Now constructing the subtree for the overflow controls.
1138 bottomLayer = m_graphicsLayer.get(); 1138 bottomLayer = m_graphicsLayer.get();
1139 if (m_isMainFrameLayoutViewLayer) 1139 if (m_isMainFrameLayoutViewLayer && !RuntimeEnabledFeatures::slimmingPaintV2 Enabled())
skobes 2016/08/17 01:38:24 This still makes me nervous but if the paint team
pdr. 2016/08/17 04:30:41 I agree but we just aren't far enough along to blo
trchen 2016/08/17 05:57:47 I think this line is totally fine. The long term g
1140 bottomLayer = layoutObject()->frame()->page()->frameHost().visualViewpor t().containerLayer(); 1140 bottomLayer = layoutObject()->frame()->page()->frameHost().visualViewpor t().containerLayer();
1141 updateBottomLayer(m_overflowControlsAncestorClippingLayer.get()); 1141 updateBottomLayer(m_overflowControlsAncestorClippingLayer.get());
1142 updateBottomLayer(m_overflowControlsHostLayer.get()); 1142 updateBottomLayer(m_overflowControlsHostLayer.get());
1143 if (m_layerForHorizontalScrollbar) 1143 if (m_layerForHorizontalScrollbar)
1144 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get( )); 1144 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get( ));
1145 if (m_layerForVerticalScrollbar) 1145 if (m_layerForVerticalScrollbar)
1146 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get()) ; 1146 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get()) ;
1147 if (m_layerForScrollCorner) 1147 if (m_layerForScrollCorner)
1148 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get()); 1148 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get());
1149 1149
(...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after
2691 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2691 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2692 name = "Scrolling Contents Layer"; 2692 name = "Scrolling Contents Layer";
2693 } else { 2693 } else {
2694 ASSERT_NOT_REACHED(); 2694 ASSERT_NOT_REACHED();
2695 } 2695 }
2696 2696
2697 return name; 2697 return name;
2698 } 2698 }
2699 2699
2700 } // namespace blink 2700 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698