Merge 124682

Source/WebCore/platform/network/chromium/ResourceResponse.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2008 Google, Inc.
+ * Copyright (C) 2012 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
@@ skipping 102 matching lines @@
         const File* downloadedFile() const { return m_downloadedFile.get(); }
         void setDownloadedFile(PassRefPtr<File> downloadedFile) { m_downloadedFile = downloadedFile; }
 
         // Extra data associated with this response.
         ExtraData* extraData() const { return m_extraData.get(); }
         void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; }
 
     private:
         friend class ResourceResponseBase;
 
-        // An opaque value that contains some information regarding the security of
-        // the connection for this request, such as SSL connection info (empty
-        // string if not over HTTPS).
-        CString m_securityInfo;
-
         void doUpdateResourceResponse()
         {
             notImplemented();
         }
 
         PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData>) const;
         void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>);
 
+        // An opaque value that contains some information regarding the security of
+        // the connection for this request, such as SSL connection info (empty
+        // string if not over HTTPS).
+        CString m_securityInfo;
+
         // HTTP version used in the response, if known.
         HTTPVersion m_httpVersion;
 
         // The id of the appcache this response was retrieved from, or zero if
         // the response was not retrieved from an appcache.
         long long m_appCacheID;
 
         // The manifest url of the appcache this response was retrieved from, if any.
         // Note: only valid for main resource responses.
         KURL m_appCacheManifestURL;
@@ skipping 25 matching lines @@
         unsigned short m_remotePort;
 
         // The downloaded file if the load streamed to a file.
         RefPtr<File> m_downloadedFile;
 
         // ExtraData associated with the response.
         RefPtr<ExtraData> m_extraData;
     };
 
     struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {
+        CString m_securityInfo;
+        ResourceResponse::HTTPVersion m_httpVersion;
         long long m_appCacheID;
         KURL m_appCacheManifestURL;
         bool m_isMultipartPayload;
         bool m_wasFetchedViaSPDY;
         bool m_wasNpnNegotiated;
         bool m_wasAlternateProtocolAvailable;
         bool m_wasFetchedViaProxy;
         double m_responseTime;
         String m_remoteIPAddress;
         unsigned short m_remotePort;
         String m_downloadFilePath;
     };
 
 } // namespace WebCore
 
 #endif