Title: [114328] trunk/Source/WebCore
- Revision
- 114328
- Author
- jap...@chromium.org
- Date
- 2012-04-16 17:47:31 -0700 (Mon, 16 Apr 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114327 => 114328)
--- trunk/Source/WebCore/ChangeLog 2012-04-17 00:35:09 UTC (rev 114327)
+++ trunk/Source/WebCore/ChangeLog 2012-04-17 00:47:31 UTC (rev 114328)
@@ -1,3 +1,20 @@
+2012-04-16 Nate Chapin <jap...@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 <kl...@webkit.org>
Remove contextStyleSheet argument from CSSValuePool::createFontFaceValue().
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (114327 => 114328)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-04-17 00:35:09 UTC (rev 114327)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-04-17 00:47:31 UTC (rev 114328)
@@ -117,7 +117,6 @@
, m_requestCount(0)
, m_garbageCollectDocumentResourcesTimer(this, &CachedResourceLoader::garbageCollectDocumentResourcesTimerFired)
, m_autoLoadImages(true)
- , m_loadFinishing(false)
, m_allowStaleResources(false)
{
}
@@ -681,8 +680,6 @@
void CachedResourceLoader::loadDone()
{
- m_loadFinishing = false;
-
RefPtr<Document> protect(m_document);
if (frame())
frame()->loader()->loadDone();
@@ -747,13 +744,6 @@
--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)
{
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (114327 => 114328)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2012-04-17 00:35:09 UTC (rev 114327)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2012-04-17 00:47:31 UTC (rev 114328)
@@ -104,13 +104,11 @@
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 @@
Timer<CachedResourceLoader> m_garbageCollectDocumentResourcesTimer;
- //29 bits left
+ // 30 bits left
bool m_autoLoadImages : 1;
- bool m_loadFinishing : 1;
bool m_allowStaleResources : 1;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
