Commit e0bfe232 authored by bdash's avatar bdash
Browse files

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-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: http://svn.webkit.org/repository/webkit/trunk@17055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8a2bb060
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.
......
......@@ -180,4 +180,8 @@
#define KXMLCORE_USE_WININET 1
#endif
#if PLATFORM(GDK)
#define KXMLCORE_USE_CURL 1
#endif
#endif /* KXMLCORE_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):
2006-10-13 Beth Dakin <bdakin@apple.com>
 
Reviewed by Geoff.
......@@ -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)
......
......@@ -39,7 +39,7 @@ class FrameGdk;
class FrameGdkClient {
public:
virtual ~FrameGdkClient() = 0;
virtual ~FrameGdkClient() {};
virtual void setFrame(const FrameGdk*) = 0;
......
......@@ -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) {
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment