Changes session restore to use a normal load rather than preferring...

chrome/common/render_messages.h

 // Copyright (c) 2009 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 CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <string>
 #include <vector>
 #include <map>
@@ skipping 50 matching lines @@
 
 namespace base {
 class Time;
 }
 
 class SkBitmap;
 
 // Parameters structure for ViewMsg_Navigate, which has too many data
 // parameters to be reasonably put in a predefined IPC message.
 struct ViewMsg_Navigate_Params {
+  enum NavigationType {
+    // Reload the page.
+    RELOAD,
+
+    // The navigation is the result of session restore and should honor the
+    // page's cache policy while restoring form state. This is set to true if
+    // restoring a tab/session from the previous session and the previous
+    // session did not crash. If this is not set and the page was restored then
+    // the page's cache policy is ignored and we load from the cache.
+    RESTORE,
+
+    // Navigation type not categorized by the other types.
+    NORMAL
+  };
+
   // The page_id for this navigation, or -1 if it is a new navigation.  Back,
   // Forward, and Reload navigations should have a valid page_id.  If the load
   // succeeds, then this page_id will be reflected in the resultant
   // ViewHostMsg_FrameNavigate message.
   int32 page_id;
 
   // The URL to load.
   GURL url;
 
   // The URL to send in the "Referer" header field. Can be empty if there is
   // no referrer.
   GURL referrer;
 
   // The type of transition.
   PageTransition::Type transition;
 
   // Opaque history state (received by ViewHostMsg_UpdateState).
   std::string state;
 
-  // Specifies if the URL should be loaded using 'reload' semantics (i.e.,
-  // bypassing any locally cached content).
-  bool reload;
+  // Type of navigation.
+  NavigationType navigation_type;
 
   // The time the request was created
   base::Time request_time;
 };
 
 // Current status of the audio output stream in the browser process. Browser
 // sends information about the current playback state and error to the
 // renderer process using this type.
 struct ViewMsg_AudioStreamState {
   enum State {
@@ skipping 555 matching lines @@
 // Traits for ViewMsg_Navigate_Params structure to pack/unpack.
 template <>
 struct ParamTraits<ViewMsg_Navigate_Params> {
   typedef ViewMsg_Navigate_Params param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.page_id);
     WriteParam(m, p.url);
     WriteParam(m, p.referrer);
     WriteParam(m, p.transition);
     WriteParam(m, p.state);
-    WriteParam(m, p.reload);
+    WriteParam(m, p.navigation_type);
     WriteParam(m, p.request_time);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
       ReadParam(m, iter, &p->page_id) &&
       ReadParam(m, iter, &p->url) &&
       ReadParam(m, iter, &p->referrer) &&
       ReadParam(m, iter, &p->transition) &&
       ReadParam(m, iter, &p->state) &&
-      ReadParam(m, iter, &p->reload) &&
+      ReadParam(m, iter, &p->navigation_type) &&
       ReadParam(m, iter, &p->request_time);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
     LogParam(p.page_id, l);
     l->append(L", ");
     LogParam(p.url, l);
     l->append(L", ");
     LogParam(p.transition, l);
     l->append(L", ");
     LogParam(p.state, l);
     l->append(L", ");
-    LogParam(p.reload, l);
+    LogParam(p.navigation_type, l);
     l->append(L", ");
     LogParam(p.request_time, l);
     l->append(L")");
   }
 };
 
+template<>
+struct ParamTraits<ViewMsg_Navigate_Params::NavigationType> {
+  typedef ViewMsg_Navigate_Params::NavigationType param_type;
+  static void Write(Message* m, const param_type& p) {
+    m->WriteInt(p);
+  }
+  static bool Read(const Message* m, void** iter, param_type* p) {
+    int type;
+    if (!m->ReadInt(iter, &type))
+      return false;
+    *p = static_cast<ViewMsg_Navigate_Params::NavigationType>(type);
+    return true;
+  }
+  static void Log(const param_type& p, std::wstring* l) {
+    std::wstring event;
+    switch (p) {
+      case ViewMsg_Navigate_Params::RELOAD:
+        event = L"NavigationType_RELOAD";
+        break;
+
+      case ViewMsg_Navigate_Params::RESTORE:
+        event = L"NavigationType_RESTORE";
+        break;
+
+      case ViewMsg_Navigate_Params::NORMAL:
+        event = L"NavigationType_NORMAL";
+        break;
+
+      default:
+        event = L"NavigationType_UNKNOWN";
+        break;
+    }
+    LogParam(event, l);
+  }
+};
+
 // Traits for PasswordForm_Params structure to pack/unpack.
 template <>
 struct ParamTraits<webkit_glue::PasswordForm> {
   typedef webkit_glue::PasswordForm param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.signon_realm);
     WriteParam(m, p.origin);
     WriteParam(m, p.action);
     WriteParam(m, p.submit_element);
     WriteParam(m, p.username_element);
@@ skipping 1447 matching lines @@
   }
 };
 
 }  // namespace IPC
 
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_