| 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 | 519 |
| 520 // Scroll position = scroll minimum + scroll offset. Adjust the layer's | 520 // Scroll position = scroll minimum + scroll offset. Adjust the layer's |
| 521 // position to handle whatever the scroll coordinator isn't handling. | 521 // position to handle whatever the scroll coordinator isn't handling. |
| 522 // The minimum scroll position is non-zero for RTL pages with overflow. | 522 // The minimum scroll position is non-zero for RTL pages with overflow. |
| 523 if (scrollingCoordinatorHandlesOffset) | 523 if (scrollingCoordinatorHandlesOffset) |
| 524 m_scrollLayer->setPosition(-frameView->minimumScrollPosition()); | 524 m_scrollLayer->setPosition(-frameView->minimumScrollPosition()); |
| 525 else | 525 else |
| 526 m_scrollLayer->setPosition(-scrollPosition); | 526 m_scrollLayer->setPosition(-scrollPosition); |
| 527 | 527 |
| 528 | 528 |
| 529 blink::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedR
ootBackground", | 529 Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedRootBack
ground", |
| 530 ScrolledMainFrameBucket, | 530 ScrolledMainFrameBucket, |
| 531 AcceleratedFixedRootBackgroundHistogramMax); | 531 AcceleratedFixedRootBackgroundHistogramMax); |
| 532 } | 532 } |
| 533 | 533 |
| 534 void RenderLayerCompositor::frameViewScrollbarsExistenceDidChange() | 534 void RenderLayerCompositor::frameViewScrollbarsExistenceDidChange() |
| 535 { | 535 { |
| 536 if (m_containerLayer) | 536 if (m_containerLayer) |
| 537 updateOverflowControlsLayers(); | 537 updateOverflowControlsLayers(); |
| 538 } | 538 } |
| 539 | 539 |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 } else if (graphicsLayer == m_scrollLayer.get()) { | 1166 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1167 name = "LocalFrame Scrolling Layer"; | 1167 name = "LocalFrame Scrolling Layer"; |
| 1168 } else { | 1168 } else { |
| 1169 ASSERT_NOT_REACHED(); | 1169 ASSERT_NOT_REACHED(); |
| 1170 } | 1170 } |
| 1171 | 1171 |
| 1172 return name; | 1172 return name; |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 } // namespace blink | 1175 } // namespace blink |
| OLD | NEW |