Fix RenderView reuse issues when canceling a pending RenderFrameHost.

content/renderer/render_widget.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 146 matching lines @@
   void SetRoutingID(int32_t routing_id);
 
   CompositorDependencies* compositor_deps() const { return compositor_deps_; }
   virtual blink::WebWidget* GetWebWidget() const;
   const gfx::Size& size() const { return size_; }
   bool is_fullscreen_granted() const { return is_fullscreen_granted_; }
   blink::WebDisplayMode display_mode() const { return display_mode_; }
   bool is_hidden() const { return is_hidden_; }
   // Temporary for debugging purposes...
   bool closing() const { return closing_; }
-  bool is_swapped_out() { return is_swapped_out_; }
   bool has_host_context_menu_location() {
     return has_host_context_menu_location_;
   }
   gfx::Point host_context_menu_location() {
     return host_context_menu_location_;
   }
 
   void set_owner_delegate(RenderWidgetOwnerDelegate* owner_delegate) {
     DCHECK(!owner_delegate_);
     owner_delegate_ = owner_delegate;
   }
 
   RenderWidgetOwnerDelegate* owner_delegate() { return owner_delegate_; }
 
   // ScreenInfo exposed so it can be passed to subframe RenderWidgets.
   ScreenInfo screen_info() const { return screen_info_; }
 
+  // Sets whether this RenderWidget has been swapped out to be displayed by
+  // a RenderWidget in a different process.  If so, no new IPC messages will be
+  // sent (only ACKs) and the process is free to exit when there are no other
+  // active RenderWidgets.
+  void SetSwappedOut(bool is_swapped_out);

[nasko, 2016/10/13 21:26:28]

You should reorder the .cc file to match the header file ordering.

[alexmos, 2016/10/14 17:07:38]

Done.  (Though it's not perfect, as many other nearby functions are out of
order.)

+
+  bool is_swapped_out() { return is_swapped_out_; }

[nasko, 2016/10/13 21:26:28]

rant: Ah! I can't wait to kill this boolean. It doesn't even belong on the
widget to begin with.

[alexmos, 2016/10/14 17:07:38]

Acknowledged.

+
   // Manage edit commands to be used for the next keyboard event.
   const EditCommands& edit_commands() const { return edit_commands_; }
   void SetEditCommandForNextKeyEvent(const std::string& name,
                                      const std::string& value);
   void ClearEditCommands();
 
   // Functions to track out-of-process frames for special notifications.
   void RegisterRenderFrameProxy(RenderFrameProxy* proxy);
   void UnregisterRenderFrameProxy(RenderFrameProxy* proxy);
 
@@ skipping 237 matching lines @@
   static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget);
 
   // Initializes this view with the given opener.
   bool Init(int32_t opener_id);
 
   // Called by Init and subclasses to perform initialization.
   bool DoInit(int32_t opener_id,
               blink::WebWidget* web_widget,
               IPC::SyncMessage* create_widget_message);
 
-  // Sets whether this RenderWidget has been swapped out to be displayed by
-  // a RenderWidget in a different process.  If so, no new IPC messages will be
-  // sent (only ACKs) and the process is free to exit when there are no other
-  // active RenderWidgets.
-  void SetSwappedOut(bool is_swapped_out);
-
   // Allows the process to exit once the unload handler has finished, if there
   // are no other active RenderWidgets.
   void WasSwappedOut();
 
   void DoDeferredClose();
   void NotifyOnClose();
 
   gfx::Size GetSizeForWebWidget() const;
   virtual void ResizeWebWidget();
 
@@ skipping 372 matching lines @@
   // Stores edit commands associated to the next key event.
   // Will be cleared as soon as the next key event is processed.
   EditCommands edit_commands_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_