author: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
commit: 48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree: b627baa77f19bb1eab2fa4dee08aab1908131cd0 /www/webkit-gtk2
parent: fbdf96410f8e803568c33397323dd9d8d3af995f (diff)
11 files changed, 114 insertions, 407 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 863921e61019..2e06e54b8d0f 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.50 2009/11/28 17:35:07 kwm Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.60 2010/04/05 17:39:13 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.1.15.4
-PORTREVISION=	4
+PORTVERSION=	1.2.0
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -16,11 +15,14 @@ PKGNAMESUFFIX=	-gtk2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An opensource browser engine
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		curl.6:${PORTSDIR}/ftp/curl \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
 
 WANT_GSTREAMER=	yes
 MAKE_JOBS_SAFE=	yes
@@ -38,7 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		ac_cv_path_DOLT_BASH=""
 CONFIGURE_ARGS=	--enable-icon-database \
 		--enable-svg \
-		--enable-svg-fonts
+		--enable-svg-fonts \
+		--enable-introspection
 MAKEFILE=	GNUmakefile
 
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
@@ -50,10 +53,6 @@ OPTIONS=	VIDEO "Enable video support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64"
-BROKEN=		Does not compile on ia64
-.endif
-
 .if exists (${LOCALBASE}/lib/libicutu.so.43)
 LIB_DEPENDS+=	icutu.43:${PORTSDIR}/devel/icu4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h
@@ -81,10 +80,7 @@ PLIST_SUB+=	STATIC="@comment "
 
 .if ${OSVERSION} < 700000
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
-		${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \
-		${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \
-		${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \
-		${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp
+		${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
 .endif
 
 post-patch:
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 412335d8ad21..0b82171d111b 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.1.15.4.tar.gz) = 47301fb7120421ac38bf714db8f5d428
-SHA256 (webkit-1.1.15.4.tar.gz) = ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
-SIZE (webkit-1.1.15.4.tar.gz) = 6093252
+MD5 (webkit-1.2.0.tar.gz) = b2bfcbc4bbf1d0a51f848cb54c21ee66
+SHA256 (webkit-1.2.0.tar.gz) = 0ce49278970857db374d31fd1831bf42ffb1dca4797ef39911a96d01d8c5e1f7
+SIZE (webkit-1.2.0.tar.gz) = 7554632
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
-
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 3e9628ce253a..7a56fc23b207 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -14,6 +14,7 @@ include/webkit-1.0/webkit/webkitdefines.h
 include/webkit-1.0/webkit/webkitdownload.h
 include/webkit-1.0/webkit/webkitenumtypes.h
 include/webkit-1.0/webkit/webkiterror.h
+include/webkit-1.0/webkit/webkitgeolocationpolicydecision.h
 include/webkit-1.0/webkit/webkithittestresult.h
 include/webkit-1.0/webkit/webkitnetworkrequest.h
 include/webkit-1.0/webkit/webkitnetworkresponse.h
@@ -33,21 +34,34 @@ include/webkit-1.0/webkit/webkitwebsettings.h
 include/webkit-1.0/webkit/webkitwebview.h
 include/webkit-1.0/webkit/webkitwebwindowfeatures.h
 %%STATIC%%lib/libwebkit-1.0.a
+lib/girepository-1.0/JSCore-1.0.typelib
+lib/girepository-1.0/WebKit-1.0.typelib
 lib/libwebkit-1.0.la
 lib/libwebkit-1.0.so
 lib/libwebkit-1.0.so.13
 libdata/pkgconfig/webkit-1.0.pc
+share/gir-1.0/JSCore-1.0.gir
+share/gir-1.0/WebKit-1.0.gir
+share/locale/cs/LC_MESSAGES/webkit.mo
 share/locale/de/LC_MESSAGES/webkit.mo
 share/locale/en_GB/LC_MESSAGES/webkit.mo
 share/locale/es/LC_MESSAGES/webkit.mo
+share/locale/et/LC_MESSAGES/webkit.mo
+share/locale/gu/LC_MESSAGES/webkit.mo
+share/locale/he/LC_MESSAGES/webkit.mo
 share/locale/it/LC_MESSAGES/webkit.mo
 share/locale/lt/LC_MESSAGES/webkit.mo
+share/locale/lv/LC_MESSAGES/webkit.mo
 share/locale/nl/LC_MESSAGES/webkit.mo
+share/locale/pa/LC_MESSAGES/webkit.mo
+share/locale/pt/LC_MESSAGES/webkit.mo
 share/locale/pt_BR/LC_MESSAGES/webkit.mo
 share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sl/LC_MESSAGES/webkit.mo
 share/locale/sr/LC_MESSAGES/webkit.mo
 share/locale/sr@latin/LC_MESSAGES/webkit.mo
 share/locale/sv/LC_MESSAGES/webkit.mo
+share/locale/uk/LC_MESSAGES/webkit.mo
 share/locale/vi/LC_MESSAGES/webkit.mo
 share/locale/zh_CN/LC_MESSAGES/webkit.mo
 share/webkit-1.0/images/deleteButton.png
@@ -57,19 +71,28 @@ share/webkit-1.0/images/panIcon.png
 share/webkit-1.0/images/textAreaResizeCorner.png
 share/webkit-1.0/images/urlIcon.png
 share/webkit-1.0/resources/error.html
+share/webkit-1.0/webinspector/AbstractTimelinePanel.js
+share/webkit-1.0/webinspector/AuditCategories.js
+share/webkit-1.0/webinspector/AuditLauncherView.js
+share/webkit-1.0/webinspector/AuditResultView.js
+share/webkit-1.0/webinspector/AuditRules.js
+share/webkit-1.0/webinspector/AuditsPanel.js
 share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
 share/webkit-1.0/webinspector/Breakpoint.js
 share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
 share/webkit-1.0/webinspector/CallStackSidebarPane.js
 share/webkit-1.0/webinspector/Callback.js
 share/webkit-1.0/webinspector/ChangesView.js
+share/webkit-1.0/webinspector/Checkbox.js
 share/webkit-1.0/webinspector/Color.js
+share/webkit-1.0/webinspector/ConsolePanel.js
 share/webkit-1.0/webinspector/ConsoleView.js
+share/webkit-1.0/webinspector/ContextMenu.js
 share/webkit-1.0/webinspector/CookieItemsView.js
 share/webkit-1.0/webinspector/DOMAgent.js
 share/webkit-1.0/webinspector/DOMStorage.js
-share/webkit-1.0/webinspector/DOMStorageDataGrid.js
 share/webkit-1.0/webinspector/DOMStorageItemsView.js
+share/webkit-1.0/webinspector/DOMSyntaxHighlighter.js
 share/webkit-1.0/webinspector/DataGrid.js
 share/webkit-1.0/webinspector/Database.js
 share/webkit-1.0/webinspector/DatabaseQueryView.js
@@ -77,13 +100,22 @@ share/webkit-1.0/webinspector/DatabaseTableView.js
 share/webkit-1.0/webinspector/Drawer.js
 share/webkit-1.0/webinspector/ElementsPanel.js
 share/webkit-1.0/webinspector/ElementsTreeOutline.js
+share/webkit-1.0/webinspector/EventListenersSidebarPane.js
 share/webkit-1.0/webinspector/FontView.js
 share/webkit-1.0/webinspector/ImageView.js
+share/webkit-1.0/webinspector/Images/auditsIcon.png
 share/webkit-1.0/webinspector/Images/back.png
+share/webkit-1.0/webinspector/Images/breakpointBorder.png
+share/webkit-1.0/webinspector/Images/breakpointConditionalBorder.png
+share/webkit-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
+share/webkit-1.0/webinspector/Images/breakpointCounterBorder.png
+share/webkit-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png
+share/webkit-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png
 share/webkit-1.0/webinspector/Images/checker.png
 share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png
 share/webkit-1.0/webinspector/Images/closeButtons.png
 share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png
+share/webkit-1.0/webinspector/Images/consoleIcon.png
 share/webkit-1.0/webinspector/Images/cookie.png
 share/webkit-1.0/webinspector/Images/database.png
 share/webkit-1.0/webinspector/Images/databaseTable.png
@@ -107,9 +139,11 @@ share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png
 share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png
 share/webkit-1.0/webinspector/Images/errorIcon.png
 share/webkit-1.0/webinspector/Images/errorMediumIcon.png
+share/webkit-1.0/webinspector/Images/errorRedDot.png
 share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png
 share/webkit-1.0/webinspector/Images/focusButtonGlyph.png
 share/webkit-1.0/webinspector/Images/forward.png
+share/webkit-1.0/webinspector/Images/gearButtonGlyph.png
 share/webkit-1.0/webinspector/Images/glossyHeader.png
 share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png
 share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png
@@ -117,6 +151,7 @@ share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
 share/webkit-1.0/webinspector/Images/goArrow.png
 share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
 share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkit-1.0/webinspector/Images/grayConnectorPoint.png
 share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png
 share/webkit-1.0/webinspector/Images/localStorage.png
 share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png
@@ -126,11 +161,14 @@ share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
 share/webkit-1.0/webinspector/Images/paneSettingsButtons.png
 share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
 share/webkit-1.0/webinspector/Images/percentButtonGlyph.png
+share/webkit-1.0/webinspector/Images/popoverArrows.png
+share/webkit-1.0/webinspector/Images/popoverBackground.png
 share/webkit-1.0/webinspector/Images/profileGroupIcon.png
 share/webkit-1.0/webinspector/Images/profileIcon.png
 share/webkit-1.0/webinspector/Images/profileSmallIcon.png
 share/webkit-1.0/webinspector/Images/profilesIcon.png
 share/webkit-1.0/webinspector/Images/profilesSilhouette.png
+share/webkit-1.0/webinspector/Images/programCounterBorder.png
 share/webkit-1.0/webinspector/Images/radioDot.png
 share/webkit-1.0/webinspector/Images/recordButtonGlyph.png
 share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png
@@ -158,9 +196,9 @@ share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
 share/webkit-1.0/webinspector/Images/segmentSelected.png
 share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
 share/webkit-1.0/webinspector/Images/sessionStorage.png
+share/webkit-1.0/webinspector/Images/spinner.gif
 share/webkit-1.0/webinspector/Images/splitviewDimple.png
 share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
-share/webkit-1.0/webinspector/Images/storageIcon.png
 share/webkit-1.0/webinspector/Images/statusbarBackground.png
 share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
 share/webkit-1.0/webinspector/Images/statusbarButtons.png
@@ -168,6 +206,23 @@ share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
 share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
 share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
 share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png
+share/webkit-1.0/webinspector/Images/storageIcon.png
+share/webkit-1.0/webinspector/Images/successGreenDot.png
+share/webkit-1.0/webinspector/Images/thumbActiveHoriz.png
+share/webkit-1.0/webinspector/Images/thumbActiveVert.png
+share/webkit-1.0/webinspector/Images/thumbHoriz.png
+share/webkit-1.0/webinspector/Images/thumbHoverHoriz.png
+share/webkit-1.0/webinspector/Images/thumbHoverVert.png
+share/webkit-1.0/webinspector/Images/thumbVert.png
+share/webkit-1.0/webinspector/Images/timelineBarBlue.png
+share/webkit-1.0/webinspector/Images/timelineBarGray.png
+share/webkit-1.0/webinspector/Images/timelineBarGreen.png
+share/webkit-1.0/webinspector/Images/timelineBarOrange.png
+share/webkit-1.0/webinspector/Images/timelineBarPurple.png
+share/webkit-1.0/webinspector/Images/timelineBarRed.png
+share/webkit-1.0/webinspector/Images/timelineBarYellow.png
+share/webkit-1.0/webinspector/Images/timelineCheckmarks.png
+share/webkit-1.0/webinspector/Images/timelineDots.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
@@ -175,6 +230,7 @@ share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
 share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
+share/webkit-1.0/webinspector/Images/timelineIcon.png
 share/webkit-1.0/webinspector/Images/timelinePillBlue.png
 share/webkit-1.0/webinspector/Images/timelinePillGray.png
 share/webkit-1.0/webinspector/Images/timelinePillGreen.png
@@ -182,11 +238,9 @@ share/webkit-1.0/webinspector/Images/timelinePillOrange.png
 share/webkit-1.0/webinspector/Images/timelinePillPurple.png
 share/webkit-1.0/webinspector/Images/timelinePillRed.png
 share/webkit-1.0/webinspector/Images/timelinePillYellow.png
-share/webkit-1.0/webinspector/Images/tipBalloon.png
-share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
-share/webkit-1.0/webinspector/Images/tipIcon.png
-share/webkit-1.0/webinspector/Images/tipIconPressed.png
 share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
+share/webkit-1.0/webinspector/Images/trackHoriz.png
+share/webkit-1.0/webinspector/Images/trackVert.png
 share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
 share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
 share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
@@ -199,9 +253,14 @@ share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
 share/webkit-1.0/webinspector/Images/userInputResultIcon.png
 share/webkit-1.0/webinspector/Images/warningIcon.png
 share/webkit-1.0/webinspector/Images/warningMediumIcon.png
+share/webkit-1.0/webinspector/Images/warningOrangeDot.png
 share/webkit-1.0/webinspector/Images/warningsErrors.png
+share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png
+share/webkit-1.0/webinspector/InjectedFakeWorker.js
 share/webkit-1.0/webinspector/InjectedScript.js
 share/webkit-1.0/webinspector/InjectedScriptAccess.js
+share/webkit-1.0/webinspector/InspectorBackendStub.js
+share/webkit-1.0/webinspector/InspectorFrontendHostStub.js
 share/webkit-1.0/webinspector/KeyboardShortcut.js
 share/webkit-1.0/webinspector/MetricsSidebarPane.js
 share/webkit-1.0/webinspector/Object.js
@@ -210,7 +269,7 @@ share/webkit-1.0/webinspector/ObjectProxy.js
 share/webkit-1.0/webinspector/Panel.js
 share/webkit-1.0/webinspector/PanelEnablerView.js
 share/webkit-1.0/webinspector/Placard.js
-share/webkit-1.0/webinspector/Popup.js
+share/webkit-1.0/webinspector/Popover.js
 share/webkit-1.0/webinspector/ProfileDataGridTree.js
 share/webkit-1.0/webinspector/ProfileView.js
 share/webkit-1.0/webinspector/ProfilesPanel.js
@@ -224,23 +283,42 @@ share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
 share/webkit-1.0/webinspector/Script.js
 share/webkit-1.0/webinspector/ScriptView.js
 share/webkit-1.0/webinspector/ScriptsPanel.js
+share/webkit-1.0/webinspector/Section.js
+share/webkit-1.0/webinspector/Settings.js
 share/webkit-1.0/webinspector/SidebarPane.js
 share/webkit-1.0/webinspector/SidebarTreeElement.js
+share/webkit-1.0/webinspector/SourceCSSTokenizer.js
 share/webkit-1.0/webinspector/SourceFrame.js
+share/webkit-1.0/webinspector/SourceHTMLTokenizer.js
+share/webkit-1.0/webinspector/SourceJavaScriptTokenizer.js
+share/webkit-1.0/webinspector/SourceTokenizer.js
 share/webkit-1.0/webinspector/SourceView.js
 share/webkit-1.0/webinspector/StatusBarButton.js
 share/webkit-1.0/webinspector/StoragePanel.js
 share/webkit-1.0/webinspector/StylesSidebarPane.js
 share/webkit-1.0/webinspector/SummaryBar.js
+share/webkit-1.0/webinspector/TestController.js
+share/webkit-1.0/webinspector/TextEditorHighlighter.js
+share/webkit-1.0/webinspector/TextEditorModel.js
 share/webkit-1.0/webinspector/TextPrompt.js
+share/webkit-1.0/webinspector/TextViewer.js
 share/webkit-1.0/webinspector/TimelineAgent.js
+share/webkit-1.0/webinspector/TimelineGrid.js
+share/webkit-1.0/webinspector/TimelineOverviewPane.js
+share/webkit-1.0/webinspector/TimelinePanel.js
 share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
 share/webkit-1.0/webinspector/View.js
 share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js
+share/webkit-1.0/webinspector/WelcomeView.js
+share/webkit-1.0/webinspector/WorkersSidebarPane.js
+share/webkit-1.0/webinspector/audits.css
 share/webkit-1.0/webinspector/inspector.css
 share/webkit-1.0/webinspector/inspector.html
 share/webkit-1.0/webinspector/inspector.js
+share/webkit-1.0/webinspector/inspectorSyntaxHighlight.css
 share/webkit-1.0/webinspector/localizedStrings.js
+share/webkit-1.0/webinspector/popover.css
+share/webkit-1.0/webinspector/textViewer.css
 share/webkit-1.0/webinspector/treeoutline.js
 share/webkit-1.0/webinspector/utilities.js
 @dirrm share/webkit-1.0/webinspector/Images
author	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
commit	48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree	b627baa77f19bb1eab2fa4dee08aab1908131cd0 /www/webkit-gtk2
parent	fbdf96410f8e803568c33397323dd9d8d3af995f (diff)