[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
bfulgham at webkit.org
bfulgham at webkit.org
Thu Oct 29 20:31:32 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 19601ad10cc7f9bcb411c0bdbb432ffcf9011a79
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 21 22:40:29 2009 +0000
Unreviewed build fix for Windows (Cairo) target.
Add stubs for SocketStream classes added in @r47788, which
broke the WinCairo build.
No new tests. (Build failure).
* WebCore.vcproj/WebCore.vcproj: Add references to new files
to Cairo build, exclude from standard Apple build.
* platform/network/curl/SocketStreamError.h: Added.
* platform/network/curl/SocketStreamHandle.h: Added.
* platform/network/curl/SocketStreamHandleCurl.cpp: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48607 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b440f75..c01c75f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-09-21 Brent Fulgham <bfulgham at webkit.org>
+
+ Unreviewed build fix for Windows (Cairo) target.
+
+ Add stubs for SocketStream classes added in @r47788, which
+ broke the WinCairo build.
+
+ No new tests. (Build failure).
+
+ * WebCore.vcproj/WebCore.vcproj: Add references to new files
+ to Cairo build, exclude from standard Apple build.
+ * platform/network/curl/SocketStreamError.h: Added.
+ * platform/network/curl/SocketStreamHandle.h: Added.
+ * platform/network/curl/SocketStreamHandleCurl.cpp: Added.
+
2009-09-21 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index b9b8b67..8ff0e51 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -15651,7 +15651,7 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSWheelEvent.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSWebSocket.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -15695,11 +15695,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSWheelEvent.h"
+ RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSWebSocket.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSWebSocket.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSWheelEvent.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -15743,7 +15743,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSWebSocket.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSWheelEvent.h"
>
</File>
<File
@@ -17060,19 +17060,19 @@
RelativePath="..\page\Settings.h"
>
</File>
- <File
+ <File
RelativePath="..\page\UserScript.h"
>
</File>
- <File
+ <File
RelativePath="..\page\UserScriptTypes.h"
>
</File>
- <File
+ <File
RelativePath="..\page\UserStyleSheet.h"
>
</File>
- <File
+ <File
RelativePath="..\page\UserStyleSheetTypes.h"
>
</File>
@@ -20811,6 +20811,34 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\platform\network\curl\SocketStreamHandleCurl.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>
+ </File>
</Filter>
</Filter>
<Filter
@@ -21855,18 +21883,18 @@
>
</File>
</Filter>
- <Filter
- Name="mock"
- >
- <File
- RelativePath="..\platform\mock\GeolocationServiceMock.cpp"
- >
- </File>
- <File
- RelativePath="..\platform\mock\GeolocationServiceMock.h"
- >
- </File>
- </Filter>
+ <Filter
+ Name="mock"
+ >
+ <File
+ RelativePath="..\platform\mock\GeolocationServiceMock.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\mock\GeolocationServiceMock.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="css"
@@ -28839,11 +28867,11 @@
>
</File>
<File
- RelativePath="..\bindings\js\JSCanvasRenderingContextCustom.cpp"
+ RelativePath="..\bindings\js\JSCanvasRenderingContext2DCustom.cpp"
>
</File>
<File
- RelativePath="..\bindings\js\JSCanvasRenderingContext2DCustom.cpp"
+ RelativePath="..\bindings\js\JSCanvasRenderingContextCustom.cpp"
>
</File>
<File
@@ -31004,11 +31032,11 @@
>
</File>
<File
- RelativePath="..\storage\SQLTransactionClient.h"
+ RelativePath="..\storage\SQLTransactionClient.cpp"
>
</File>
<File
- RelativePath="..\storage\SQLTransactionClient.cpp"
+ RelativePath="..\storage\SQLTransactionClient.h"
>
</File>
<File
diff --git a/WebCore/platform/network/cf/SocketStreamError.h b/WebCore/platform/network/curl/SocketStreamError.h
similarity index 100%
copy from WebCore/platform/network/cf/SocketStreamError.h
copy to WebCore/platform/network/curl/SocketStreamError.h
diff --git a/WebCore/platform/network/cf/SocketStreamHandle.h b/WebCore/platform/network/curl/SocketStreamHandle.h
similarity index 100%
copy from WebCore/platform/network/cf/SocketStreamHandle.h
copy to WebCore/platform/network/curl/SocketStreamHandle.h
diff --git a/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp b/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp
new file mode 100644
index 0000000..891e96e
--- /dev/null
+++ b/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2009 Brent Fulgham. All rights reserved.
+ * Copyright (C) 2009 Google 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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 "SocketStreamHandle.h"
+
+#include "KURL.h"
+#include "Logging.h"
+#include "NotImplemented.h"
+#include "SocketStreamHandleClient.h"
+
+namespace WebCore {
+
+SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client)
+ : SocketStreamHandleBase(url, client)
+{
+ LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
+ notImplemented();
+}
+
+SocketStreamHandle::~SocketStreamHandle()
+{
+ LOG(Network, "SocketStreamHandle %p delete", this);
+ setClient(0);
+ notImplemented();
+}
+
+int SocketStreamHandle::platformSend(const char*, int)
+{
+ LOG(Network, "SocketStreamHandle %p platformSend", this);
+ notImplemented();
+ return 0;
+}
+
+void SocketStreamHandle::platformClose()
+{
+ LOG(Network, "SocketStreamHandle %p platformClose", this);
+ notImplemented();
+}
+
+void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)
+{
+ notImplemented();
+}
+
+void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list