Revert "Use typedef to make scrollbar texture upload optimization cros-specific."

This reverts commit 7f92f2a1a0dacfbeb1553c5bdae190df1b10e0a9.

The commit we're reverting was required to merge the scrollbar-upload fix into
M23 while making it CrOS specific. Now that is complete, we want the optimization
to be available on all platforms again.

BUG=152286


Review URL: https://chromiumcodereview.appspot.com/11090058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161251 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 24 deletions

diff --git a/cc/ScrollbarLayerChromium.cpp b/cc/ScrollbarLayerChromium.cpp
index 5cafad2..745fd34 100644
--- a/cc/ScrollbarLayerChromium.cpp
+++ b/cc/ScrollbarLayerChromium.cpp
@@ -193,25 +193,25 @@ void ScrollbarLayerChromium::createTextureUpdaterIfNeeded()
     m_textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
 
     if (!m_backTrackUpdater)
-        m_backTrackUpdater = ScrollLayerTextureUpdater::create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::BackTrackPart));
+        m_backTrackUpdater = CachingBitmapCanvasLayerTextureUpdater::Create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::BackTrackPart));
     if (!m_backTrack)
         m_backTrack = m_backTrackUpdater->createTexture(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 = ScrollLayerTextureUpdater::create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::ForwardTrackPart));
+            m_foreTrackUpdater = CachingBitmapCanvasLayerTextureUpdater::Create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::ForwardTrackPart));
         if (!m_foreTrack)
             m_foreTrack = m_foreTrackUpdater->createTexture(layerTreeHost()->contentsTextureManager());
     }
 
     if (!m_thumbUpdater)
-        m_thumbUpdater = ScrollLayerTextureUpdater::create(ScrollbarThumbPainter::create(m_scrollbar.get(), m_painter, m_geometry.get()));
+        m_thumbUpdater = CachingBitmapCanvasLayerTextureUpdater::Create(ScrollbarThumbPainter::create(m_scrollbar.get(), m_painter, m_geometry.get()));
     if (!m_thumb)
         m_thumb = m_thumbUpdater->createTexture(layerTreeHost()->contentsTextureManager());
 }
 
-void ScrollbarLayerChromium::updatePart(ScrollLayerTextureUpdater* painter, LayerTextureUpdater::Texture* texture, const IntRect& rect, CCTextureUpdateQueue& queue, CCRenderingStats& stats)
+void ScrollbarLayerChromium::updatePart(CachingBitmapCanvasLayerTextureUpdater* painter, LayerTextureUpdater::Texture* texture, const IntRect& rect, CCTextureUpdateQueue& queue, CCRenderingStats& stats)
 {
     // Skip painting and uploading if there are no invalidations and
     // we already have valid texture data.
@@ -230,12 +230,10 @@ void ScrollbarLayerChromium::updatePart(ScrollLayerTextureUpdater* painter, Laye
     float heightScale = static_cast<float>(contentBounds().height()) / bounds().height();
     IntRect paintedOpaqueRect;
     painter->prepareToUpdate(rect, rect.size(), widthScale, heightScale, paintedOpaqueRect, stats);
-#if defined(OS_CHROMEOS)
     if (!painter->pixelsDidChange() && texture->texture()->haveBackingTexture()) {
         TRACE_EVENT_INSTANT0("cc","ScrollbarLayerChromium::updatePart no texture upload needed");
         return;
     }
-#endif
 
     texture->prepareRect(rect, stats);
 
diff --git a/cc/ScrollbarLayerChromium.h b/cc/ScrollbarLayerChromium.h
index e34c2c22..38433ac 100644
--- a/cc/ScrollbarLayerChromium.h
+++ b/cc/ScrollbarLayerChromium.h
@@ -9,11 +9,7 @@
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "LayerChromium.h"
-#if defined(OS_CHROMEOS)
 #include "caching_bitmap_canvas_layer_texture_updater.h"
-#else
-#include "BitmapCanvasLayerTextureUpdater.h"
-#endif
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
 #include <public/WebScrollbarThemePainter.h>
@@ -24,12 +20,6 @@ class Scrollbar;
 class ScrollbarThemeComposite;
 class CCTextureUpdateQueue;
 
-#if defined(OS_CHROMEOS)
-typedef CachingBitmapCanvasLayerTextureUpdater ScrollLayerTextureUpdater;
-#else
-typedef BitmapCanvasLayerTextureUpdater ScrollLayerTextureUpdater;
-#endif
-
 class ScrollbarLayerChromium : public LayerChromium {
 public:
     virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
@@ -54,7 +44,7 @@ protected:
     virtual ~ScrollbarLayerChromium();
 
 private:
-    void updatePart(ScrollLayerTextureUpdater*, LayerTextureUpdater::Texture*, const IntRect&, CCTextureUpdateQueue&, CCRenderingStats&);
+    void updatePart(CachingBitmapCanvasLayerTextureUpdater*, LayerTextureUpdater::Texture*, const IntRect&, CCTextureUpdateQueue&, CCRenderingStats&);
     void createTextureUpdaterIfNeeded();
 
     OwnPtr<WebKit::WebScrollbar> m_scrollbar;
@@ -64,9 +54,9 @@ private:
 
     GC3Denum m_textureFormat;
 
-    RefPtr<ScrollLayerTextureUpdater> m_backTrackUpdater;
-    RefPtr<ScrollLayerTextureUpdater> m_foreTrackUpdater;
-    RefPtr<ScrollLayerTextureUpdater> m_thumbUpdater;
+    RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_backTrackUpdater;
+    RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_foreTrackUpdater;
+    RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_thumbUpdater;
 
     // All the parts of the scrollbar except the thumb
     OwnPtr<LayerTextureUpdater::Texture> m_backTrack;
diff --git a/cc/caching_bitmap_canvas_layer_texture_updater.cc b/cc/caching_bitmap_canvas_layer_texture_updater.cc
index 1b3315c..7d2c85f 100644
--- a/cc/caching_bitmap_canvas_layer_texture_updater.cc
+++ b/cc/caching_bitmap_canvas_layer_texture_updater.cc
@@ -11,9 +11,8 @@
 
 namespace cc {
 
-// Use lower-case on name to stay consistent with base-class.
 PassRefPtr<CachingBitmapCanvasLayerTextureUpdater>
-CachingBitmapCanvasLayerTextureUpdater::create(
+CachingBitmapCanvasLayerTextureUpdater::Create(
     PassOwnPtr<LayerPainterChromium> painter) {
   return adoptRef(new CachingBitmapCanvasLayerTextureUpdater(painter));
 }
diff --git a/cc/caching_bitmap_canvas_layer_texture_updater.h b/cc/caching_bitmap_canvas_layer_texture_updater.h
index e17aeab..9a6e6dd 100644
--- a/cc/caching_bitmap_canvas_layer_texture_updater.h
+++ b/cc/caching_bitmap_canvas_layer_texture_updater.h
@@ -13,8 +13,7 @@ namespace cc {
 class CachingBitmapCanvasLayerTextureUpdater
     : public BitmapCanvasLayerTextureUpdater {
  public:
-  // Use lower-case on name to stay consistent with base-class.
-  static PassRefPtr<CachingBitmapCanvasLayerTextureUpdater> create(
+  static PassRefPtr<CachingBitmapCanvasLayerTextureUpdater> Create(
       PassOwnPtr<LayerPainterChromium>);
 
   virtual void prepareToUpdate(const IntRect& content_rect,