cc: Make damage on delegated frame damage the host layer.

cc/delegated_renderer_layer_impl.cc

 // Copyright 2012 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 "cc/delegated_renderer_layer_impl.h"
 
 #include "cc/append_quads_data.h"
+#include "cc/delegated_frame_data.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/render_pass_sink.h"
 
 namespace cc {
 
 DelegatedRendererLayerImpl::DelegatedRendererLayerImpl(
     LayerTreeImpl* tree_impl, int id)
@@ skipping 10 matching lines @@
   return !render_passes_in_draw_order_.empty();
 }
 
 bool DelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const {
   // The root RenderPass for the layer is merged with its target
   // RenderPass in each frame. So we only have extra RenderPasses
   // to merge when we have a non-root RenderPass present.
   return render_passes_in_draw_order_.size() > 1;
 }
 
+void DelegatedRendererLayerImpl::SetFrameData(
+    scoped_ptr<DelegatedFrameData> frame_data,
+    gfx::RectF damage_in_frame) {
+  CreateChildIdIfNeeded();
+  DCHECK(child_id_);
+
+  // Display size is already set so we can compute what the damage rect
+  // will be in layer space.
+  RenderPass* new_root_pass = frame_data->render_pass_list.empty() ?
+                              NULL : frame_data->render_pass_list.back();
+  bool new_frame_is_empty = !new_root_pass;
+
+  RenderPass* old_root_pass = render_passes_in_draw_order_.empty() ?
+                              NULL : render_passes_in_draw_order_.back();
+  bool old_frame_is_empty = !old_root_pass;
+
+  gfx::RectF damage_in_layer;
+  if (new_frame_is_empty) {

[piman, 2013/02/27 02:27:43]

Should we make the layer with an empty frame !drawsContent() so that this part
is taken care of at a higher level?

[danakj, 2013/02/27 20:05:02]

Ya that sounds nice. I'll do it in a follow up, the test should not need
changing I think.

+    if (!old_frame_is_empty)
+      damage_in_layer = gfx::Rect(bounds());
+  } else {
+    DCHECK(!new_root_pass->output_rect.IsEmpty());

[piman, 2013/02/27 02:27:43]

What if it is empty? Given that this comes from an untrusted renderer, do we
need to handle this at a higher level? Or can we make it do something not crazy?

[danakj, 2013/02/27 20:05:02]

I think we should drop it at the ipc level and/or on the main thread side ie
when we see it for the first time. I'll add that.

+    damage_in_layer = MathUtil::mapClippedRect(
+        DelegatedFrameToLayerSpaceTransform(new_root_pass->output_rect.size()),
+        damage_in_frame);
+  }
+  setUpdateRect(gfx::UnionRects(updateRect(), damage_in_layer));
+
+  // TODO(danakj): Convert the resource ids the render passes and return data
+  // for a frame ack.
+  SetRenderPasses(frame_data->render_pass_list);
+}
+
+void DelegatedRendererLayerImpl::SetDisplaySize(gfx::Size size) {
+  if (display_size_ == size)
+    return;
+  display_size_ = size;
+  noteLayerPropertyChanged();
+}
+
 void DelegatedRendererLayerImpl::SetRenderPasses(
     ScopedPtrVector<RenderPass>& render_passes_in_draw_order) {
   gfx::RectF old_root_damage;
   if (!render_passes_in_draw_order_.empty())
     old_root_damage = render_passes_in_draw_order_.back()->damage_rect;
 
   ClearRenderPasses();
 
   for (size_t i = 0; i < render_passes_in_draw_order.size(); ++i) {
     render_passes_index_by_id_.insert(
@@ skipping 18 matching lines @@
 scoped_ptr<LayerImpl> DelegatedRendererLayerImpl::createLayerImpl(
     LayerTreeImpl* treeImpl) {
   return DelegatedRendererLayerImpl::create(treeImpl, id()).PassAs<LayerImpl>();
 }
 
 void DelegatedRendererLayerImpl::didLoseOutputSurface() {
   ClearRenderPasses();
   ClearChildId();
 }
 
+gfx::Transform DelegatedRendererLayerImpl::DelegatedFrameToLayerSpaceTransform(
+    gfx::Size frame_size) const {
+  gfx::Size display_size = display_size_.IsEmpty() ? bounds() : display_size_;
+
+  gfx::Transform delegated_frame_to_layer_space_transform;
+  delegated_frame_to_layer_space_transform.Scale(
+      static_cast<double>(display_size.width()) / frame_size.width(),
+      static_cast<double>(display_size.height()) / frame_size.height());
+  return delegated_frame_to_layer_space_transform;
+}
+
 static inline int IndexToId(int index) { return index + 1; }
 static inline int IdToIndex(int id) { return id - 1; }
 
 RenderPass::Id DelegatedRendererLayerImpl::firstContributingRenderPassId()
     const {
   return RenderPass::Id(id(), IndexToId(0));
 }
 
 RenderPass::Id DelegatedRendererLayerImpl::nextContributingRenderPassId(
     RenderPass::Id previous) const {
@@ skipping 78 matching lines @@
       delegated_shared_quad_state = delegated_quad->shared_quad_state;
       output_shared_quad_state = quad_sink->useSharedQuadState(
           delegated_shared_quad_state->Copy());
 
       bool is_root_delegated_render_pass =
           delegated_render_pass == render_passes_in_draw_order_.back();
       if (is_root_delegated_render_pass) {
         // Don't allow areas inside the bounds that are empty.
         DCHECK(display_size_.IsEmpty() ||
                gfx::Rect(display_size_).Contains(gfx::Rect(bounds())));
-        gfx::Size display_size =
-            display_size_.IsEmpty() ? bounds() : display_size_;
-
-        gfx::Transform delegated_frame_to_layer_space_transform;
-        delegated_frame_to_layer_space_transform.Scale(
-            static_cast<double>(display_size.width()) / frame_size.width(),
-            static_cast<double>(display_size.height()) / frame_size.height());
-
         gfx::Transform delegated_frame_to_target_transform =
-            drawTransform() * delegated_frame_to_layer_space_transform;
+            drawTransform() * DelegatedFrameToLayerSpaceTransform(frame_size);
 
         output_shared_quad_state->content_to_target_transform.ConcatTransform(
             delegated_frame_to_target_transform);
 
         if (renderTarget() == this) {
           DCHECK(!isClipped());
           DCHECK(renderSurface());
           output_shared_quad_state->clip_rect = MathUtil::mapClippedRect(
               delegated_frame_to_target_transform,
               output_shared_quad_state->clip_rect);
@@ skipping 49 matching lines @@
 void DelegatedRendererLayerImpl::ClearChildId() {
   if (!child_id_)
     return;
 
   ResourceProvider* resource_provider = layerTreeImpl()->resource_provider();
   resource_provider->destroyChild(child_id_);
   child_id_ = 0;
 }
 
 }  // namespace cc