cc: SolidColorQuad-based scrollbars for Android [M25]

cc/scrollbar_layer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scrollbar_layer.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "cc/caching_bitmap_content_layer_updater.h"
 #include "cc/layer_painter.h"
@@ skipping 52 matching lines @@
 {
     return m_scrollbar->orientation();
 }
 
 int ScrollbarLayer::maxTextureSize() {
     DCHECK(layerTreeHost());
     return layerTreeHost()->rendererCapabilities().maxTextureSize;
 }
 
 float ScrollbarLayer::clampScaleToMaxTextureSize(float scale) {
+    if (layerTreeHost()->settings().solidColorScrollbars)
+        return scale;
+
     // If the scaled contentBounds() is bigger than the max texture size of the
     // device, we need to clamp it by rescaling, since contentBounds() is used
     // below to set the texture size.
     gfx::Size scaledBounds = computeContentBoundsForScale(scale, scale);
     if (scaledBounds.width() > maxTextureSize() || scaledBounds.height() > maxTextureSize()) {
          if (scaledBounds.width() > scaledBounds.height())
              return (maxTextureSize() - 1) / static_cast<float>(bounds().width());
          else
              return (maxTextureSize() - 1) / static_cast<float>(bounds().height());
    }
@@ skipping 139 matching lines @@
         m_backTrack.reset();
         m_thumbUpdater = NULL;
         m_thumb.reset();
     }
 
     ContentsScalingLayer::setLayerTreeHost(host);
 }
 
 void ScrollbarLayer::createUpdaterIfNeeded()
 {
+    if (layerTreeHost()->settings().solidColorScrollbars)
+        return;
+
     m_textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
 
     if (!m_backTrackUpdater)
         m_backTrackUpdater = CachingBitmapContentLayerUpdater::Create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter.get(), m_geometry.get(), WebKit::WebScrollbar::BackTrackPart).PassAs<LayerPainter>());
     if (!m_backTrack)
         m_backTrack = m_backTrackUpdater->createResource(layerTreeHost()->contentsTextureManager());
 
     // Only create two-part track if we think the two parts could be different in appearance.
     if (m_scrollbar->isCustomScrollbar()) {
         if (!m_foreTrackUpdater)
             m_foreTrackUpdater = CachingBitmapContentLayerUpdater::Create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter.get(), m_geometry.get(), WebKit::WebScrollbar::ForwardTrackPart).PassAs<LayerPainter>());
         if (!m_foreTrack)
             m_foreTrack = m_foreTrackUpdater->createResource(layerTreeHost()->contentsTextureManager());
     }
 
     if (!m_thumbUpdater)
         m_thumbUpdater = CachingBitmapContentLayerUpdater::Create(ScrollbarThumbPainter::create(m_scrollbar.get(), m_painter.get(), m_geometry.get()).PassAs<LayerPainter>());
     if (!m_thumb)
         m_thumb = m_thumbUpdater->createResource(layerTreeHost()->contentsTextureManager());
 }
 
 void ScrollbarLayer::updatePart(CachingBitmapContentLayerUpdater* painter, LayerUpdater::Resource* resource, const gfx::Rect& rect, ResourceUpdateQueue& queue, RenderingStats* stats)
 {
+    if (layerTreeHost()->settings().solidColorScrollbars)
+        return;
+
     // Skip painting and uploading if there are no invalidations and
     // we already have valid texture data.
     if (resource->texture()->haveBackingTexture() &&
         resource->texture()->size() == rect.size() &&
         !isDirty())
         return;
 
     // We should always have enough memory for UI.
     DCHECK(resource->texture()->canAcquireBackingTexture());
     if (!resource->texture()->canAcquireBackingTexture())
@@ skipping 18 matching lines @@
 gfx::Rect ScrollbarLayer::scrollbarLayerRectToContentRect(const gfx::Rect& layerRect) const
 {
     // Don't intersect with the bounds as in layerRectToContentRect() because
     // layerRect here might be in coordinates of the containing layer.
     gfx::RectF contentRect = gfx::ScaleRect(layerRect, contentsScaleX(), contentsScaleY());
     return gfx::ToEnclosingRect(contentRect);
 }
 
 void ScrollbarLayer::setTexturePriorities(const PriorityCalculator&)
 {
+    if (layerTreeHost()->settings().solidColorScrollbars)
+        return;
+
     if (contentBounds().IsEmpty())
         return;
     DCHECK_LE(contentBounds().width(), maxTextureSize());
     DCHECK_LE(contentBounds().height(), maxTextureSize());
 
     createUpdaterIfNeeded();
 
     bool drawsToRoot = !renderTarget()->parent();
     if (m_backTrack) {
         m_backTrack->texture()->setDimensions(contentBounds(), m_textureFormat);
@@ skipping 31 matching lines @@
     gfx::Rect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
     m_thumbSize = thumbRect.size();
     gfx::Rect originThumbRect = scrollbarLayerRectToContentRect(gfx::Rect(thumbRect.size()));
     if (!originThumbRect.IsEmpty())
         updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
 
     m_dirtyRect = gfx::RectF();
 }
 
 }  // namespace cc