Allow binding multiple textures to one DC Layer overlay.

gpu/ipc/service/direct_composition_surface_win.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/service/direct_composition_surface_win.h"
 
 #include <d3d11_1.h>
 #include <dcomptypes.h>
 
 #include <deque>
@@ skipping 329 matching lines @@
     return composition_count < (PresentationHistory::kPresentsToStore * 3 / 4);
   } else {
     // Switch to YUY2 once 3/4 are using overlays (or unknown).
     return composition_count < (PresentationHistory::kPresentsToStore / 4);
   }
 }
 
 void DCLayerTree::SwapChainPresenter::PresentToSwapChain(
     const ui::DCRendererLayerParams& params) {
   gl::GLImageDXGI* image_dxgi =
-      gl::GLImageDXGI::FromGLImage(params.image.get());
+      gl::GLImageDXGI::FromGLImage(params.image[0].get());
   DCHECK(image_dxgi);
 
   // Swap chain size is the minimum of the on-screen size and the source
   // size so the video processor can do the minimal amount of work and
   // the overlay has to read the minimal amount of data.
   // DWM is also less likely to promote a surface to an overlay if it's
   // much larger than its area on-screen.
   gfx::Rect bounds_rect = params.rect;
   gfx::Size ceiled_input_size = gfx::ToCeiledSize(params.contents_rect.size());
   gfx::Size swap_chain_size = bounds_rect.size();
@@ skipping 363 matching lines @@
 }
 
 bool DCLayerTree::CommitAndClearPendingOverlays() {
   TRACE_EVENT1("gpu", "DCLayerTree::CommitAndClearPendingOverlays", "size",
                pending_overlays_.size());
   UMA_HISTOGRAM_BOOLEAN("GPU.DirectComposition.OverlaysUsed",
                         !pending_overlays_.empty());
   // Add an overlay with z-order 0 representing the main plane.
   gfx::Size surface_size = surface_->GetSize();
   pending_overlays_.push_back(base::MakeUnique<ui::DCRendererLayerParams>(
-      false, gfx::Rect(), 0, gfx::Transform(), nullptr,
+      false, gfx::Rect(), 0, gfx::Transform(),
+      std::vector<scoped_refptr<gl::GLImage>>(),
       gfx::RectF(gfx::SizeF(surface_size)), gfx::Rect(surface_size), 0, 0, 1.0,
       0));
 
   // TODO(jbauman): Reuse swapchains that are switched between overlays and
   // underlays.
   std::sort(pending_overlays_.begin(), pending_overlays_.end(),
             [](const auto& a, const auto& b) -> bool {
               return a->z_order < b->z_order;
             });
 
   while (visual_info_.size() > pending_overlays_.size()) {
     visual_info_.back().clip_visual->RemoveAllVisuals();
     root_visual_->RemoveVisual(visual_info_.back().clip_visual.Get());
     visual_info_.pop_back();
   }
 
   visual_info_.resize(pending_overlays_.size());
 
   // The overall visual tree has one clip visual for every overlay (including
   // the main plane). The clip visuals are in z_order and are all children of
   // a root visual. Each clip visual has a child visual that has the actual
   // plane content.
 
   for (size_t i = 0; i < pending_overlays_.size(); i++) {
     ui::DCRendererLayerParams& params = *pending_overlays_[i];
     VisualInfo* visual_info = &visual_info_[i];
 
     InitVisual(i);
-    if (params.image &&
-        params.image->GetType() == gl::GLImage::Type::DXGI_IMAGE) {
+    if (params.image.size() > 0 && params.image[0] &&
+        params.image[0]->GetType() == gl::GLImage::Type::DXGI_IMAGE) {
       UpdateVisualForVideo(visual_info, params);
-    } else if (!params.image) {
+    } else if (params.image.empty()) {
       UpdateVisualForBackbuffer(visual_info, params);
     } else {
       CHECK(false);
     }
     UpdateVisualClip(visual_info, params);
   }
 
   HRESULT hr = dcomp_device_->Commit();
   CHECK(SUCCEEDED(hr));
 
@@ skipping 380 matching lines @@
 DirectCompositionSurfaceWin::GetWindowTaskRunnerForTesting() {
   return child_window_.GetTaskRunnerForTesting();
 }
 
 base::win::ScopedComPtr<IDXGISwapChain1>
 DirectCompositionSurfaceWin::GetLayerSwapChainForTesting(size_t index) const {
   return layer_tree_->GetLayerSwapChainForTesting(index);
 }
 
 }  // namespace gpu