Changeset 91081 in webkit

Timestamp:

Jul 15, 2011 11:38:14 AM (13 years ago)

Author:

psolanki@apple.com

Message:

Part of ​https://bugs.webkit.org/show_bug.cgi?id=63674
Get webkit to compile with USE(CFNETWORK) enabled on Mac

Reviewed by David Kilzer.

Get LoaderRunLoop to work on Mac when USE(CFNETWORK) is enabled. Although we could use the
main run loop, it's better to have a separate thread handling the loads so that it can work
in parallel to the main thread. This is similar to what NSURLConnection does for us
internally when we use the NS APIs.

No new tests because no change in functionality and option is not enabled on Mac.

• platform/network/cf/LoaderRunLoopCF.cpp:

(WebCore::runLoaderThread): Create an autorelease pool for objc code that might be called in
the run loop.
(WebCore::loaderRunLoop):

• platform/network/cf/LoaderRunLoopCF.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/LoaderRunLoopCF.cpp (modified) (3 diffs)
• platform/network/cf/LoaderRunLoopCF.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-15  Pratik Solanki  <psolanki@apple.com>
+
+        Part of https://bugs.webkit.org/show_bug.cgi?id=63674
+        Get webkit to compile with USE(CFNETWORK) enabled on Mac
+
+        Reviewed by David Kilzer.
+
+        Get LoaderRunLoop to work on Mac when USE(CFNETWORK) is enabled. Although we could use the
+        main run loop, it's better to have a separate thread handling the loads so that it can work
+        in parallel to the main thread. This is similar to what NSURLConnection does for us
+        internally when we use the NS APIs.
+
+        No new tests because no change in functionality and option is not enabled on Mac.
+
+        * platform/network/cf/LoaderRunLoopCF.cpp:
+        (WebCore::runLoaderThread): Create an autorelease pool for objc code that might be called in
+        the run loop.
+        (WebCore::loaderRunLoop):
+        * platform/network/cf/LoaderRunLoopCF.h:
+
 2011-07-15  Xiaomei Ji  <xji@chromium.org>
 

trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.cpp

@@ -29 +29 @@
 #if USE(CFNETWORK)
 
+#include "AutodrainedPool.h"
 #include <CoreFoundation/CoreFoundation.h>
+#include <limits>
 #include <wtf/Threading.h>
 
@@ -49 +51 @@
     CFRunLoopAddSource(loaderRunLoopObject, bogusSource, kCFRunLoopDefaultMode);
 
-    CFRunLoopRun();
+    SInt32 result;
+    do {
+        AutodrainedPool pool;
+        result = CFRunLoopRunInMode(kCFRunLoopDefaultMode, std::numeric_limits<double>::max(), true);
+    } while (result != kCFRunLoopRunStopped && result != kCFRunLoopRunFinished);
 
     return 0;
@@ -60 +66 @@
         createThread(runLoaderThread, 0, "WebCore: CFNetwork Loader");
         while (!loaderRunLoopObject) {
-            // FIXME: Sleep 10? that can't be right...
+            // FIXME: <http://webkit.org/b/55402> - loaderRunLoop() should use synchronization instead of while loop
+#if PLATFORM(WIN)
             Sleep(10);
+#else
+            struct timespec sleepTime = { 0, 10 * 1000 * 1000 };
+            nanosleep(&sleepTime, 0);
+#endif
         }
     }

trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.h

@@ -29 +29 @@
 #if USE(CFNETWORK)
 
-#if !PLATFORM(WIN)
-#error This code is not needed on platforms other than Windows, because the CFRunLoop from the main thread can be used.
-#endif
-
 typedef struct __CFRunLoop* CFRunLoopRef;