| Index: cc/tiled_layer.cc
|
| diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
|
| index f69411f9fc1606ff0f450abac87a24a29c20b69c..5033a2d66bb6c781782f5b77cb89a050229e7cb0 100644
|
| --- a/cc/tiled_layer.cc
|
| +++ b/cc/tiled_layer.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "cc/tiled_layer.h"
|
|
|
| +#include "base/auto_reset.h"
|
| #include "base/basictypes.h"
|
| #include "build/build_config.h"
|
| #include "cc/layer_impl.h"
|
| @@ -634,9 +635,13 @@ void TiledLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occl
|
| {
|
| DCHECK(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
|
|
|
| - ContentsScalingLayer::update(queue, occlusion, stats);
|
| + {
|
| + base::AutoReset<bool> ignoreSetNeedsCommit(&m_ignoreSetNeedsCommit, true);
|
| +
|
| + ContentsScalingLayer::update(queue, occlusion, stats);
|
| + updateBounds();
|
| + }
|
|
|
| - updateBounds();
|
| if (m_tiler->hasEmptyBounds() || !drawsContent())
|
| return;
|
|
|
|
|