Avoid a crash in ChromeFrame in the BindToStorage call initiated when our active document is loaded. The crash occurs while dereferencing a

NULL delegate which is the case in the pending request object created by the active document to handle the initial load. 

Fix for this is to maintain a pending state in the request object. We ignore all OnProgress notifications in this state. When Chrome requests
data for the top level url this state is cleared.

Consolidated the number of bind context information structures into one which contains everything we need in ChromeFrame, i.e. to decide to
switch to Chrome, indicating whether the request came from Chrome, etc.

Review URL: http://codereview.chromium.org/1654012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44604 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 1 deletions

diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index 102f67b..589ef93 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.h
@@ -33,7 +33,7 @@ class UrlmonUrlRequest
   // Special function needed by ActiveDocument::Load()
   HRESULT InitPending(const GURL& url, IMoniker* moniker, IBindCtx* bind_ctx,
                       bool enable_frame_busting, bool privileged_mode,
-                      HWND notification_window);
+                      HWND notification_window, IStream* cache);
 
   // Used from "DownloadRequestInHost".
   void StealMoniker(IMoniker** moniker, IBindCtx** bctx);
@@ -102,6 +102,18 @@ class UrlmonUrlRequest
   // IHttpSecurity implementation.
   STDMETHOD(OnSecurityProblem)(DWORD problem);
 
+  void set_pending(bool pending) {
+    pending_ = pending;
+  }
+
+  bool pending() const {
+    return pending_;
+  }
+
+  std::string response_headers() {
+    return response_headers_;
+  }
+
  protected:
   void ReleaseBindings();
 
@@ -260,6 +272,8 @@ class UrlmonUrlRequest
   int calling_delegate_;  // re-entrancy protection.
   // Set to true if the ChromeFrame instance is running in privileged mode.
   bool privileged_mode_;
+  bool pending_;
+  std::string response_headers_;
   DISALLOW_COPY_AND_ASSIGN(UrlmonUrlRequest);
 };