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 1908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1919 if (m_layerForHorizontalScrollbar && needsHorizontalScrollbarLayer && | 1919 if (m_layerForHorizontalScrollbar && needsHorizontalScrollbarLayer && |
1920 scrollableArea->shouldRebuildHorizontalScrollbarLayer()) | 1920 scrollableArea->shouldRebuildHorizontalScrollbarLayer()) |
1921 toggleScrollbarLayerIfNeeded( | 1921 toggleScrollbarLayerIfNeeded( |
1922 m_layerForHorizontalScrollbar, false, | 1922 m_layerForHorizontalScrollbar, false, |
1923 CompositingReasonLayerForHorizontalScrollbar); | 1923 CompositingReasonLayerForHorizontalScrollbar); |
1924 if (m_layerForVerticalScrollbar && needsVerticalScrollbarLayer && | 1924 if (m_layerForVerticalScrollbar && needsVerticalScrollbarLayer && |
1925 scrollableArea->shouldRebuildVerticalScrollbarLayer()) | 1925 scrollableArea->shouldRebuildVerticalScrollbarLayer()) |
1926 toggleScrollbarLayerIfNeeded(m_layerForVerticalScrollbar, false, | 1926 toggleScrollbarLayerIfNeeded(m_layerForVerticalScrollbar, false, |
1927 CompositingReasonLayerForVerticalScrollbar); | 1927 CompositingReasonLayerForVerticalScrollbar); |
1928 scrollableArea->resetRebuildScrollbarLayerFlags(); | 1928 scrollableArea->resetRebuildScrollbarLayerFlags(); |
| 1929 |
| 1930 if (m_scrollingContentsLayer && |
| 1931 scrollableArea->needsShowScrollbarLayers()) { |
| 1932 m_scrollingContentsLayer->platformLayer()->showScrollbars(); |
| 1933 scrollableArea->didShowScrollbarLayers(); |
| 1934 } |
1929 } | 1935 } |
1930 | 1936 |
1931 // If the subtree is invisible, we don't actually need scrollbar layers. | 1937 // If the subtree is invisible, we don't actually need scrollbar layers. |
1932 // Only do this check if at least one of the bits is currently true. | 1938 // Only do this check if at least one of the bits is currently true. |
1933 // This is important because this method is called during the destructor | 1939 // This is important because this method is called during the destructor |
1934 // of CompositedLayerMapping, which may happen during style recalc, | 1940 // of CompositedLayerMapping, which may happen during style recalc, |
1935 // and therefore visible content status may be invalid. | 1941 // and therefore visible content status may be invalid. |
1936 if (needsHorizontalScrollbarLayer || needsVerticalScrollbarLayer || | 1942 if (needsHorizontalScrollbarLayer || needsVerticalScrollbarLayer || |
1937 needsScrollCornerLayer) { | 1943 needsScrollCornerLayer) { |
1938 bool invisible = m_owningLayer.subtreeIsInvisible(); | 1944 bool invisible = m_owningLayer.subtreeIsInvisible(); |
(...skipping 1594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3533 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3539 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
3534 name = "Decoration Layer"; | 3540 name = "Decoration Layer"; |
3535 } else { | 3541 } else { |
3536 NOTREACHED(); | 3542 NOTREACHED(); |
3537 } | 3543 } |
3538 | 3544 |
3539 return name; | 3545 return name; |
3540 } | 3546 } |
3541 | 3547 |
3542 } // namespace blink | 3548 } // namespace blink |
OLD | NEW |