| Index: cc/output/overlay_processor.cc
|
| diff --git a/cc/output/overlay_processor.cc b/cc/output/overlay_processor.cc
|
| index 88523d63033d86a45aa37d02c53e7f5e991364e0..8a1a9e7fd73cd727fc971973b8612d64c85c77b3 100644
|
| --- a/cc/output/overlay_processor.cc
|
| +++ b/cc/output/overlay_processor.cc
|
| @@ -61,6 +61,8 @@ gfx::Rect OverlayProcessor::GetAndResetOverlayDamage() {
|
| bool OverlayProcessor::ProcessForCALayers(
|
| ResourceProvider* resource_provider,
|
| RenderPass* render_pass,
|
| + const RenderPassFilterList& render_pass_filters,
|
| + const RenderPassFilterList& render_pass_background_filters,
|
| OverlayCandidateList* overlay_candidates,
|
| CALayerOverlayList* ca_layer_overlays,
|
| gfx::Rect* damage_rect) {
|
| @@ -69,9 +71,10 @@ bool OverlayProcessor::ProcessForCALayers(
|
| if (!overlay_validator || !overlay_validator->AllowCALayerOverlays())
|
| return false;
|
|
|
| - if (!ProcessForCALayerOverlays(resource_provider,
|
| - gfx::RectF(render_pass->output_rect),
|
| - render_pass->quad_list, ca_layer_overlays))
|
| + if (!ProcessForCALayerOverlays(
|
| + resource_provider, gfx::RectF(render_pass->output_rect),
|
| + render_pass->quad_list, render_pass_filters,
|
| + render_pass_background_filters, ca_layer_overlays))
|
| return false;
|
|
|
| // CALayer overlays are all-or-nothing. If all quads were replaced with
|
| @@ -83,11 +86,14 @@ bool OverlayProcessor::ProcessForCALayers(
|
| return true;
|
| }
|
|
|
| -void OverlayProcessor::ProcessForOverlays(ResourceProvider* resource_provider,
|
| - RenderPass* render_pass,
|
| - OverlayCandidateList* candidates,
|
| - CALayerOverlayList* ca_layer_overlays,
|
| - gfx::Rect* damage_rect) {
|
| +void OverlayProcessor::ProcessForOverlays(
|
| + ResourceProvider* resource_provider,
|
| + RenderPass* render_pass,
|
| + const RenderPassFilterList& render_pass_filters,
|
| + const RenderPassFilterList& render_pass_background_filters,
|
| + OverlayCandidateList* candidates,
|
| + CALayerOverlayList* ca_layer_overlays,
|
| + gfx::Rect* damage_rect) {
|
| #if defined(OS_ANDROID)
|
| // Be sure to send out notifications, regardless of whether we get to
|
| // processing for overlays or not. If we don't, then we should notify that
|
| @@ -106,7 +112,8 @@ void OverlayProcessor::ProcessForOverlays(ResourceProvider* resource_provider,
|
| }
|
|
|
| // First attempt to process for CALayers.
|
| - if (ProcessForCALayers(resource_provider, render_pass, candidates,
|
| + if (ProcessForCALayers(resource_provider, render_pass, render_pass_filters,
|
| + render_pass_background_filters, candidates,
|
| ca_layer_overlays, damage_rect)) {
|
| return;
|
| }
|
|
|