Changeset 149199 in webkit

Timestamp:

Apr 26, 2013 11:40:29 AM (11 years ago)

Author:

ap@apple.com

Message:

[WK2] Remove NetworkResourceLoader::cleanupOnMainThread
​https://bugs.webkit.org/show_bug.cgi?id=115268

Reviewed by Brady Eidson.

All cleanup() callers are now on main thread, and this indirection only complicates debugging.

• NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::connectionToWebProcessDidClose): (WebKit::NetworkResourceLoader::abortInProgressLoad): (WebKit::NetworkResourceLoader::didFinishLoading): (WebKit::NetworkResourceLoader::didFail):
• NetworkProcess/NetworkResourceLoader.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (5 diffs)
• NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-26  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] Remove NetworkResourceLoader::cleanupOnMainThread
+        https://bugs.webkit.org/show_bug.cgi?id=115268
+
+        Reviewed by Brady Eidson.
+
+        All cleanup() callers are now on main thread, and this indirection only complicates debugging.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::connectionToWebProcessDidClose):
+        (WebKit::NetworkResourceLoader::abortInProgressLoad):
+        (WebKit::NetworkResourceLoader::didFinishLoading):
+        (WebKit::NetworkResourceLoader::didFail):
+        * NetworkProcess/NetworkResourceLoader.h:
+
 2013-04-26  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -91 +91 @@
 }
 
-static bool performCleanupsCalled = false;
-
-static Mutex& requestsToCleanupMutex()
-{
-    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
-    return mutex;
-}
-
-static HashSet<NetworkResourceLoader*>& requestsToCleanup()
-{
-    DEFINE_STATIC_LOCAL(HashSet<NetworkResourceLoader*>, requests, ());
-    return requests;
-}
-
-void NetworkResourceLoader::scheduleCleanupOnMainThread()
-{
-    MutexLocker locker(requestsToCleanupMutex());
-
-    requestsToCleanup().add(this);
-    if (!performCleanupsCalled) {
-        performCleanupsCalled = true;
-        callOnMainThread(NetworkResourceLoader::performCleanups, 0);
-    }
-}
-
-void NetworkResourceLoader::performCleanups(void*)
-{
-    ASSERT(performCleanupsCalled);
-
-    Vector<NetworkResourceLoader*> requests;
-    {
-        MutexLocker locker(requestsToCleanupMutex());
-        copyToVector(requestsToCleanup(), requests);
-        requestsToCleanup().clear();
-        performCleanupsCalled = false;
-    }
-    
-    for (size_t i = 0; i < requests.size(); ++i)
-        requests[i]->cleanup();
-}
-
 void NetworkResourceLoader::cleanup()
 {
@@ -159 +118 @@
         return;
 
-#if !ASSERT_DISABLED
-    // Since there's no handle, this loader should never have been started, and therefore it should never be in the
-    // set of loaders to cleanup on the main thread.
-    // Let's make sure that's true.
-    {
-        MutexLocker locker(requestsToCleanupMutex());
-        ASSERT(!requestsToCleanup().contains(this));
-    }
-#endif
-
     cleanup();
 }
@@ -195 +144 @@
     m_handle->cancel();
 
-    scheduleCleanupOnMainThread();
+    cleanup();
 }
 
@@ -249 +198 @@
     send(Messages::WebResourceLoader::DidFinishResourceLoad(finishTime));
     
-    scheduleCleanupOnMainThread();
+    cleanup();
 }
 
@@ -258 +207 @@
     invalidateSandboxExtensions();
     send(Messages::WebResourceLoader::DidFailResourceLoad(error));
-    scheduleCleanupOnMainThread();
+    cleanup();
 }
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

@@ -112 +112 @@
 #endif
 
-    void scheduleCleanupOnMainThread();
-    static void performCleanups(void*);
     void cleanup();