[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4e427969a50cf2f20081bb588f3c5bb298aa81f4
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 18:01:32 2010 +0000

    2010-07-22  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Implement WebContext::applicationCacheDirectory() for the Qt port of WebKit2.
            https://bugs.webkit.org/show_bug.cgi?id=42830
    
            No new tests needed.
    
            * WebCore.pri: add ApplicationCacheStorage.h to wk2 headers
            * WebCore.pro: add WebContextQt.cpp to sources
    2010-07-22  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Implement WebContext::applicationCacheDirectory() for the Qt port of WebKit2.
            https://bugs.webkit.org/show_bug.cgi?id=42830
    
            * UIProcess/qt/WebContextQt.cpp: Added.
            (WebKit::WebContext::applicationCacheDirectory):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88e5a0d..c062a1f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-22  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Implement WebContext::applicationCacheDirectory() for the Qt port of WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=42830
+
+        No new tests needed.
+
+        * WebCore.pri: add ApplicationCacheStorage.h to wk2 headers
+        * WebCore.pro: add WebContextQt.cpp to sources
+
 2010-07-22  Joone Hur  <joone.hur at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index c468f5b..8141499 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -681,6 +681,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
     html/HTMLFormElement.h \
     html/HTMLFrameOwnerElement.h \
     inspector/InspectorClient.h \
+    loader/appcache/ApplicationCacheStorage.h \
     loader/DocumentLoader.h \
     loader/FormState.h \
     loader/FrameLoader.h \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 49c67b9..2085dbf 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -3348,6 +3348,7 @@ SOURCES += \
     ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
     ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
     ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
+    ../WebKit2/UIProcess/qt/WebContextQt.cpp \
     ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
     ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
     ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 45da312..9a0637f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-22  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Implement WebContext::applicationCacheDirectory() for the Qt port of WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=42830
+
+        * UIProcess/qt/WebContextQt.cpp: Added.
+        (WebKit::WebContext::applicationCacheDirectory):
+
 2010-07-22  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Unreviewed build fix.
diff --git a/WebKit2/UIProcess/qt/WebContextQt.cpp b/WebKit2/UIProcess/qt/WebContextQt.cpp
new file mode 100644
index 0000000..fcdccb2
--- /dev/null
+++ b/WebKit2/UIProcess/qt/WebContextQt.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebContext.h"
+
+#include "ApplicationCacheStorage.h"
+
+namespace WebKit {
+
+WebCore::String WebContext::applicationCacheDirectory()
+{
+    return WebCore::cacheStorage().cacheDirectory();
+}
+
+} // namespace WebKit

-- 
WebKit Debian packaging