| Index: cc/output/overlay_processor.cc
|
| diff --git a/cc/output/overlay_processor.cc b/cc/output/overlay_processor.cc
|
| index 59434b01fae3036237131b99b6245440b99b8797..69368a1bd5d2f6ec8d9f9698e7d4f0df79701cda 100644
|
| --- a/cc/output/overlay_processor.cc
|
| +++ b/cc/output/overlay_processor.cc
|
| @@ -11,14 +11,6 @@
|
| #include "ui/gfx/transform.h"
|
|
|
| namespace cc {
|
| -
|
| -namespace {
|
| -
|
| -bool SortByZOrder(const OverlayCandidate& a, const OverlayCandidate& b) {
|
| - return (a.plane_z_order < b.plane_z_order);
|
| -}
|
| -
|
| -} // namespace
|
|
|
| OverlayProcessor::OverlayProcessor(OutputSurface* surface) : surface_(surface) {
|
| }
|
| @@ -35,21 +27,10 @@
|
|
|
| void OverlayProcessor::ProcessForOverlays(ResourceProvider* resource_provider,
|
| RenderPassList* render_passes,
|
| - OverlayCandidateList* candidates,
|
| - gfx::Rect* damage_rect) {
|
| + OverlayCandidateList* candidates) {
|
| for (auto strategy : strategies_) {
|
| - if (strategy->Attempt(resource_provider, render_passes, candidates)) {
|
| - std::sort(candidates->begin(), candidates->end(), SortByZOrder);
|
| -
|
| - for (const OverlayCandidate& overlay : *candidates) {
|
| - if (overlay.plane_z_order <= 0 || overlay.needs_blending)
|
| - continue;
|
| -
|
| - damage_rect->Subtract(ToEnclosedRect(overlay.display_rect));
|
| - }
|
| -
|
| + if (strategy->Attempt(resource_provider, render_passes, candidates))
|
| return;
|
| - }
|
| }
|
| }
|
|
|
|
|