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

Unified Diff: cc/layers/layer_impl.cc

Issue 18341009: Refactor cc scrollbar layers to separate solid-color vs desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments; plumb scrollbar color via flag. Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index b78cf1a45a80fb195489e303a64a0cea66d22a93..5b796663dc730016289a67056840442d3bdabe6a 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -622,7 +622,7 @@ scoped_ptr<LayerImpl> LayerImpl::TakeReplicaLayer() {
return replica_layer_.Pass();
}
-ScrollbarLayerImpl* LayerImpl::ToScrollbarLayer() {
+ScrollbarLayerImplBase* LayerImpl::ToScrollbarLayer() {
return NULL;
}
@@ -980,13 +980,14 @@ void LayerImpl::DidBecomeActive() {
}
}
void LayerImpl::SetHorizontalScrollbarLayer(
- ScrollbarLayerImpl* scrollbar_layer) {
+ ScrollbarLayerImplBase* scrollbar_layer) {
horizontal_scrollbar_layer_ = scrollbar_layer;
if (horizontal_scrollbar_layer_)
horizontal_scrollbar_layer_->set_scroll_layer_id(id());
}
-void LayerImpl::SetVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbar_layer) {
+void LayerImpl::SetVerticalScrollbarLayer(
+ ScrollbarLayerImplBase* scrollbar_layer) {
vertical_scrollbar_layer_ = scrollbar_layer;
if (vertical_scrollbar_layer_)
vertical_scrollbar_layer_->set_scroll_layer_id(id());

Powered by Google App Engine
This is Rietveld 408576698