[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bfulgham at webkit.org
bfulgham at webkit.org
Wed Dec 22 14:06:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 655e6768e533cdd78490dcf86cd83ee6347cf926
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 4 20:44:42 2010 +0000
WebCore: Unreviewed, build fix for r68951.
Add stub implementation for ProxyServer logic.
* WebCore.vcproj/WebCore.vcproj: Add new WinCairo file.
* WebCore/platform/network/curl/ProxyServerCurl.cpp: Added
WebKit2: Unreviewed build fixes after r68260 and r68686.
* Platform/CoreIPC/DataReference.h: Add include directive for
<inttypes.h>, needed for WinCairo build.
* Shared/win/PlatformCertificateInfo.cpp:
(WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
Conditionalize logic specific to WebKitSystemInterface and
add a stub implementation for WinCairo.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d390fd..3ed1a6d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-04 Brent Fulgham <bfulgham at webkit.org>
+
+ Unreviewed, build fix for r68951.
+
+ Add stub implementation for ProxyServer logic.
+
+ * WebCore.vcproj/WebCore.vcproj: Add new WinCairo file.
+ * WebCore/platform/network/curl/ProxyServerCurl.cpp: Added
+
2010-10-04 Alexey Proskuryakov <ap at apple.com>
Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 4f847a3..61d8ccb 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -28097,6 +28097,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\platform\network\curl\ProxyServerCurl.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\platform\network\curl\ResourceError.h"
>
<FileConfiguration
diff --git a/WebCore/platform/network/curl/ProxyServerCurl.cpp b/WebCore/platform/network/curl/ProxyServerCurl.cpp
new file mode 100644
index 0000000..768dd83
--- /dev/null
+++ b/WebCore/platform/network/curl/ProxyServerCurl.cpp
@@ -0,0 +1,40 @@
+/*
+ * 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"
+
+#include "KURL.h"
+#include <wtf/RetainPtr.h>
+
+namespace WebCore {
+
+Vector<ProxyServer> proxyServersForURL(const KURL&)
+{
+ // FIXME: Implement.
+ return Vector<ProxyServer>();
+}
+
+} // namespace WebCore
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index aca06cb..2725ceb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-04 Brent Fulgham <bfulgham at webkit.org>
+
+ Unreviewed build fixes after r68260 and r68686.
+
+ * Platform/CoreIPC/DataReference.h: Add include directive for
+ <inttypes.h>, needed for WinCairo build.
+ * Shared/win/PlatformCertificateInfo.cpp:
+ (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
+ Conditionalize logic specific to WebKitSystemInterface and
+ add a stub implementation for WinCairo.
+
2010-10-04 Sam Weinig <sam at webkit.org>
Reviewed by Adam Roben.
diff --git a/WebKit2/Platform/CoreIPC/DataReference.h b/WebKit2/Platform/CoreIPC/DataReference.h
index 244cdbd..5ecb8ea 100644
--- a/WebKit2/Platform/CoreIPC/DataReference.h
+++ b/WebKit2/Platform/CoreIPC/DataReference.h
@@ -26,6 +26,8 @@
#ifndef DataReference_h
#define DataReference_h
+#include <inttypes.h>
+
namespace CoreIPC {
class ArgumentDecoder;
diff --git a/WebKit2/Shared/win/PlatformCertificateInfo.cpp b/WebKit2/Shared/win/PlatformCertificateInfo.cpp
index 5b9a2c9..69bda7d 100644
--- a/WebKit2/Shared/win/PlatformCertificateInfo.cpp
+++ b/WebKit2/Shared/win/PlatformCertificateInfo.cpp
@@ -28,7 +28,10 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include <WebCore/ResourceResponse.h>
+
+#if PLATFORM(CG)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
using namespace WebCore;
@@ -46,6 +49,7 @@ PlatformCertificateInfo::PlatformCertificateInfo(const ResourceResponse& respons
if (!cfResponse)
return;
+#if PLATFORM(CG)
CFDictionaryRef certificateInfo = wkGetSSLCertificateInfo(cfResponse);
if (!certificateInfo)
return;
@@ -55,6 +59,9 @@ PlatformCertificateInfo::PlatformCertificateInfo(const ResourceResponse& respons
return;
m_certificateContext = ::CertDuplicateCertificateContext(static_cast<PCCERT_CONTEXT>(data));
+#else
+ // FIXME: WinCairo implementation
+#endif
}
PlatformCertificateInfo::~PlatformCertificateInfo()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list