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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit af8a12f53ff536a456e033696402fa755b65dce0
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 23:45:33 2010 +0000

    Add Qt ProxyServer stub.
    
    * WebCore.pro:
    * platform/network/qt/ProxyServerQt.cpp: Added.
    (WebCore::proxyServersForURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68953 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ec840c..bc2ec0d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-01  Anders Carlsson  <andersca at apple.com>
 
+        Add Qt ProxyServer stub.
+
+        * WebCore.pro:
+        * platform/network/qt/ProxyServerQt.cpp: Added.
+        (WebCore::proxyServersForURL):
+
+2010-10-01  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Add proxy server query function proxyServersForURL and change the Mac plug-in code to use it
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 45e09ea..ff93f8f 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2097,6 +2097,7 @@ HEADERS += \
     platform/network/NetworkingContext.h \
     platform/network/NetworkStateNotifier.h \
     platform/network/ProtectionSpace.h \
+    platform/network/ProxyServer.h \
     platform/network/qt/QNetworkReplyHandler.h \
     platform/network/ResourceErrorBase.h \
     platform/network/ResourceHandle.h \
@@ -2593,6 +2594,7 @@ SOURCES += \
     platform/network/qt/ResourceHandleQt.cpp \
     platform/network/qt/ResourceRequestQt.cpp \
     platform/network/qt/DnsPrefetchHelper.cpp \
+    platform/network/qt/ProxyServerQt.cpp \
     platform/network/qt/QNetworkReplyHandler.cpp \
     editing/qt/EditorQt.cpp \
     editing/qt/SmartReplaceQt.cpp \
diff --git a/WebCore/platform/network/qt/ProxyServerQt.cpp b/WebCore/platform/network/qt/ProxyServerQt.cpp
new file mode 100644
index 0000000..0c643e4
--- /dev/null
+++ b/WebCore/platform/network/qt/ProxyServerQt.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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 "config.h"
+#include "ProxyServer.h"
+
+#include "NotImplemented.h"
+#include "KURL.h"
+
+namespace WebCore {
+
+Vector<ProxyServer> proxyServersForURL(const KURL&)
+{
+    NotImplemented();
+    return Vector<ProxyServer>();
+}
+
+} // namespace WebCore

-- 
WebKit Debian packaging