Merge 110556 - Fix next_page_id_ in a NTP forced to share an existing WebUI process.

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 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.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 472 matching lines @@
       renderer_prefs,
       webkit_prefs,
       counter,
       routing_id,
       session_storage_namespace_id,
       frame_name);  // adds reference
 }
 
 // static
 void RenderViewImpl::SetNextPageID(int32 next_page_id) {
-  // This method should only be called during process startup, and the given
-  // page id had better not exceed our current next page id!
-  DCHECK_EQ(next_page_id_, 1);
-  DCHECK(next_page_id >= next_page_id_);
-  next_page_id_ = next_page_id;
+  // This method is called on startup or when the browser knows it needs to
+  // inflate the page_id when re-using the process.  The renderer may have
+  // incremented this just as the browser was sending the message, but we
+  // only care that next_page_id_ is at least as large as next_page_id.
+  if (next_page_id > next_page_id_)
+    next_page_id_ = next_page_id;
 }
 
 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
   observer->RenderViewGone();
   observers_.RemoveObserver(observer);
 }
@@ skipping 4125 matching lines @@
   pepper_delegate_.OnLockMouseACK(succeeded);
 }
 
 void RenderViewImpl::OnMouseLockLost() {
   pepper_delegate_.OnMouseLockLost();
 }
 
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return webview()->settings()->useThreadedCompositor();
 }