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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_scrollbar_layer_impl.cc
diff --git a/cc/blink/web_scrollbar_layer_impl.cc b/cc/blink/web_scrollbar_layer_impl.cc
index dcc8d6fee1501a743efd03fba6bb6c1e699cec55..c94f2c5a9cc3a26500d9bb73ab0063d9e3d3ff37 100644
--- a/cc/blink/web_scrollbar_layer_impl.cc
+++ b/cc/blink/web_scrollbar_layer_impl.cc
@@ -61,13 +61,15 @@ blink::WebLayer* WebScrollbarLayerImpl::layer() {
void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
cc::Layer* scroll_layer =
layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
- layer_->layer()->ToScrollbarLayer()->SetScrollLayer(scroll_layer->id());
+ layer_->layer()->ToScrollbarLayer()->SetScrollLayer(
+ scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID);
}
void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) {
cc::Layer* clip_layer =
layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
- layer_->layer()->ToScrollbarLayer()->SetClipLayer(clip_layer->id());
+ layer_->layer()->ToScrollbarLayer()->SetClipLayer(
+ clip_layer ? clip_layer->id() : cc::Layer::INVALID_ID);
}
} // namespace cc_blink
« 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