Chromium Code Reviews| 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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1121 bottomLayer = layer; | 1121 bottomLayer = layer; |
| 1122 } | 1122 } |
| 1123 }; | 1123 }; |
| 1124 | 1124 |
| 1125 updateBottomLayer(m_childTransformLayer.get()); | 1125 updateBottomLayer(m_childTransformLayer.get()); |
| 1126 updateBottomLayer(m_childContainmentLayer.get()); | 1126 updateBottomLayer(m_childContainmentLayer.get()); |
| 1127 updateBottomLayer(m_scrollingLayer.get()); | 1127 updateBottomLayer(m_scrollingLayer.get()); |
| 1128 | 1128 |
| 1129 // Now constructing the subtree for the overflow controls. | 1129 // Now constructing the subtree for the overflow controls. |
| 1130 bottomLayer = m_graphicsLayer.get(); | 1130 bottomLayer = m_graphicsLayer.get(); |
| 1131 if (m_isMainFrameLayoutViewLayer) | 1131 if (m_isMainFrameLayoutViewLayer && !RuntimeEnabledFeatures::slimmingPaintV2 Enabled()) |
|
skobes
2016/08/12 22:26:46
The purpose of this check is to pull the scrollbar
szager1
2016/08/12 22:44:31
As I understand it -- and this was all explained t
pdr.
2016/08/13 02:25:37
We do want to maintain the pinch/zoom behavior, bu
| |
| 1132 bottomLayer = layoutObject()->frame()->page()->frameHost().visualViewpor t().containerLayer(); | 1132 bottomLayer = layoutObject()->frame()->page()->frameHost().visualViewpor t().containerLayer(); |
| 1133 updateBottomLayer(m_overflowControlsAncestorClippingLayer.get()); | 1133 updateBottomLayer(m_overflowControlsAncestorClippingLayer.get()); |
| 1134 updateBottomLayer(m_overflowControlsHostLayer.get()); | 1134 updateBottomLayer(m_overflowControlsHostLayer.get()); |
| 1135 if (m_layerForHorizontalScrollbar) | 1135 if (m_layerForHorizontalScrollbar) |
| 1136 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get( )); | 1136 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get( )); |
| 1137 if (m_layerForVerticalScrollbar) | 1137 if (m_layerForVerticalScrollbar) |
| 1138 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get()) ; | 1138 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get()) ; |
| 1139 if (m_layerForScrollCorner) | 1139 if (m_layerForScrollCorner) |
| 1140 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get()); | 1140 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get()); |
| 1141 | 1141 |
| (...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2660 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2660 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2661 name = "Scrolling Contents Layer"; | 2661 name = "Scrolling Contents Layer"; |
| 2662 } else { | 2662 } else { |
| 2663 ASSERT_NOT_REACHED(); | 2663 ASSERT_NOT_REACHED(); |
| 2664 } | 2664 } |
| 2665 | 2665 |
| 2666 return name; | 2666 return name; |
| 2667 } | 2667 } |
| 2668 | 2668 |
| 2669 } // namespace blink | 2669 } // namespace blink |
| OLD | NEW |