diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.gyp | 1 | ||||
| -rw-r--r-- | cc/layers/scrollbar_layer_impl.cc | 2 | ||||
| -rw-r--r-- | cc/layers/scrollbar_layer_impl.h | 13 | ||||
| -rw-r--r-- | cc/layers/scrollbar_layer_impl_base.h | 30 |
4 files changed, 8 insertions, 38 deletions
@@ -141,7 +141,6 @@ 'layers/scrollbar_layer.h', 'layers/scrollbar_layer_impl.cc', 'layers/scrollbar_layer_impl.h', - 'layers/scrollbar_layer_impl_base.h', 'layers/solid_color_layer.cc', 'layers/solid_color_layer.h', 'layers/solid_color_layer_impl.cc', diff --git a/cc/layers/scrollbar_layer_impl.cc b/cc/layers/scrollbar_layer_impl.cc index 312cc7a..0826038 100644 --- a/cc/layers/scrollbar_layer_impl.cc +++ b/cc/layers/scrollbar_layer_impl.cc @@ -31,7 +31,7 @@ ScrollbarLayerImpl::ScrollbarLayerImpl( LayerTreeImpl* tree_impl, int id, scoped_ptr<ScrollbarGeometryFixedThumb> geometry) - : ScrollbarLayerImplBase(tree_impl, id), + : LayerImpl(tree_impl, id), scrollbar_(this), back_track_resource_id_(0), fore_track_resource_id_(0), diff --git a/cc/layers/scrollbar_layer_impl.h b/cc/layers/scrollbar_layer_impl.h index a672eba..dfef686 100644 --- a/cc/layers/scrollbar_layer_impl.h +++ b/cc/layers/scrollbar_layer_impl.h @@ -6,16 +6,17 @@ #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_ #include "cc/base/cc_export.h" +#include "cc/layers/layer_impl.h" #include "cc/layers/scrollbar_geometry_fixed_thumb.h" -#include "cc/layers/scrollbar_layer_impl_base.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" namespace cc { +class LayerTreeImpl; class ScrollView; -class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase { +class CC_EXPORT ScrollbarLayerImpl : public LayerImpl { public: static scoped_ptr<ScrollbarLayerImpl> Create( LayerTreeImpl* tree_impl, @@ -47,15 +48,15 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase { } // ScrollbarLayerImplBase implementation. - virtual float CurrentPos() const OVERRIDE; - virtual int TotalSize() const OVERRIDE; - virtual int Maximum() const OVERRIDE; + virtual float CurrentPos() const; + virtual int TotalSize() const; + virtual int Maximum() const; void SetCurrentPos(float current_pos) { current_pos_ = current_pos; } void SetTotalSize(int total_size) { total_size_ = total_size; } void SetMaximum(int maximum) { maximum_ = maximum; } - virtual WebKit::WebScrollbar::Orientation Orientation() const OVERRIDE; + virtual WebKit::WebScrollbar::Orientation Orientation() const; virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) OVERRIDE; diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h deleted file mode 100644 index 5257c041..0000000 --- a/cc/layers/scrollbar_layer_impl_base.h +++ /dev/null @@ -1,30 +0,0 @@ -// 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. - -#ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ -#define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ - -#include "cc/base/cc_export.h" -#include "cc/layers/layer_impl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h" - -namespace cc { - -class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl { - public: - virtual ~ScrollbarLayerImplBase() {} - - virtual float CurrentPos() const = 0; - virtual int TotalSize() const = 0; - virtual int Maximum() const = 0; - virtual WebKit::WebScrollbar::Orientation Orientation() const = 0; - - protected: - ScrollbarLayerImplBase(LayerTreeImpl* tree_impl, int id) - : LayerImpl(tree_impl, id) {} -}; - -} // namespace cc - -#endif // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ |