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 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1034 | 1034 |
1035 void RenderLayerBacking::positionOverflowControlsLayers(const IntSize& offsetFro
mRoot) | 1035 void RenderLayerBacking::positionOverflowControlsLayers(const IntSize& offsetFro
mRoot) |
1036 { | 1036 { |
1037 IntSize offsetFromRenderer = m_graphicsLayer->offsetFromRenderer(); | 1037 IntSize offsetFromRenderer = m_graphicsLayer->offsetFromRenderer(); |
1038 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { | 1038 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { |
1039 Scrollbar* hBar = m_owningLayer->horizontalScrollbar(); | 1039 Scrollbar* hBar = m_owningLayer->horizontalScrollbar(); |
1040 if (hBar) { | 1040 if (hBar) { |
1041 layer->setPosition(hBar->frameRect().location() - offsetFromRoot - o
ffsetFromRenderer); | 1041 layer->setPosition(hBar->frameRect().location() - offsetFromRoot - o
ffsetFromRenderer); |
1042 layer->setSize(hBar->frameRect().size()); | 1042 layer->setSize(hBar->frameRect().size()); |
1043 } | 1043 } |
| 1044 #if OS(ANDROID) |
| 1045 layer->setDrawsContent(false); |
| 1046 #else |
1044 layer->setDrawsContent(hBar); | 1047 layer->setDrawsContent(hBar); |
| 1048 #endif |
1045 } | 1049 } |
1046 | 1050 |
1047 if (GraphicsLayer* layer = layerForVerticalScrollbar()) { | 1051 if (GraphicsLayer* layer = layerForVerticalScrollbar()) { |
1048 Scrollbar* vBar = m_owningLayer->verticalScrollbar(); | 1052 Scrollbar* vBar = m_owningLayer->verticalScrollbar(); |
1049 if (vBar) { | 1053 if (vBar) { |
1050 layer->setPosition(vBar->frameRect().location() - offsetFromRoot - o
ffsetFromRenderer); | 1054 layer->setPosition(vBar->frameRect().location() - offsetFromRoot - o
ffsetFromRenderer); |
1051 layer->setSize(vBar->frameRect().size()); | 1055 layer->setSize(vBar->frameRect().size()); |
1052 } | 1056 } |
| 1057 #if OS(ANDROID) |
| 1058 layer->setDrawsContent(false); |
| 1059 #else |
1053 layer->setDrawsContent(vBar); | 1060 layer->setDrawsContent(vBar); |
| 1061 #endif |
1054 } | 1062 } |
1055 | 1063 |
1056 if (GraphicsLayer* layer = layerForScrollCorner()) { | 1064 if (GraphicsLayer* layer = layerForScrollCorner()) { |
1057 const LayoutRect& scrollCornerAndResizer = m_owningLayer->scrollCornerAn
dResizerRect(); | 1065 const LayoutRect& scrollCornerAndResizer = m_owningLayer->scrollCornerAn
dResizerRect(); |
1058 layer->setPosition(scrollCornerAndResizer.location() - offsetFromRendere
r); | 1066 layer->setPosition(scrollCornerAndResizer.location() - offsetFromRendere
r); |
1059 layer->setSize(scrollCornerAndResizer.size()); | 1067 layer->setSize(scrollCornerAndResizer.size()); |
1060 layer->setDrawsContent(!scrollCornerAndResizer.isEmpty()); | 1068 layer->setDrawsContent(!scrollCornerAndResizer.isEmpty()); |
1061 } | 1069 } |
1062 } | 1070 } |
1063 | 1071 |
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2213 info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar")
; | 2221 info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar")
; |
2214 info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar"); | 2222 info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar"); |
2215 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); | 2223 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); |
2216 info.addMember(m_scrollingLayer, "scrollingLayer"); | 2224 info.addMember(m_scrollingLayer, "scrollingLayer"); |
2217 info.addMember(m_scrollingContentsLayer, "scrollingContentsLayer"); | 2225 info.addMember(m_scrollingContentsLayer, "scrollingContentsLayer"); |
2218 } | 2226 } |
2219 | 2227 |
2220 } // namespace WebCore | 2228 } // namespace WebCore |
2221 | 2229 |
2222 #endif // USE(ACCELERATED_COMPOSITING) | 2230 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |