From a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 25 May 2012 15:09:11 +0200
Subject: Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878
 (http://svn.webkit.org/repository/webkit/trunk@118516)

---
 Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp | 5 +++--
 Source/WebCore/loader/cache/CachedCSSStyleSheet.h   | 8 ++++----
 Source/WebCore/loader/cache/CachedResource.h        | 1 -
 Source/WebCore/loader/cache/MemoryCache.h           | 3 ---
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'Source/WebCore/loader/cache')

diff --git a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
index ea3d04aef..2dbe75e54 100644
--- a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
+++ b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
@@ -33,6 +33,7 @@
 #include "HTTPParsers.h"
 #include "MemoryCache.h"
 #include "SharedBuffer.h"
+#include "StyleSheetContents.h"
 #include "TextResourceDecoder.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
@@ -164,7 +165,7 @@ void CachedCSSStyleSheet::destroyDecodedData()
     setDecodedSize(0);
 }
 
-PassRefPtr<StyleSheetInternal> CachedCSSStyleSheet::restoreParsedStyleSheet(const CSSParserContext& context)
+PassRefPtr<StyleSheetContents> CachedCSSStyleSheet::restoreParsedStyleSheet(const CSSParserContext& context)
 {
     if (!m_parsedStyleSheetCache)
         return 0;
@@ -180,7 +181,7 @@ PassRefPtr<StyleSheetInternal> CachedCSSStyleSheet::restoreParsedStyleSheet(cons
     return m_parsedStyleSheetCache;
 }
 
-void CachedCSSStyleSheet::saveParsedStyleSheet(PassRefPtr<StyleSheetInternal> sheet)
+void CachedCSSStyleSheet::saveParsedStyleSheet(PassRefPtr<StyleSheetContents> sheet)
 {
     ASSERT(sheet && sheet->isCacheable());
 
diff --git a/Source/WebCore/loader/cache/CachedCSSStyleSheet.h b/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
index eb58298ac..b70f265dd 100644
--- a/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
+++ b/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
@@ -33,7 +33,7 @@ namespace WebCore {
 
     class CachedResourceClient;
     class SharedBuffer;
-    class StyleSheetInternal;
+    class StyleSheetContents;
     class TextResourceDecoder;
     struct CSSParserContext;
 
@@ -57,8 +57,8 @@ namespace WebCore {
 
         void checkNotify();
 
-        PassRefPtr<StyleSheetInternal> restoreParsedStyleSheet(const CSSParserContext&);
-        void saveParsedStyleSheet(PassRefPtr<StyleSheetInternal>);
+        PassRefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&);
+        void saveParsedStyleSheet(PassRefPtr<StyleSheetContents>);
     
     private:
         bool canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const;
@@ -68,7 +68,7 @@ namespace WebCore {
         RefPtr<TextResourceDecoder> m_decoder;
         String m_decodedSheetText;
 
-        RefPtr<StyleSheetInternal> m_parsedStyleSheetCache;
+        RefPtr<StyleSheetContents> m_parsedStyleSheetCache;
     };
 
 }
diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h
index 911f850e8..b4f55c084 100644
--- a/Source/WebCore/loader/cache/CachedResource.h
+++ b/Source/WebCore/loader/cache/CachedResource.h
@@ -170,7 +170,6 @@ public:
     void setInCache(bool inCache) { m_inCache = inCache; }
     bool inCache() const { return m_inCache; }
     
-    void setInLiveDecodedResourcesList(bool b) { m_inLiveDecodedResourcesList = b; }
     bool inLiveDecodedResourcesList() { return m_inLiveDecodedResourcesList; }
     
     void stopLoading();
diff --git a/Source/WebCore/loader/cache/MemoryCache.h b/Source/WebCore/loader/cache/MemoryCache.h
index 2538214cd..6f9832662 100644
--- a/Source/WebCore/loader/cache/MemoryCache.h
+++ b/Source/WebCore/loader/cache/MemoryCache.h
@@ -135,9 +135,6 @@ public:
     void setDeadDecodedDataDeletionInterval(double interval) { m_deadDecodedDataDeletionInterval = interval; }
     double deadDecodedDataDeletionInterval() const { return m_deadDecodedDataDeletionInterval; }
 
-    void addCachedResourceLoader(CachedResourceLoader*);
-    void removeCachedResourceLoader(CachedResourceLoader*);
-
     // Calls to put the cached resource into and out of LRU lists.
     void insertInLRUList(CachedResource*);
     void removeFromLRUList(CachedResource*);
-- 
cgit v1.2.1