| Index: cc/layers/scrollbar_layer.cc
|
| diff --git a/cc/layers/scrollbar_layer.cc b/cc/layers/scrollbar_layer.cc
|
| index 19a84ddc1e400e1ee312bd61ffa93f60a1a843de..9271a5dc7a0d8629f0de3587e41526c61431006d 100644
|
| --- a/cc/layers/scrollbar_layer.cc
|
| +++ b/cc/layers/scrollbar_layer.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "cc/layers/scrollbar_layer.h"
|
|
|
| +#include "base/auto_reset.h"
|
| #include "base/basictypes.h"
|
| #include "base/debug/trace_event.h"
|
| #include "cc/layers/scrollbar_layer_impl.h"
|
| @@ -400,7 +401,11 @@ void ScrollbarLayer::SetTexturePriorities(
|
| void ScrollbarLayer::Update(ResourceUpdateQueue* queue,
|
| const OcclusionTracker* occlusion,
|
| RenderingStats* stats) {
|
| - ContentsScalingLayer::Update(queue, occlusion, stats);
|
| + {
|
| + base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
|
| + true);
|
| + ContentsScalingLayer::Update(queue, occlusion, stats);
|
| + }
|
|
|
| dirty_rect_.Union(update_rect_);
|
| if (content_bounds().IsEmpty())
|
|
|