html_viewer/Mandoline: Avoid subclassing WebLayerImpl

components/html_viewer/html_frame.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 "components/html_viewer/html_frame.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/blink/web_layer_impl.h"
+#include "cc/surfaces/surface_id.h"
 #include "components/html_viewer/ax_provider_impl.h"
 #include "components/html_viewer/blink_basic_type_converters.h"
 #include "components/html_viewer/blink_input_events_type_converters.h"
 #include "components/html_viewer/blink_text_input_type_converters.h"
 #include "components/html_viewer/blink_url_request_type_converters.h"
 #include "components/html_viewer/devtools_agent_impl.h"
 #include "components/html_viewer/geolocation_client_impl.h"
 #include "components/html_viewer/global_state.h"
 #include "components/html_viewer/html_factory.h"
 #include "components/html_viewer/html_frame_delegate.h"
 #include "components/html_viewer/html_frame_properties.h"
 #include "components/html_viewer/html_frame_tree_manager.h"
 #include "components/html_viewer/html_widget.h"
 #include "components/html_viewer/media_factory.h"
 #include "components/html_viewer/stats_collection_controller.h"
 #include "components/html_viewer/touch_handler.h"
-#include "components/html_viewer/web_layer_impl.h"
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/mus/ids.h"
 #include "components/mus/public/cpp/scoped_view_ptr.h"
 #include "components/mus/public/cpp/view.h"
 #include "components/mus/public/cpp/view_tree_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
@@ skipping 53 matching lines @@
   }
 }
 
 HTMLFrame* GetPreviousSibling(HTMLFrame* frame) {
   DCHECK(frame->parent());
   auto iter = std::find(frame->parent()->children().begin(),
                         frame->parent()->children().end(), frame);
   return (iter == frame->parent()->children().begin()) ? nullptr : *(--iter);
 }
 
+// See surface_layer.h for a description of this callback.
+void SatisfyCallback(cc::SurfaceSequence sequence) {
+  // TODO(fsamuel): Implement this.
+}
+
+// See surface_layer.h for a description of this callback.
+void RequireCallback(cc::SurfaceId surface_id,
+                     cc::SurfaceSequence sequence) {
+  // TODO(fsamuel): Implement this.
+}
+
 }  // namespace
 
 HTMLFrame::HTMLFrame(CreateParams* params)
     : frame_tree_manager_(params->manager),
       parent_(params->parent),
       view_(nullptr),
       id_(params->id),
       web_frame_(nullptr),
       delegate_(params->delegate),
       weak_factory_(this) {
@@ skipping 445 matching lines @@
 
   HTMLFrameDelegate* delegate = delegate_;
   delegate_ = nullptr;
 
   blink::WebRemoteFrame* remote_frame =
       blink::WebRemoteFrame::create(state_.tree_scope, this);
   remote_frame->initializeFromFrame(web_frame_->toWebLocalFrame());
   // swap() ends up calling us back and we then close the frame, which deletes
   // it.
   web_frame_->swap(remote_frame);
-  // TODO(sky): this isn't quite right, but WebLayerImpl is temporary.
   if (owned_view_) {
-    web_layer_.reset(
-        new WebLayerImpl(owned_view_->view(),
-                         global_state()->device_pixel_ratio()));
+    surface_layer_ =
+          cc::SurfaceLayer::Create(cc_blink::WebLayerImpl::LayerSettings(),
+                                   base::Bind(&SatisfyCallback),
+                                   base::Bind(&RequireCallback));
+    surface_layer_->SetSurfaceId(cc::SurfaceId(owned_view_->view()->id()),
+                                 global_state()->device_pixel_ratio(),
+                                 frame_size_in_pixels_);

[sky, 2015/09/28 15:29:09]

Why do we need frame_size_in_pixels_ as a member? Could this line change to get
the size from the view_ ? In fact could we always get the size from the view?
Shouldn't the view be resized by the owner to the right size?

[Fady Samuel, 2015/09/28 15:57:00]

Done.

+
+    web_layer_.reset(new cc_blink::WebLayerImpl(surface_layer_));
   }
   remote_frame->setRemoteWebLayer(web_layer_.get());
   remote_frame->setReplicatedName(state_.name);
   remote_frame->setReplicatedOrigin(state_.origin);
   remote_frame->setReplicatedSandboxFlags(state_.sandbox_flags);
   // Tell the frame that it is actually loading. This prevents its parent
   // from prematurely dispatching load event.
   remote_frame->didStartLoading();
   web_frame_ = remote_frame;
   SetView(nullptr);
@@ skipping 254 matching lines @@
                                                  event.Pass());
 }
 
 void HTMLFrame::initializeChildFrame(const blink::WebRect& frame_rect,
                                      float scale_factor) {
   // NOTE: |scale_factor| is always 1.
   const gfx::Rect rect_in_dip(frame_rect.x, frame_rect.y, frame_rect.width,
                               frame_rect.height);
   const gfx::Rect rect_in_pixels(gfx::ConvertRectToPixel(
       global_state()->device_pixel_ratio(), rect_in_dip));
+  frame_size_in_pixels_ = rect_in_pixels.size();
   const mojo::RectPtr mojo_rect_in_pixels(mojo::Rect::From(rect_in_pixels));
   view_->SetBounds(*mojo_rect_in_pixels);
 }
 
 void HTMLFrame::navigate(const blink::WebURLRequest& request,
                          bool should_replace_current_entry) {
   // TODO: support |should_replace_current_entry|.
   NOTIMPLEMENTED();  // for |should_replace_current_entry
   mojo::URLRequestPtr url_request = mojo::URLRequest::From(request);
   GetServerFrame()->RequestNavigate(
       web_view::mojom::NAVIGATION_TARGET_TYPE_EXISTING_FRAME, id_,
       url_request.Pass());
 }
 
 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
   NOTIMPLEMENTED();
 }
 
-void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) {
-  NOTIMPLEMENTED();
+void HTMLFrame::frameRectsChanged(const blink::WebRect& rect) {
+  // TODO(fsamuel): The content of the iframe should also resize.
+  frame_size_in_pixels_ =
+      gfx::ScaleToCeiledSize(gfx::Size(rect.width, rect.height),
+                             global_state()->device_pixel_ratio());
+
+  if (!surface_layer_)
+    return;
+  surface_layer_->SetSurfaceId(cc::SurfaceId(owned_view_->view()->id()),
+                               global_state()->device_pixel_ratio(),
+                               frame_size_in_pixels_);
 }
 
 }  // namespace mojo