Ensure RemoteViewportIntersection rect persists across frame navigations

content/browser/frame_host/cross_process_frame_connector.h

Index: content/browser/frame_host/cross_process_frame_connector.h
diff --git a/content/browser/frame_host/cross_process_frame_connector.h b/content/browser/frame_host/cross_process_frame_connector.h
index 641a51005299d443a1b1fa5a3043b0bef9048cca..172f5f1dddc89af9a8384b48c464a64c0066c426 100644
--- a/content/browser/frame_host/cross_process_frame_connector.h
+++ b/content/browser/frame_host/cross_process_frame_connector.h
@@ -28,6 +28,7 @@ class Message;
 }
 
 namespace content {
+class MockCrossProcessFrameConnector;

[ncarter (slow), 2017/05/30 17:51:09]

 "friend class" doesn't actually require forward declaration, so you can drop
this line.

[kenrb, 2017/05/30 18:25:10]

Done.

 class RenderFrameProxyHost;
 class RenderWidgetHostViewBase;
 class RenderWidgetHostViewChildFrame;
@@ -133,12 +134,18 @@ class CONTENT_EXPORT CrossProcessFrameConnector {
   // Returns the view for the top-level frame under the same WebContents.
   RenderWidgetHostViewBase* GetRootRenderWidgetHostView();
 
+  gfx::Rect viewport_intersection() const {
+    return viewport_intersection_rect_;
+  }
+
   // Exposed for tests.
   RenderWidgetHostViewBase* GetRootRenderWidgetHostViewForTesting() {
     return GetRootRenderWidgetHostView();
   }
 
  private:
+  friend class MockCrossProcessFrameConnector;
+
   // Handlers for messages received from the parent frame.
   void OnFrameRectChanged(const gfx::Rect& frame_rect);
   void OnUpdateViewportIntersection(const gfx::Rect& viewport_intersection);
@@ -157,6 +164,7 @@ class CONTENT_EXPORT CrossProcessFrameConnector {
   RenderWidgetHostViewChildFrame* view_;
 
   gfx::Rect child_frame_rect_;
+  gfx::Rect viewport_intersection_rect_;
 
   bool is_scroll_bubbling_;
 };