From e458d70a0d18538346f41b503114c9ebe6b2ce12 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 15 Jul 2010 12:03:35 +0100
Subject: Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
---
 WebCore/platform/network/ResourceResponseBase.cpp | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'WebCore/platform/network/ResourceResponseBase.cpp')

diff --git a/WebCore/platform/network/ResourceResponseBase.cpp b/WebCore/platform/network/ResourceResponseBase.cpp
index 607cd7f..89d31d7 100644
--- a/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/WebCore/platform/network/ResourceResponseBase.cpp
@@ -43,6 +43,8 @@ ResourceResponseBase::ResourceResponseBase()
     : m_expectedContentLength(0)
     , m_httpStatusCode(0)
     , m_lastModifiedDate(0)
+    , m_wasCached(false)
+    , m_connectionID(0)
     , m_isNull(true)
     , m_haveParsedCacheControlHeader(false)
     , m_haveParsedAgeHeader(false)
@@ -68,6 +70,8 @@ ResourceResponseBase::ResourceResponseBase(const KURL& url, const String& mimeTy
     , m_suggestedFilename(filename)
     , m_httpStatusCode(0)
     , m_lastModifiedDate(0)
+    , m_wasCached(false)
+    , m_connectionID(0)
     , m_isNull(false)
     , m_haveParsedCacheControlHeader(false)
     , m_haveParsedAgeHeader(false)
@@ -455,6 +459,32 @@ time_t ResourceResponseBase::lastModifiedDate() const
     return m_lastModifiedDate;
 }
 
+bool ResourceResponseBase::wasCached() const
+{
+    lazyInit();
+
+    return m_wasCached;
+}
+
+void ResourceResponseBase::setWasCached(bool value)
+{
+    m_wasCached = value;
+}
+
+unsigned ResourceResponseBase::connectionID() const
+{
+    lazyInit();
+
+    return m_connectionID;
+}
+
+void ResourceResponseBase::setConnectionID(unsigned connectionID)
+{
+    lazyInit();
+
+    m_connectionID = connectionID;
+}
+
 ResourceLoadTiming* ResourceResponseBase::resourceLoadTiming() const
 {
     lazyInit();
-- 
cgit v1.1