[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3a7b5a9777df7b7d2d975608731fd4d0ac83ef19
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 18:14:04 2011 +0000

    2011-01-10  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Laszlo Gombos.
    
            [WIN] Add ProxyServerWin.cpp
            https://bugs.webkit.org/show_bug.cgi?id=52031
    
            Add stub implementation to fix ENABLE_NETSCAPE_PLUGIN_API on WinCE.
    
            * CMakeLists.txt:
            * CMakeListsWinCE.txt:
            * platform/network/win/ProxyServerWin.cpp: Added.
            (WebCore::proxyServersForURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 83b2ccb..f212fb8 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1408,6 +1408,7 @@ SET(WebCore_SOURCES
     platform/network/HTTPParsers.cpp
     platform/network/NetworkStateNotifier.cpp
     platform/network/ProtectionSpace.cpp
+    platform/network/ProxyServer.cpp
     platform/network/ResourceErrorBase.cpp
     platform/network/ResourceHandle.cpp
     platform/network/ResourceRequestBase.cpp
diff --git a/Source/WebCore/CMakeListsWinCE.txt b/Source/WebCore/CMakeListsWinCE.txt
index c33dc16..8733c26 100644
--- a/Source/WebCore/CMakeListsWinCE.txt
+++ b/Source/WebCore/CMakeListsWinCE.txt
@@ -74,6 +74,7 @@ LIST(APPEND WebCore_SOURCES
 
     platform/network/win/CookieJarWin.cpp
     platform/network/win/NetworkStateNotifierWin.cpp
+    platform/network/win/ProxyServerWin.cpp
     platform/network/win/ResourceHandleWin.cpp
     platform/network/win/SocketStreamHandleWin.cpp
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 60465e7..470898f 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-10  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [WIN] Add ProxyServerWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=52031
+
+        Add stub implementation to fix ENABLE_NETSCAPE_PLUGIN_API on WinCE.
+
+        * CMakeLists.txt:
+        * CMakeListsWinCE.txt:
+        * platform/network/win/ProxyServerWin.cpp: Added.
+        (WebCore::proxyServersForURL):
+
 2011-01-10  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/Source/WebCore/platform/network/win/ProxyServerWin.cpp b/Source/WebCore/platform/network/win/ProxyServerWin.cpp
new file mode 100644
index 0000000..c610e20
--- /dev/null
+++ b/Source/WebCore/platform/network/win/ProxyServerWin.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 Brent Fulgham <bfulgham at webkit.org>. 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"
+
+namespace WebCore {
+
+Vector<ProxyServer> proxyServersForURL(const KURL&, const NetworkingContext*)
+{
+    // FIXME: Implement.
+    return Vector<ProxyServer>();
+}
+
+} // namespace WebCore

-- 
WebKit Debian packaging