Changeset 89323 in webkit

Timestamp:

Jun 20, 2011 6:00:18 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-20 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Remove numRequests
​https://bugs.webkit.org/show_bug.cgi?id=63028

numRequests exists just to cargo-cult null-check m_frame->document(),
which is always non-null.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::checkCompleted): (WebCore::FrameLoader::numPendingOrLoadingRequests):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-20  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Remove numRequests
+        https://bugs.webkit.org/show_bug.cgi?id=63028
+
+        numRequests exists just to cargo-cult null-check m_frame->document(),
+        which is always non-null.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkCompleted):
+        (WebCore::FrameLoader::numPendingOrLoadingRequests):
+
 2011-06-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -157 +157 @@
 }
 
-static int numRequests(Document* document)
-{
-    if (!document)
-        return 0;
-    
-    return document->cachedResourceLoader()->requestCount();
-}
-
 // This is not in the FrameLoader class to emphasize that it does not depend on
 // private FrameLoader data, and to avoid increasing the number of public functions
@@ -723 +715 @@
 
     // Still waiting for images/scripts?
-    if (numRequests(m_frame->document()))
+    if (m_frame->document()->cachedResourceLoader()->requestCount())
         return;
 
@@ -2401 +2393 @@
 {
     if (!recurse)
-        return numRequests(m_frame->document());
+        return m_frame->document()->cachedResourceLoader()->requestCount();
 
     int count = 0;
     for (Frame* frame = m_frame; frame; frame = frame->tree()->traverseNext(m_frame))
-        count += numRequests(frame->document());
+        count += frame->document()->cachedResourceLoader()->requestCount();
     return count;
 }