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

content/renderer/render_thread_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_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 646 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache)
     IPC_MESSAGE_HANDLER(ViewMsg_NetworkStateChanged, OnNetworkStateChanged)
     IPC_MESSAGE_HANDLER(DOMStorageMsg_Event, OnDOMStorageEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_TempCrashWithData, OnTempCrashWithData)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RenderThreadImpl::OnSetNextPageID(int32 next_page_id) {
-  // This should only be called at process initialization time, so we shouldn't
-  // have to worry about thread-safety.
+  // This is called at process initialization time or when this process is
+  // being re-used for a new RenderView.  It is ok if another RenderView
+  // has identical page_ids or inflates next_page_id_ just before this arrives,
+  // as long as we ensure next_page_id_ is at least this large.
   RenderViewImpl::SetNextPageID(next_page_id);
 }
 
 // Called when to register CSS Color name->system color mappings.
 // We update the colors one by one and then tell WebKit to refresh all render
 // views.
 void RenderThreadImpl::OnSetCSSColors(
     const std::vector<CSSColors::CSSColorMapping>& colors) {
   EnsureWebKitInitialized();
   size_t num_colors = colors.size();
@@ skipping 99 matching lines @@
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
 }