| Index: cc/layers/scrollbar_layer.cc
|
| diff --git a/cc/layers/scrollbar_layer.cc b/cc/layers/scrollbar_layer.cc
|
| index 927ae7b5993fb13addc9e67e39ddf93730bf7cce..4a6383504fc5750bb706b694764e664fff59309a 100644
|
| --- a/cc/layers/scrollbar_layer.cc
|
| +++ b/cc/layers/scrollbar_layer.cc
|
| @@ -302,10 +302,12 @@ bool ScrollbarLayer::Update(ResourceUpdateQueue* queue,
|
| if (layer_tree_host()->settings().solid_color_scrollbars)
|
| return false;
|
|
|
| + bool updated = false;
|
| +
|
| {
|
| base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
|
| true);
|
| - ContentsScalingLayer::Update(queue, occlusion);
|
| + updated = ContentsScalingLayer::Update(queue, occlusion);
|
| }
|
|
|
| dirty_rect_.Union(update_rect_);
|
| @@ -318,8 +320,8 @@ bool ScrollbarLayer::Update(ResourceUpdateQueue* queue,
|
|
|
| gfx::Rect content_rect = ScrollbarLayerRectToContentRect(
|
| gfx::Rect(scrollbar_->Location(), bounds()));
|
| - bool updated = UpdatePart(track_updater_.get(), track_.get(), content_rect,
|
| - queue);
|
| + updated |= UpdatePart(track_updater_.get(), track_.get(), content_rect,
|
| + queue);
|
|
|
| if (scrollbar_->HasThumb()) {
|
| thumb_thickness_ = scrollbar_->ThumbThickness();
|
|
|