OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1109 overflowControlLayer->removeFromParent(); | 1109 overflowControlLayer->removeFromParent(); |
1110 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); | 1110 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); |
1111 } | 1111 } |
1112 } | 1112 } |
1113 | 1113 |
1114 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childF
orSuperlayers()); | 1114 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childF
orSuperlayers()); |
1115 } | 1115 } |
1116 | 1116 |
1117 if (!depth) { | 1117 if (!depth) { |
1118 int percentageIncreaseInPixels = static_cast<int>(pixelsAddedByPromoting
AllTransitions / pixelsWithoutPromotingAllTransitions * 100); | 1118 int percentageIncreaseInPixels = static_cast<int>(pixelsAddedByPromoting
AllTransitions / pixelsWithoutPromotingAllTransitions * 100); |
1119 WebKit::Platform::current()->histogramCustomCounts("Renderer.PixelIncrea
seFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); | 1119 blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreas
eFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); |
1120 } | 1120 } |
1121 } | 1121 } |
1122 | 1122 |
1123 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) | 1123 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) |
1124 { | 1124 { |
1125 if (m_overflowControlsHostLayer) | 1125 if (m_overflowControlsHostLayer) |
1126 m_overflowControlsHostLayer->setPosition(contentsOffset); | 1126 m_overflowControlsHostLayer->setPosition(contentsOffset); |
1127 } | 1127 } |
1128 | 1128 |
1129 void RenderLayerCompositor::frameViewDidChangeSize() | 1129 void RenderLayerCompositor::frameViewDidChangeSize() |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1162 | 1162 |
1163 // Scroll position = scroll minimum + scroll offset. Adjust the layer's | 1163 // Scroll position = scroll minimum + scroll offset. Adjust the layer's |
1164 // position to handle whatever the scroll coordinator isn't handling. | 1164 // position to handle whatever the scroll coordinator isn't handling. |
1165 // The minimum scroll position is non-zero for RTL pages with overflow. | 1165 // The minimum scroll position is non-zero for RTL pages with overflow. |
1166 if (scrollingCoordinatorHandlesOffset) | 1166 if (scrollingCoordinatorHandlesOffset) |
1167 m_scrollLayer->setPosition(-frameView->minimumScrollPosition()); | 1167 m_scrollLayer->setPosition(-frameView->minimumScrollPosition()); |
1168 else | 1168 else |
1169 m_scrollLayer->setPosition(-scrollPosition); | 1169 m_scrollLayer->setPosition(-scrollPosition); |
1170 | 1170 |
1171 | 1171 |
1172 WebKit::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixed
RootBackground", | 1172 blink::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedR
ootBackground", |
1173 ScrolledMainFrameBucket, | 1173 ScrolledMainFrameBucket, |
1174 AcceleratedFixedRootBackgroundHistogramMax); | 1174 AcceleratedFixedRootBackgroundHistogramMax); |
1175 | 1175 |
1176 if (!m_renderView->rootBackgroundIsEntirelyFixed()) | 1176 if (!m_renderView->rootBackgroundIsEntirelyFixed()) |
1177 return; | 1177 return; |
1178 | 1178 |
1179 WebKit::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixed
RootBackground", | 1179 blink::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedR
ootBackground", |
1180 !!fixedRootBackgroundLayer() | 1180 !!fixedRootBackgroundLayer() |
1181 ? ScrolledMainFrameWithAcceleratedFixedRootBackground | 1181 ? ScrolledMainFrameWithAcceleratedFixedRootBackground |
1182 : ScrolledMainFrameWithUnacceleratedFixedRootBackground, | 1182 : ScrolledMainFrameWithUnacceleratedFixedRootBackground, |
1183 AcceleratedFixedRootBackgroundHistogramMax); | 1183 AcceleratedFixedRootBackgroundHistogramMax); |
1184 } | 1184 } |
1185 | 1185 |
1186 void RenderLayerCompositor::frameViewDidLayout() | 1186 void RenderLayerCompositor::frameViewDidLayout() |
1187 { | 1187 { |
1188 } | 1188 } |
1189 | 1189 |
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2449 } else if (graphicsLayer == m_scrollLayer.get()) { | 2449 } else if (graphicsLayer == m_scrollLayer.get()) { |
2450 name = "Frame Scrolling Layer"; | 2450 name = "Frame Scrolling Layer"; |
2451 } else { | 2451 } else { |
2452 ASSERT_NOT_REACHED(); | 2452 ASSERT_NOT_REACHED(); |
2453 } | 2453 } |
2454 | 2454 |
2455 return name; | 2455 return name; |
2456 } | 2456 } |
2457 | 2457 |
2458 } // namespace WebCore | 2458 } // namespace WebCore |
OLD | NEW |