Fix RenderView reuse issues when canceling a pending RenderFrameHost.

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index bcbdffbd953eb31fe8d7caec5a59ae82035b6791..597bb79c6fdceaf79cd7e115e6b2d3e563142208 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -164,7 +164,6 @@ class CONTENT_EXPORT RenderWidget
   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_;
   }
@@ -182,6 +181,14 @@ class CONTENT_EXPORT RenderWidget
   // 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,
@@ -439,12 +446,6 @@ class CONTENT_EXPORT RenderWidget
               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();