Replace the C-cast used to determine whether the resource handle represent the main resource.
Fix style to match webkit style.
diff --git a/WebCore/platform/network/android/Cookie.cpp b/WebCore/platform/network/android/Cookie.cpp
index 29223d4..3d10e4a 100644
--- a/WebCore/platform/network/android/Cookie.cpp
+++ b/WebCore/platform/network/android/Cookie.cpp
@@ -23,36 +23,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define LOG_TAG "Cookies"
-
#include "config.h"
-#include "JavaSharedClient.h"
+
#include "CookieClient.h"
+#include "JavaSharedClient.h"
using namespace android;
namespace WebCore {
- class Document;
+class Document;
- void setCookies(Document*, const KURL& url, const String& value)
- {
- if (JavaSharedClient::GetCookieClient())
- JavaSharedClient::GetCookieClient()->setCookies(url, value);
- }
+void setCookies(Document*, const KURL& url, const String& value)
+{
+ if (JavaSharedClient::GetCookieClient())
+ JavaSharedClient::GetCookieClient()->setCookies(url, value);
+}
- String cookies(const Document* , const KURL& url)
- {
- if (JavaSharedClient::GetCookieClient())
- return JavaSharedClient::GetCookieClient()->cookies(url);
- return String();
- }
+String cookies(const Document* , const KURL& url)
+{
+ if (JavaSharedClient::GetCookieClient())
+ return JavaSharedClient::GetCookieClient()->cookies(url);
+ return String();
+}
- bool cookiesEnabled(const Document* )
- {
- if (JavaSharedClient::GetCookieClient())
- return JavaSharedClient::GetCookieClient()->cookiesEnabled();
- return false;
- }
+bool cookiesEnabled(const Document* )
+{
+ if (JavaSharedClient::GetCookieClient())
+ return JavaSharedClient::GetCookieClient()->cookiesEnabled();
+ return false;
+}
}
diff --git a/WebCore/platform/network/android/CookieClient.h b/WebCore/platform/network/android/CookieClient.h
index 90f6d48..be2963e 100644
--- a/WebCore/platform/network/android/CookieClient.h
+++ b/WebCore/platform/network/android/CookieClient.h
@@ -33,14 +33,14 @@
namespace android {
- class CookieClient
- {
- public:
- virtual ~CookieClient() {}
- virtual void setCookies(const KURL& url, const String& value) = 0;
- virtual String cookies(const KURL& url) = 0;
- virtual bool cookiesEnabled() = 0;
- };
+class CookieClient {
+
+public:
+ virtual ~CookieClient() {}
+ virtual void setCookies(const KURL& url, const String& value) = 0;
+ virtual String cookies(const KURL& url) = 0;
+ virtual bool cookiesEnabled() = 0;
+};
}
#endif
diff --git a/WebCore/platform/network/android/ResourceError.h b/WebCore/platform/network/android/ResourceError.h
index 03c17cc..072c1ae 100644
--- a/WebCore/platform/network/android/ResourceError.h
+++ b/WebCore/platform/network/android/ResourceError.h
@@ -31,17 +31,12 @@
namespace WebCore {
-class ResourceError : public ResourceErrorBase
-{
+class ResourceError : public ResourceErrorBase {
public:
- ResourceError()
- {
- }
+ ResourceError() { }
ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
- : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
- {
- }
+ : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription) { }
};
}
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index d5d5e5c..60bfc7b 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2007, The Android Open Source Project
+ * Copyright 2009, The Android Open Source Project
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define LOG_TAG "WebCore"
-
#include "config.h"
#include "ResourceHandle.h"
@@ -34,6 +32,7 @@
#include "DocumentLoader.h"
#include "Frame.h"
#include "FrameLoader.h"
+#include "MainResourceLoader.h"
#include "NotImplemented.h"
#include "ResourceHandleClient.h"
#include "ResourceHandleInternal.h"
@@ -51,9 +50,9 @@
bool ResourceHandle::start(Frame* frame)
{
- DocumentLoader* adl = frame->loader()->activeDocumentLoader();
- bool isMainResource =
- ((void*) client()) == ((void*) adl->mainResourceLoader());
+ DocumentLoader* docLoader = frame->loader()->activeDocumentLoader();
+ MainResourceLoader* mainLoader = docLoader->mainResourceLoader();
+ bool isMainResource = (mainLoader->handle() == this);
PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_request, frame->loader()->client(), isMainResource, false);
@@ -73,12 +72,14 @@
PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
{
+ notImplemented();
return 0;
}
bool ResourceHandle::supportsBufferedData()
{
// We don't support buffering data on the native side.
+ notImplemented();
return false;
}
@@ -87,12 +88,10 @@
notImplemented();
}
-/*
-* This static method is called to check to see if a POST response is in
-* the cache. The JNI call through to the HTTP cache stored on the Java
-* side may be slow, but is only used during a navigation to
-* a POST response.
-*/
+// This static method is called to check to see if a POST response is in
+// the cache. The JNI call through to the HTTP cache stored on the Java
+// side may be slow, but is only used during a navigation to
+// a POST response.
bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
{
// set the cache policy correctly, copied from
@@ -112,29 +111,33 @@
// Class to handle synchronized loading of resources.
class SyncLoader : public ResourceHandleClient {
public:
- SyncLoader(ResourceError& error, ResourceResponse& response, WTF::Vector<char>& data) {
+ SyncLoader(ResourceError& error, ResourceResponse& response, WTF::Vector<char>& data)
+ {
m_error = &error;
m_response = &response;
m_data = &data;
}
~SyncLoader() {}
- virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse& response) {
+ virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
+ {
*m_response = response;
}
- virtual void didReceiveData(ResourceHandle*, const char* data, int len, int lengthReceived) {
+ virtual void didReceiveData(ResourceHandle*, const char* data, int len, int lengthReceived)
+ {
m_data->append(data, len);
}
- virtual void didFail(ResourceHandle*, const ResourceError& error) {
+ virtual void didFail(ResourceHandle*, const ResourceError& error)
+ {
*m_error = error;
}
private:
- ResourceError* m_error;
+ ResourceError* m_error;
ResourceResponse* m_response;
- WTF::Vector<char>* m_data;
+ WTF::Vector<char>* m_data;
};
void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request,
diff --git a/WebCore/platform/network/android/ResourceRequest.h b/WebCore/platform/network/android/ResourceRequest.h
index 5e4d349..3102ff1 100644
--- a/WebCore/platform/network/android/ResourceRequest.h
+++ b/WebCore/platform/network/android/ResourceRequest.h
@@ -33,41 +33,30 @@
namespace WebCore {
- struct ResourceRequest : ResourceRequestBase {
+class ResourceRequest : public ResourceRequestBase {
+public:
+ ResourceRequest(const String& url)
+ : ResourceRequestBase(KURL(ParsedURLString, url), UseProtocolCachePolicy), m_userGesture(true) { }
- ResourceRequest(const String& url)
- : ResourceRequestBase(KURL(ParsedURLString, url), UseProtocolCachePolicy)
- , m_userGesture(true)
- {
- }
+ ResourceRequest(const KURL& url) : ResourceRequestBase(url, UseProtocolCachePolicy) , m_userGesture(true) { }
- ResourceRequest(const KURL& url)
- : ResourceRequestBase(url, UseProtocolCachePolicy)
- , m_userGesture(true)
- {
- }
+ ResourceRequest(const KURL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
+ : ResourceRequestBase(url, policy) , m_userGesture(true)
+ {
+ setHTTPReferrer(referrer);
+ }
- ResourceRequest(const KURL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
- : ResourceRequestBase(url, policy)
- , m_userGesture(true)
- {
- setHTTPReferrer(referrer);
- }
-
- ResourceRequest()
- : ResourceRequestBase(KURL(), UseProtocolCachePolicy)
- , m_userGesture(true)
- {
- }
-
- void doUpdatePlatformRequest() {}
- void doUpdateResourceRequest() {}
- void setUserGesture(bool userGesture) { m_userGesture = userGesture; }
- bool getUserGesture() const { return m_userGesture; }
- private:
- friend class ResourceRequestBase;
- bool m_userGesture;
- };
+ ResourceRequest() : ResourceRequestBase(KURL(), UseProtocolCachePolicy), m_userGesture(true) { }
+
+ void doUpdatePlatformRequest() { }
+ void doUpdateResourceRequest() { }
+ void setUserGesture(bool userGesture) { m_userGesture = userGesture; }
+ bool getUserGesture() const { return m_userGesture; }
+
+private:
+ friend class ResourceRequestBase;
+ bool m_userGesture;
+};
} // namespace WebCore
diff --git a/WebCore/platform/network/android/ResourceResponse.h b/WebCore/platform/network/android/ResourceResponse.h
index ede4b38..e6ae2cc 100644
--- a/WebCore/platform/network/android/ResourceResponse.h
+++ b/WebCore/platform/network/android/ResourceResponse.h
@@ -27,23 +27,17 @@
#ifndef ResourceResponse_h
#define ResourceResponse_h
-#include "ResourceResponseBase.h"
-
#include "NotImplemented.h"
+#include "ResourceResponseBase.h"
namespace WebCore {
class ResourceResponse : public ResourceResponseBase {
public:
- ResourceResponse()
- : ResourceResponseBase()
- {
- }
+ ResourceResponse() : ResourceResponseBase() { }
ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
- : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
- {
- }
+ : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename) { }
private:
friend class ResourceResponseBase;
@@ -52,7 +46,6 @@
{
notImplemented();
}
-
};
} // namespace WebCore
