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 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
894 | 894 |
895 bool RenderLayerCompositor::requiresScrollCornerLayer() const | 895 bool RenderLayerCompositor::requiresScrollCornerLayer() const |
896 { | 896 { |
897 FrameView* view = m_renderView.frameView(); | 897 FrameView* view = m_renderView.frameView(); |
898 return shouldCompositeOverflowControls(view) && view->isScrollCornerVisible(
); | 898 return shouldCompositeOverflowControls(view) && view->isScrollCornerVisible(
); |
899 } | 899 } |
900 | 900 |
901 void RenderLayerCompositor::updateOverflowControlsLayers() | 901 void RenderLayerCompositor::updateOverflowControlsLayers() |
902 { | 902 { |
903 #if USE(RUBBER_BANDING) | 903 #if USE(RUBBER_BANDING) |
904 if (m_renderView.frame()->isLocalRoot()) { | 904 if (m_renderView.frame()->isLocalRoot() && !m_renderView.document().settings
()->rubberBandingOnCompositorThread()) { |
905 if (!m_layerForOverhangShadow) { | 905 if (!m_layerForOverhangShadow) { |
906 m_layerForOverhangShadow = GraphicsLayer::create(graphicsLayerFactor
y(), this); | 906 m_layerForOverhangShadow = GraphicsLayer::create(graphicsLayerFactor
y(), this); |
907 OverscrollTheme::theme()->setUpOverhangShadowLayer(m_layerForOverhan
gShadow.get()); | 907 OverscrollTheme::theme()->setUpOverhangShadowLayer(m_layerForOverhan
gShadow.get()); |
908 OverscrollTheme::theme()->updateOverhangShadowLayer(m_layerForOverha
ngShadow.get(), m_rootContentLayer.get()); | 908 OverscrollTheme::theme()->updateOverhangShadowLayer(m_layerForOverha
ngShadow.get(), m_rootContentLayer.get()); |
909 m_scrollLayer->addChild(m_layerForOverhangShadow.get()); | 909 m_scrollLayer->addChild(m_layerForOverhangShadow.get()); |
910 } | 910 } |
911 } else { | 911 } else { |
912 ASSERT(!m_layerForOverhangShadow); | 912 ASSERT(!m_layerForOverhangShadow); |
913 } | 913 } |
914 #endif | 914 #endif |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1188 } else if (graphicsLayer == m_scrollLayer.get()) { | 1188 } else if (graphicsLayer == m_scrollLayer.get()) { |
1189 name = "LocalFrame Scrolling Layer"; | 1189 name = "LocalFrame Scrolling Layer"; |
1190 } else { | 1190 } else { |
1191 ASSERT_NOT_REACHED(); | 1191 ASSERT_NOT_REACHED(); |
1192 } | 1192 } |
1193 | 1193 |
1194 return name; | 1194 return name; |
1195 } | 1195 } |
1196 | 1196 |
1197 } // namespace blink | 1197 } // namespace blink |
OLD | NEW |