Fix detection of RenderViewHosts pending deletion in CreateRenderViewHost.

content/browser/renderer_host/render_view_host_impl.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_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 203 matching lines @@
   base::TerminationStatus render_view_termination_status() const {
     return render_view_termination_status_;
   }
 
   // Tracks whether this RenderViewHost is in an active state (rather than
   // pending swap out, pending deletion, or swapped out), according to its main
   // frame RenderFrameHost.
   bool is_active() const { return is_active_; }
   void set_is_active(bool is_active) { is_active_ = is_active; }
 
+  // Tracks whether this RenderViewHost is pending deletion.  This is tracked
+  // separately from the main frame pending deletion state, because the
+  // RenderViewHost's main frame is cleared when the main frame's
+  // RenderFrameHost is marked for deletion.
+  //
+  // TODO(nasko,alexmos): This should not be necessary once swapped-out is
+  // removed.
+  bool is_pending_deletion() const { return is_pending_deletion_; }
+  void set_pending_deletion() { is_pending_deletion_ = true; }
+
   // Tracks whether this RenderViewHost is swapped out, according to its main
   // frame RenderFrameHost.
   void set_is_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
   }
 
   // TODO(creis): Remove as part of http://crbug.com/418265.
   bool is_waiting_for_close_ack() const { return is_waiting_for_close_ack_; }
 
   // Tells the renderer that this RenderView will soon be swapped out, and thus
@@ skipping 202 matching lines @@
   // The unique ID of the latest NavigationEntry that this RenderViewHost is
   // showing. TODO(avi): Move to RenderFrameHost once PageState is broken up
   // into FrameStates.
   int nav_entry_id_;
 
   // Tracks whether this RenderViewHost is in an active state.  False if the
   // main frame is pending swap out, pending deletion, or swapped out, because
   // it is not visible to the user in any of these cases.
   bool is_active_;
 
+  // True if this RenderViewHost is pending deletion.
+  bool is_pending_deletion_;
+
   // Tracks whether the main frame RenderFrameHost is swapped out.  Unlike
   // is_active_, this is false when the frame is pending swap out or deletion.
   // TODO(creis): Remove this when we no longer use swappedout://.
   // See http://crbug.com/357747.
   bool is_swapped_out_;
 
   // Routing ID for the main frame's RenderFrameHost.
   int main_frame_routing_id_;
 
   // Set to true when waiting for a ViewHostMsg_ClosePageACK.
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_