 diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
-index f9d946b..1681f40 100644
+index 1831d48..6cd2f3e 100644
 --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
 +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
-@@ -31,8 +31,10 @@
- #include "content/common/text_input_state.h"
+@@ -32,7 +32,9 @@
  #include "content/common/view_messages.h"
+ #include "content/public/browser/guest_mode.h"
  #include "content/public/browser/render_process_host.h"
 +#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
- #include "content/public/common/browser_plugin_guest_mode.h"
  #include "gpu/ipc/common/gpu_messages.h"
 +#include "media/base/video_frame.h"
- #include "third_party/WebKit/public/web/WebInputEvent.h"
+ #include "third_party/WebKit/public/platform/WebInputEvent.h"
  #include "ui/gfx/geometry/size_conversions.h"
  #include "ui/gfx/geometry/size_f.h"
-@@ -715,4 +717,26 @@ cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
-   return surface_id_;
+@@ -745,4 +747,26 @@ cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
+   return cc::SurfaceId(frame_sink_id_, local_frame_id_);
  };
  
 +void RenderWidgetHostViewChildFrame::WillDrawSurface(

  protected:
   friend class RenderWidgetHostView;
   friend class RenderWidgetHostViewChildFrameTest;
@@ -245,6 +251,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // The surface client ID of the parent RenderWidgetHostView.  0 if none.
   uint32_t parent_surface_client_id_;
 
+  std::unique_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
+

+
 }  // namespace content
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 9af289d..ac07908 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -194,6 +194,12 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   void RegisterFrameSinkId();
   void UnregisterFrameSinkId();
 
+  void WillDrawSurface(
+      const cc::SurfaceId& id, const gfx::Rect& damage_rect) override;
