Revert "Getting rid of DelegatedFrameData"

cc/surfaces/surface_hittest.cc

 // Copyright 2015 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/surfaces/surface_hittest.h"
 
 #include "cc/output/compositor_frame.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_hittest_delegate.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
@@ skipping 233 matching lines @@
   // The target surface was not found.
   return false;
 }
 
 const RenderPass* SurfaceHittest::GetRenderPassForSurfaceById(
     const SurfaceId& surface_id,
     const RenderPassId& render_pass_id) {
   Surface* surface = manager_->GetSurfaceForId(surface_id);
   if (!surface)
     return nullptr;
-  if (!surface->HasFrame())
+
+  const CompositorFrame& surface_frame = surface->GetEligibleFrame();
+  if (!surface_frame.delegated_frame_data)
     return nullptr;
-  const CompositorFrame& surface_frame = surface->GetEligibleFrame();
 
-  if (surface_frame.render_pass_list.empty())
+  const DelegatedFrameData* frame_data =
+      surface_frame.delegated_frame_data.get();
+  if (frame_data->render_pass_list.empty())
     return nullptr;
 
   if (!render_pass_id.IsValid())
-    return surface_frame.render_pass_list.back().get();
+    return frame_data->render_pass_list.back().get();
 
-  for (const auto& render_pass : surface_frame.render_pass_list) {
+  for (const auto& render_pass : frame_data->render_pass_list) {
     if (render_pass->id == render_pass_id)
       return render_pass.get();
   }
 
   return nullptr;
 }
 
 bool SurfaceHittest::PointInQuad(const DrawQuad* quad,
                                  const gfx::Point& point_in_render_pass_space,
                                  gfx::Transform* target_to_quad_transform,
@@ skipping 13 matching lines @@
     return false;
   }
 
   *point_in_quad_space = point_in_render_pass_space;
   target_to_quad_transform->TransformPoint(point_in_quad_space);
 
   return quad->rect.Contains(*point_in_quad_space);
 }
 
 }  // namespace cc