diff options
Diffstat (limited to 'www/webkit-gtk2/files')
8 files changed, 17 insertions, 384 deletions
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h index dc03dce02dc1..8bb6f17ce64b 100644 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h @@ -1,11 +1,11 @@ ---- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400 -+++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400 -@@ -69,7 +69,7 @@ public: - - template<typename FunctionType> - explicit FunctionPtr(FunctionType* value) +--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2010-01-14 15:19:17.000000000 +0000 ++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2010-01-14 15:21:00.000000000 +0000 +@@ -74,7 +74,7 @@ public: + // Error: #694: reinterpret_cast cannot cast away const or other type qualifiers + : m_value((void*)(value)) + #else - : m_value(reinterpret_cast<void*>(value)) + : m_value((void*)(value)) + #endif { ASSERT_VALID_CODE_POINTER(m_value); - } diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp deleted file mode 100644 index 6e6ffe831486..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400 -+++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500 -@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); -@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h deleted file mode 100644 index 4d4a76bce3f0..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h +++ /dev/null @@ -1,65 +0,0 @@ ---- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400 -+++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400 -@@ -36,7 +36,7 @@ namespace JSC { - public: - JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -44,7 +44,7 @@ namespace JSC { - - JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -52,7 +52,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(VoidPtr) - , m_stackIndex(stackIndexStart) - { -@@ -60,7 +60,7 @@ namespace JSC { - - JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -68,7 +68,7 @@ namespace JSC { - - JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -76,7 +76,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Void) - , m_stackIndex(stackIndexStart) - { -@@ -85,7 +85,7 @@ namespace JSC { - #if USE(JSVALUE32_64) - JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Value) - , m_stackIndex(stackIndexStart) - { diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp deleted file mode 100644 index 59229e8bc82e..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400 -+++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400 -@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_ - - if (!handler) { - *stackFrame.exception = exceptionValue; -- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught)); -+ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught)); - return JSValue::encode(jsNull()); - } - diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h index b2fc49091d85..9c32953b9c91 100644 --- a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h +++ b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h @@ -1,24 +1,14 @@ ---- JavaScriptCore/runtime/JSValue.h.orig 2010-03-24 09:42:34.000000000 +0100 -+++ JavaScriptCore/runtime/JSValue.h 2010-03-24 09:44:47.000000000 +0100 -@@ -464,13 +464,21 @@ - inline JSValue::JSValue(JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) +--- JavaScriptCore/runtime/JSValue.h.orig 2010-02-05 17:26:52.000000000 +0100 ++++ JavaScriptCore/runtime/JSValue.h 2010-03-25 21:43:11.000000000 +0100 +@@ -491,7 +491,11 @@ namespace JSC { + u.asBits.tag = CellTag; + else + u.asBits.tag = EmptyValueTag; ++#if defined(__sparc64) + u.asBits.payload = reinterpret_cast<int64_t>(ptr); +#else u.asBits.payload = reinterpret_cast<int32_t>(ptr); +#endif - } - - inline JSValue::JSValue(const JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) -+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr)); -+#else - u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); -+#endif - } - - inline JSValue::operator bool() const + #if ENABLE(JSC_ZOMBIES) + ASSERT(!isZombie()); + #endif diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h deleted file mode 100644 index 1b4d9eec188f..000000000000 --- a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200 -+++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200 -@@ -626,7 +626,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) -+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD)) - #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(ARM) || PLATFORM(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/www/webkit-gtk2/files/patch-add-gzip b/www/webkit-gtk2/files/patch-add-gzip deleted file mode 100644 index 47ad365a3f08..000000000000 --- a/www/webkit-gtk2/files/patch-add-gzip +++ /dev/null @@ -1,35 +0,0 @@ -Committed to webkit trunk. Use libsoup 2.28.2 gzip encoding. -http://trac.webkit.org/changeset/52208 - -diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp -index 6367a3e..5a229b8 100644 ---- WebCore/platform/network/soup/ResourceHandleSoup.cpp -+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp -@@ -548,12 +548,6 @@ static bool startHttp(ResourceHandle* handle) - // balanced by a deref() in finishedCallback, which should always run - handle->ref(); - -- // FIXME: For now, we cannot accept content encoded in anything -- // other than identity, so force servers to do it our way. When -- // libsoup gets proper Content-Encoding support we will want to -- // use it here instead. -- soup_message_headers_replace(d->m_msg->request_headers, "Accept-Encoding", "identity"); -- - // Balanced in ResourceHandleInternal's destructor; we need to - // keep our own ref, because after queueing the message, the - // session owns the initial reference. - -diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp -index c80160c..95a5717 100644 ---- WebKit/gtk/webkit/webkitprivate.cpp -+++ WebKit/gtk/webkit/webkitprivate.cpp -@@ -280,6 +280,8 @@ void webkit_init() - SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL)); - soup_session_add_feature(session, sniffer); - g_object_unref(sniffer); -+ -+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER); - } - - void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains) - diff --git a/www/webkit-gtk2/files/patch-webkitnetworkresponse b/www/webkit-gtk2/files/patch-webkitnetworkresponse deleted file mode 100644 index 7b17a498200b..000000000000 --- a/www/webkit-gtk2/files/patch-webkitnetworkresponse +++ /dev/null @@ -1,215 +0,0 @@ -From d42f4dd5b4ead39771d8822ac4c67a0d48a41040 Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> -Date: Sun, 25 Oct 2009 18:29:35 -0200 -Subject: [PATCH] Use WebKitNetworkResponse - - WebKit/gtk/ChangeLog | 26 +++++++++++++ - WebKit/gtk/webkit/webkitdownload.cpp | 67 +++++++++++++++++++++++++++++----- - WebKit/gtk/webkit/webkitdownload.h | 3 ++ - 3 files changed, 86 insertions(+), 10 deletions(-) - -2009-10-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> - - Reviewed by NOBODY (OOPS!). - - https://bugs.webkit.org/show_bug.cgi?id=30759 - [GTK] Should use WebKitNetworkResponse, and expose it - - WebKitDownload now uses our WebKitNetworkResponse instead of using - ResourceResponse directly. By exposing the response, like we do - with the request, we give our users the ability to look at the - response headers, status code, and so on, through the SoupMessage - object. - - * webkit/webkitdownload.cpp: - (webkit_download_dispose): - (webkit_download_finalize): - (webkit_download_get_property): - (webkit_download_set_property): - (webkit_download_class_init): - (webkit_download_get_network_response): - (webkit_download_set_response): - (webkit_download_get_total_size): - (webkit_download_get_progress): - (webkit_download_received_data): - * webkit/webkitdownload.h: - ---- -diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp -index 568378c..dd6629b 100644 ---- WebKit/gtk/webkit/webkitdownload.cpp -+++ WebKit/gtk/webkit/webkitdownload.cpp -@@ -31,6 +31,7 @@ - #include "webkitdownload.h" - #include "webkitenumtypes.h" - #include "webkitmarshal.h" -+#include "webkitnetworkresponse.h" - #include "webkitprivate.h" - - #include <glib/gstdio.h> -@@ -74,7 +75,7 @@ struct _WebKitDownloadPrivate { - GFileOutputStream* outputStream; - DownloadClient* downloadClient; - WebKitNetworkRequest* networkRequest; -- ResourceResponse* networkResponse; -+ WebKitNetworkResponse* networkResponse; - RefPtr<ResourceHandle> resourceHandle; - }; - -@@ -95,7 +96,8 @@ enum { - PROP_PROGRESS, - PROP_STATUS, - PROP_CURRENT_SIZE, -- PROP_TOTAL_SIZE -+ PROP_TOTAL_SIZE, -+ PROP_NETWORK_RESPONSE - }; - - G_DEFINE_TYPE(WebKitDownload, webkit_download, G_TYPE_OBJECT); -@@ -119,6 +121,11 @@ static void webkit_download_dispose(GObject* object) - priv->networkRequest = NULL; - } - -+ if (priv->networkResponse) { -+ g_object_unref(priv->networkResponse); -+ priv->networkResponse = NULL; -+ } -+ - G_OBJECT_CLASS(webkit_download_parent_class)->dispose(object); - } - -@@ -138,7 +145,6 @@ static void webkit_download_finalize(GObject* object) - } - - delete priv->downloadClient; -- delete priv->networkResponse; - - // The download object may never have _start called on it, so we - // need to make sure timer is non-NULL. -@@ -159,6 +165,9 @@ static void webkit_download_get_property(GObject* object, guint prop_id, GValue* - case PROP_NETWORK_REQUEST: - g_value_set_object(value, webkit_download_get_network_request(download)); - break; -+ case PROP_NETWORK_RESPONSE: -+ g_value_set_object(value, webkit_download_get_network_response(download)); -+ break; - case PROP_DESTINATION_URI: - g_value_set_string(value, webkit_download_get_destination_uri(download)); - break; -@@ -191,6 +200,9 @@ static void webkit_download_set_property(GObject* object, guint prop_id, const G - case PROP_NETWORK_REQUEST: - priv->networkRequest = WEBKIT_NETWORK_REQUEST(g_value_dup_object(value)); - break; -+ case PROP_NETWORK_RESPONSE: -+ priv->networkResponse = WEBKIT_NETWORK_RESPONSE(g_value_dup_object(value)); -+ break; - case PROP_DESTINATION_URI: - webkit_download_set_destination_uri(download, g_value_get_string(value)); - break; -@@ -252,6 +264,21 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass) - (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); - - /** -+ * WebKitDownload:network-response -+ * -+ * The #WebKitNetworkResponse instance associated with the download. -+ * -+ * Since: 1.1.16 -+ */ -+ g_object_class_install_property(objectClass, -+ PROP_NETWORK_RESPONSE, -+ g_param_spec_object("network-response", -+ _("Network Response"), -+ _("The network response for the URI that should be downloaded"), -+ WEBKIT_TYPE_NETWORK_RESPONSE, -+ (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); -+ -+ /** - * WebKitDownload:destination-uri - * - * The URI of the save location for this download. -@@ -530,11 +557,29 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo - return priv->networkRequest; - } - -+/** -+ * webkit_download_get_network_response: -+ * @download: the #WebKitDownload -+ * -+ * Retrieves the #WebKitNetworkResponse object that backs the download -+ * process. -+ * -+ * Returns: the #WebKitNetworkResponse instance -+ * -+ * Since: 1.1.16 -+ */ -+WebKitNetworkResponse* webkit_download_get_network_response(WebKitDownload* download) -+{ -+ g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), NULL); -+ -+ WebKitDownloadPrivate* priv = download->priv; -+ return priv->networkResponse; -+} -+ - static void webkit_download_set_response(WebKitDownload* download, const ResourceResponse& response) - { -- // FIXME Use WebKitNetworkResponse when it's merged. - WebKitDownloadPrivate* priv = download->priv; -- priv->networkResponse = new ResourceResponse(response); -+ priv->networkResponse = webkit_network_response_new_with_core_response(response); - - if (!response.isNull() && !response.suggestedFilename().isEmpty()) - webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data()); -@@ -704,10 +749,12 @@ guint64 webkit_download_get_total_size(WebKitDownload* download) - g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), 0); - - WebKitDownloadPrivate* priv = download->priv; -- if (!priv->networkResponse) -+ SoupMessage* message = priv->networkResponse ? webkit_network_response_get_message(priv->networkResponse) : NULL; -+ -+ if (!message) - return 0; - -- return MAX(priv->currentSize, priv->networkResponse->expectedContentLength()); -+ return MAX(priv->currentSize, soup_message_headers_get_content_length(message->response_headers)); - } - - /** -@@ -744,9 +791,9 @@ gdouble webkit_download_get_progress(WebKitDownload* download) - - WebKitDownloadPrivate* priv = download->priv; - if (!priv->networkResponse) -- return 0; -+ return 0.0; - -- gdouble total_size = (gdouble)priv->networkResponse->expectedContentLength(); -+ gdouble total_size = static_cast<gdouble>(webkit_download_get_total_size(download)); - - if (total_size == 0) - return 1.0; -@@ -803,7 +850,7 @@ static void webkit_download_received_data(WebKitDownload* download, const gchar* - g_object_notify(G_OBJECT(download), "current-size"); - - ASSERT(priv->networkResponse); -- if (priv->currentSize > priv->networkResponse->expectedContentLength()) -+ if (priv->currentSize > webkit_download_get_total_size(download)) - g_object_notify(G_OBJECT(download), "total-size"); - - gdouble lastProgress = webkit_download_get_progress(download); -diff --git a/WebKit/gtk/webkit/webkitdownload.h b/WebKit/gtk/webkit/webkitdownload.h -index 6e7f38b..a732a57 100644 ---- WebKit/gtk/webkit/webkitdownload.h -+++ WebKit/gtk/webkit/webkitdownload.h -@@ -84,6 +84,9 @@ webkit_download_get_uri (WebKitDownload *download); - WEBKIT_API WebKitNetworkRequest* - webkit_download_get_network_request (WebKitDownload *download); - -+WEBKIT_API WebKitNetworkResponse* -+webkit_download_get_network_response (WebKitDownload *download); -+ - WEBKIT_API const gchar* - webkit_download_get_suggested_filename (WebKitDownload *download); - --- -1.6.5 - |