2006-10-14 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Oct 2006 09:39:55 +0000 (09:39 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Oct 2006 09:39:55 +0000 (09:39 +0000)
        Reviewed by Maciej.

        Define KXMLCORE_USE_CURL for platforms that wish to use CURL as
        networking, and set it for GDK build

        * wtf/Platform.h:

2006-10-14  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>

        Reviewed by Maciej.

        Fix GDK build by defining FrameGdkClient() constructor as non-virtual.
        Pure virtual classes require non-pure destructor, who knew.

        Make CURL networking dependent on USE(CURL) instead of PLATFORM(GDK),
        so that other platforms can also use CURL, if they wish.

        Silence compiler warning about unused variable in SharedTimerLinux.cpp

        * platform/ResourceLoaderInternal.h:
        (WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
        * platform/gdk/FrameGdk.h:
        (WebCore::FrameGdkClient::~FrameGdkClient):
        * platform/gdk/ResourceLoaderManager.cpp:
        (WebCore::ResourceLoaderManager::downloadTimerCallback):
        * platform/gdk/SharedTimerLinux.cpp:
        (WebCore::stopSharedTimer):

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

JavaScriptCore/ChangeLog
JavaScriptCore/wtf/Platform.h
WebCore/ChangeLog
WebCore/platform/ResourceLoaderInternal.h
WebCore/platform/gdk/FrameGdk.h
WebCore/platform/gdk/ResourceLoaderManager.cpp
WebCore/platform/gdk/SharedTimerLinux.cpp

index 1eba5e37d53587765011ce22f755c0929304f49c..2e42ffbf8d93c627a487986cd443d75507c43aaf 100644 (file)
@@ -1,3 +1,12 @@
+2006-10-14  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
+
+        Reviewed by Maciej.
+
+        Define KXMLCORE_USE_CURL for platforms that wish to use CURL as
+        networking, and set it for GDK build
+
+        * wtf/Platform.h:
+
 2006-10-13  Marvin Decker  <marv.decker@gmail.com>
 
         Reviewed by Kevin McCullough.
index 4f68b9fcae4e07d60adafa77c4040d2b839877e3..a47420ce70647542843069ac6266428ed84250fb 100644 (file)
 #define KXMLCORE_USE_WININET 1
 #endif
 
+#if PLATFORM(GDK)
+#define KXMLCORE_USE_CURL 1
+#endif
+
 #endif /* KXMLCORE_PLATFORM_H */
index bbe96b5b4359d5674f08be6c4aa607ccb5372a9e..9909ebf5823caa89ae204d7fd735607f901cba40 100644 (file)
@@ -1,3 +1,24 @@
+2006-10-14  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
+
+        Reviewed by Maciej.
+
+        Fix GDK build by defining FrameGdkClient() constructor as non-virtual.
+        Pure virtual classes require non-pure destructor, who knew.
+
+        Make CURL networking dependent on USE(CURL) instead of PLATFORM(GDK),
+        so that other platforms can also use CURL, if they wish.
+
+        Silence compiler warning about unused variable in SharedTimerLinux.cpp
+
+        * platform/ResourceLoaderInternal.h:
+        (WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
+        * platform/gdk/FrameGdk.h:
+        (WebCore::FrameGdkClient::~FrameGdkClient):
+        * platform/gdk/ResourceLoaderManager.cpp:
+        (WebCore::ResourceLoaderManager::downloadTimerCallback):
+        * platform/gdk/SharedTimerLinux.cpp:
+        (WebCore::stopSharedTimer):
+
 2006-10-13  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Geoff.
index 251ce301f4d6942fe180edbaf70a2eb4c2c1030a..81d97642b6c0512057fbb655e49bfb093b89e1d6 100644 (file)
@@ -41,7 +41,7 @@
 #include <windows.h>
 #endif
 
-#if PLATFORM(GDK)
+#if USE(CURL)
 typedef void CURL;
 #endif
 
@@ -87,7 +87,7 @@ namespace WebCore {
             , m_hasReceivedResponse(false)
             , m_resend(false)
 #endif
-#if PLATFORM(GDK)
+#if USE(CURL)
             , m_handle(0)
 #endif
         {
@@ -123,7 +123,7 @@ namespace WebCore {
             , m_hasReceivedResponse(false)
             , m_resend(false)
 #endif
-#if PLATFORM(GDK)
+#if USE(CURL)
             , m_handle(0)
 #endif
         {
@@ -167,7 +167,7 @@ namespace WebCore {
         bool m_hasReceivedResponse;
         bool m_resend;
 #endif
-#if PLATFORM(GDK)
+#if USE(CURL)
         CURL *m_handle;
 #endif
 #if PLATFORM(QT)
index 912ccdc7a5d1f048490339cc9fc3c4fab98a371d..5f3e87398013b571faf86aea184b5941880ca069 100644 (file)
@@ -39,7 +39,7 @@ class FrameGdk;
 
 class FrameGdkClient {
 public:
-    virtual ~FrameGdkClient() = 0;
+    virtual ~FrameGdkClient() {};
 
     virtual void setFrame(const FrameGdk*) = 0;
 
index ec1aa6e8d62bf6bfe00e956d91449594f6b80df1..19ab22e0db6f279799caabef47b50bd23d77bbcc 100644 (file)
@@ -122,7 +122,6 @@ void ResourceLoaderManager::downloadTimerCallback(Timer<ResourceLoaderManager>*
 
         // check the curl messages indicating completed transfers
         // and free their resources
-        ResourceLoader* job;
         int nmsgs;
         while (CURLMsg* msg = curl_multi_info_read(curlMultiHandle, &nmsgs)) {
             if (msg->msg == CURLMSG_DONE) {
index f3178587f320fec7985fe67d179225dd0b6e6af5..fba0c028863a1416913c49489fa293dd07a84d71 100644 (file)
@@ -71,10 +71,11 @@ void setSharedTimerFireTime(double fireTime)
 
 void stopSharedTimer()
 {
+    gboolean s = FALSE;
     if (sharedTimer == 0)
         return;
 
-    gboolean s = g_source_remove(sharedTimer);
+    s = g_source_remove(sharedTimer);
     ASSERT(s);
     sharedTimer = 0;
 }