Remove unused variable CachedResourceLoader::m_loadFinishing

https://bugs.webkit.org/show_bug.cgi?id=84100

Reviewed by Alexey Proskuryakov.

No new tests, removing dead code.

* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::CachedResourceLoader):
(WebCore::CachedResourceLoader::loadDone):
(WebCore::CachedResourceLoader::decrementRequestCount):
* loader/cache/CachedResourceLoader.h:
(CachedResourceLoader):
(WebCore::CachedResourceLoader::requestCount):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2e28af6..f337244 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-04-16  Nate Chapin  <japhet@chromium.org>
+
+        Remove unused variable CachedResourceLoader::m_loadFinishing
+        https://bugs.webkit.org/show_bug.cgi?id=84100
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, removing dead code.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::CachedResourceLoader):
+        (WebCore::CachedResourceLoader::loadDone):
+        (WebCore::CachedResourceLoader::decrementRequestCount):
+        * loader/cache/CachedResourceLoader.h:
+        (CachedResourceLoader):
+        (WebCore::CachedResourceLoader::requestCount):
+
 2012-04-16  Andreas Kling  <kling@webkit.org>
 
         Remove contextStyleSheet argument from CSSValuePool::createFontFaceValue().

diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 9e9e410..846f3a7 100644 (file)
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -117,7 +117,6 @@ CachedResourceLoader::CachedResourceLoader(Document* document)
     , m_requestCount(0)
     , m_garbageCollectDocumentResourcesTimer(this, &CachedResourceLoader::garbageCollectDocumentResourcesTimerFired)
     , m_autoLoadImages(true)
-    , m_loadFinishing(false)
     , m_allowStaleResources(false)
 {
 }
@@ -681,8 +680,6 @@ void CachedResourceLoader::removeCachedResource(CachedResource* resource) const
 
 void CachedResourceLoader::loadDone()
 {
-    m_loadFinishing = false;
-
     RefPtr<Document> protect(m_document);
     if (frame())
         frame()->loader()->loadDone();
@@ -747,13 +744,6 @@ void CachedResourceLoader::decrementRequestCount(const CachedResource* res)
     --m_requestCount;
     ASSERT(m_requestCount > -1);
 }
-
-int CachedResourceLoader::requestCount()
-{
-    if (m_loadFinishing)
-         return m_requestCount + 1;
-    return m_requestCount;
-}
     
 void CachedResourceLoader::preload(CachedResource::Type type, ResourceRequest& request, const String& charset, bool referencedFromBody)
 {

diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
index e5d52cf..b8bdaca 100644 (file)
--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
@@ -104,13 +104,11 @@ public:
     Document* document() const { return m_document; }
 
     void removeCachedResource(CachedResource*) const;
-
-    void loadFinishing() { m_loadFinishing = true; }
     void loadDone();
     
     void incrementRequestCount(const CachedResource*);
     void decrementRequestCount(const CachedResource*);
-    int requestCount();
+    int requestCount() const { return m_requestCount; }
 
     bool isPreloaded(const String& urlString) const;
     void clearPreloads();
@@ -151,9 +149,8 @@ private:
 
     Timer<CachedResourceLoader> m_garbageCollectDocumentResourcesTimer;
 
-    //29 bits left
+    // 30 bits left
     bool m_autoLoadImages : 1;
-    bool m_loadFinishing : 1;
     bool m_allowStaleResources : 1;
 };