| Index: cc/output/overlay_processor.cc
|
| diff --git a/cc/output/overlay_processor.cc b/cc/output/overlay_processor.cc
|
| index 0f5ec560dd6baeb42bda510ee3ff602826e9382d..baae69dd10ed2bbe04e9178b1948c743a3356d23 100644
|
| --- a/cc/output/overlay_processor.cc
|
| +++ b/cc/output/overlay_processor.cc
|
| @@ -12,22 +12,19 @@
|
|
|
| namespace cc {
|
|
|
| -OverlayProcessor::OverlayProcessor(OutputSurface* surface,
|
| - ResourceProvider* resource_provider)
|
| - : surface_(surface), resource_provider_(resource_provider) {}
|
| +OverlayProcessor::OverlayProcessor(OutputSurface* surface) : surface_(surface) {
|
| +}
|
|
|
| void OverlayProcessor::Initialize() {
|
| DCHECK(surface_);
|
| - if (!resource_provider_)
|
| - return;
|
|
|
| OverlayCandidateValidator* candidates =
|
| surface_->GetOverlayCandidateValidator();
|
| if (candidates) {
|
| - strategies_.push_back(scoped_ptr<Strategy>(
|
| - new OverlayStrategySingleOnTop(candidates, resource_provider_)));
|
| - strategies_.push_back(scoped_ptr<Strategy>(
|
| - new OverlayStrategyUnderlay(candidates, resource_provider_)));
|
| + strategies_.push_back(
|
| + scoped_ptr<Strategy>(new OverlayStrategySingleOnTop(candidates)));
|
| + strategies_.push_back(
|
| + scoped_ptr<Strategy>(new OverlayStrategyUnderlay(candidates)));
|
| }
|
| }
|
|
|
|
|