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

Side by Side Diff: cc/layers/painted_scrollbar_layer.cc

Issue 2743653003: Revert of Remove indirection: setup scrollbar scroll layers in the scrollbar constructor (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
« no previous file with comments | « cc/layers/painted_scrollbar_layer.h ('k') | cc/layers/scrollbar_layer_interface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/painted_scrollbar_layer.h" 5 #include "cc/layers/painted_scrollbar_layer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "cc/base/math_util.h" 10 #include "cc/base/math_util.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 AddMainThreadScrollingReasons( 54 AddMainThreadScrollingReasons(
55 MainThreadScrollingReason::kScrollbarScrolling); 55 MainThreadScrollingReason::kScrollbarScrolling);
56 } 56 }
57 57
58 PaintedScrollbarLayer::~PaintedScrollbarLayer() {} 58 PaintedScrollbarLayer::~PaintedScrollbarLayer() {}
59 59
60 int PaintedScrollbarLayer::ScrollLayerId() const { 60 int PaintedScrollbarLayer::ScrollLayerId() const {
61 return scroll_layer_id_; 61 return scroll_layer_id_;
62 } 62 }
63 63
64 void PaintedScrollbarLayer::SetScrollLayer(int layer_id) {
65 if (layer_id == scroll_layer_id_)
66 return;
67
68 scroll_layer_id_ = layer_id;
69 SetNeedsFullTreeSync();
70 }
71
64 bool PaintedScrollbarLayer::OpacityCanAnimateOnImplThread() const { 72 bool PaintedScrollbarLayer::OpacityCanAnimateOnImplThread() const {
65 return scrollbar_->IsOverlay(); 73 return scrollbar_->IsOverlay();
66 } 74 }
67 75
68 bool PaintedScrollbarLayer::AlwaysUseActiveTreeOpacity() const { 76 bool PaintedScrollbarLayer::AlwaysUseActiveTreeOpacity() const {
69 return true; 77 return true;
70 } 78 }
71 79
72 ScrollbarOrientation PaintedScrollbarLayer::orientation() const { 80 ScrollbarOrientation PaintedScrollbarLayer::orientation() const {
73 return scrollbar_->Orientation(); 81 return scrollbar_->Orientation();
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 285
278 scrollbar_->PaintPart(&canvas, part, layer_rect); 286 scrollbar_->PaintPart(&canvas, part, layer_rect);
279 // Make sure that the pixels are no longer mutable to unavoid unnecessary 287 // Make sure that the pixels are no longer mutable to unavoid unnecessary
280 // allocation and copying. 288 // allocation and copying.
281 skbitmap.setImmutable(); 289 skbitmap.setImmutable();
282 290
283 return UIResourceBitmap(skbitmap); 291 return UIResourceBitmap(skbitmap);
284 } 292 }
285 293
286 } // namespace cc 294 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/painted_scrollbar_layer.h ('k') | cc/layers/scrollbar_layer_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698