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

Side by Side Diff: cc/blink/web_scrollbar_layer_impl.cc

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/blink/web_scrollbar_layer_impl.h" 5 #include "cc/blink/web_scrollbar_layer_impl.h"
6 6
7 #include "cc/blink/scrollbar_impl.h" 7 #include "cc/blink/scrollbar_impl.h"
8 #include "cc/blink/web_layer_impl.h" 8 #include "cc/blink/web_layer_impl.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/painted_scrollbar_layer.h" 10 #include "cc/layers/painted_scrollbar_layer.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() { 54 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {
55 } 55 }
56 56
57 blink::WebLayer* WebScrollbarLayerImpl::layer() { 57 blink::WebLayer* WebScrollbarLayerImpl::layer() {
58 return layer_.get(); 58 return layer_.get();
59 } 59 }
60 60
61 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) { 61 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
62 cc::Layer* scroll_layer = 62 cc::Layer* scroll_layer =
63 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 63 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
64 layer_->layer()->ToScrollbarLayer()->SetScrollLayer(scroll_layer->id()); 64 layer_->layer()->ToScrollbarLayer()->SetScrollLayer(
65 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID);
65 } 66 }
66 67
67 void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) { 68 void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) {
68 cc::Layer* clip_layer = 69 cc::Layer* clip_layer =
69 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 70 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
70 layer_->layer()->ToScrollbarLayer()->SetClipLayer(clip_layer->id()); 71 layer_->layer()->ToScrollbarLayer()->SetClipLayer(
72 clip_layer ? clip_layer->id() : cc::Layer::INVALID_ID);
71 } 73 }
72 74
73 } // namespace cc_blink 75 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_scroll_offset_animation_curve_impl.cc ('k') | cc/blink/web_transform_animation_curve_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698