Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2770293003: Feed ScrollableArea::showOverlayScrollbars into ScrollbarAnimationController. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1918 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 if (m_layerForHorizontalScrollbar && needsHorizontalScrollbarLayer && 1929 if (m_layerForHorizontalScrollbar && needsHorizontalScrollbarLayer &&
1930 scrollableArea->shouldRebuildHorizontalScrollbarLayer()) 1930 scrollableArea->shouldRebuildHorizontalScrollbarLayer())
1931 toggleScrollbarLayerIfNeeded( 1931 toggleScrollbarLayerIfNeeded(
1932 m_layerForHorizontalScrollbar, false, 1932 m_layerForHorizontalScrollbar, false,
1933 CompositingReasonLayerForHorizontalScrollbar); 1933 CompositingReasonLayerForHorizontalScrollbar);
1934 if (m_layerForVerticalScrollbar && needsVerticalScrollbarLayer && 1934 if (m_layerForVerticalScrollbar && needsVerticalScrollbarLayer &&
1935 scrollableArea->shouldRebuildVerticalScrollbarLayer()) 1935 scrollableArea->shouldRebuildVerticalScrollbarLayer())
1936 toggleScrollbarLayerIfNeeded(m_layerForVerticalScrollbar, false, 1936 toggleScrollbarLayerIfNeeded(m_layerForVerticalScrollbar, false,
1937 CompositingReasonLayerForVerticalScrollbar); 1937 CompositingReasonLayerForVerticalScrollbar);
1938 scrollableArea->resetRebuildScrollbarLayerFlags(); 1938 scrollableArea->resetRebuildScrollbarLayerFlags();
1939
1940 if (m_scrollingContentsLayer &&
1941 scrollableArea->needsShowScrollbarLayers()) {
1942 m_scrollingContentsLayer->platformLayer()->showScrollbars();
1943 scrollableArea->didShowScrollbarLayers();
1944 }
1939 } 1945 }
1940 1946
1941 // If the subtree is invisible, we don't actually need scrollbar layers. 1947 // If the subtree is invisible, we don't actually need scrollbar layers.
1942 // Only do this check if at least one of the bits is currently true. 1948 // Only do this check if at least one of the bits is currently true.
1943 // This is important because this method is called during the destructor 1949 // This is important because this method is called during the destructor
1944 // of CompositedLayerMapping, which may happen during style recalc, 1950 // of CompositedLayerMapping, which may happen during style recalc,
1945 // and therefore visible content status may be invalid. 1951 // and therefore visible content status may be invalid.
1946 if (needsHorizontalScrollbarLayer || needsVerticalScrollbarLayer || 1952 if (needsHorizontalScrollbarLayer || needsVerticalScrollbarLayer ||
1947 needsScrollCornerLayer) { 1953 needsScrollCornerLayer) {
1948 bool invisible = m_owningLayer.subtreeIsInvisible(); 1954 bool invisible = m_owningLayer.subtreeIsInvisible();
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3542 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { 3548 } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
3543 name = "Decoration Layer"; 3549 name = "Decoration Layer";
3544 } else { 3550 } else {
3545 NOTREACHED(); 3551 NOTREACHED();
3546 } 3552 }
3547 3553
3548 return name; 3554 return name;
3549 } 3555 }
3550 3556
3551 } // namespace blink 3557 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698