[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 12:36:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 22b6ffd344e575cea6971d47fe7064c160644472
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 25 23:38:58 2010 +0000
WebCore: Build correction, no review.
* WebCore.vcproj/WebCore.vcproj: Add missing implementation
for PlatformRefPtrCairo.
WebKit2: Build fix, no review.
Add conditional guards around Safari-specific
include files.
* WebProcess/WebPage/win/WebPageWin.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66054 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f1ff5d..9b62cfd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-25 Brent Fulgham <bfulgham at webkit.org>
+
+ Build correction, no review.
+
+ * WebCore.vcproj/WebCore.vcproj: Add missing implementation
+ for PlatformRefPtrCairo.
+
2010-08-25 Cris Neckar <cdn at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 3461239..c2807f2 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -4989,7 +4989,7 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriter.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileSystemCallback.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -5041,11 +5041,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriter.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileSystemCallback.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileSystemCallback.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriter.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -5097,7 +5097,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileSystemCallback.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriter.h"
>
</File>
<File
@@ -26627,6 +26627,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\platform\graphics\cairo\PlatformRefPtrCairo.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\graphics\cairo\TransformationMatrixCairo.cpp"
>
<FileConfiguration
@@ -26932,15 +26968,15 @@
>
</File>
<File
- RelativePath="..\platform\network\NetworkStateNotifier.cpp"
+ RelativePath="..\platform\network\NetworkingContext.h"
>
</File>
<File
- RelativePath="..\platform\network\NetworkStateNotifier.h"
+ RelativePath="..\platform\network\NetworkStateNotifier.cpp"
>
</File>
<File
- RelativePath="..\platform\network\NetworkingContext.h"
+ RelativePath="..\platform\network\NetworkStateNotifier.h"
>
</File>
<File
@@ -33305,15 +33341,15 @@
>
</File>
<File
- RelativePath="..\dom\AtomicStringList.h"
+ RelativePath="..\dom\AsyncScriptRunner.cpp"
>
</File>
<File
- RelativePath="..\dom\AsyncScriptRunner.cpp"
+ RelativePath="..\dom\AsyncScriptRunner.h"
>
</File>
<File
- RelativePath="..\dom\AsyncScriptRunner.h"
+ RelativePath="..\dom\AtomicStringList.h"
>
</File>
<File
@@ -33877,19 +33913,19 @@
>
</File>
<File
- RelativePath="..\dom\PendingScript.cpp"
+ RelativePath="..\dom\PageTransitionEvent.cpp"
>
</File>
<File
- RelativePath="..\dom\PendingScript.h"
+ RelativePath="..\dom\PageTransitionEvent.h"
>
</File>
<File
- RelativePath="..\dom\PageTransitionEvent.cpp"
+ RelativePath="..\dom\PendingScript.cpp"
>
</File>
<File
- RelativePath="..\dom\PageTransitionEvent.h"
+ RelativePath="..\dom\PendingScript.h"
>
</File>
<File
@@ -38405,14 +38441,6 @@
>
</File>
<File
- RelativePath="..\html\HTMLEntitySearch.cpp"
- >
- </File>
- <File
- RelativePath="..\html\HTMLEntitySearch.h"
- >
- </File>
- <File
RelativePath="..\html\HTMLEmbedElement.cpp"
>
<FileConfiguration
@@ -38477,6 +38505,14 @@
>
</File>
<File
+ RelativePath="..\html\HTMLEntitySearch.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\HTMLEntitySearch.h"
+ >
+ </File>
+ <File
RelativePath="..\html\HTMLFieldSetElement.cpp"
>
<FileConfiguration
@@ -45152,7 +45188,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBCursor.cpp"
+ RelativePath="..\bindings\js\JSHTMLOptionsCollectionCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45204,7 +45240,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBCursor.h"
+ RelativePath="..\bindings\js\JSHTMLSelectElementCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45256,7 +45292,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSHTMLOptionsCollectionCustom.cpp"
+ RelativePath="..\bindings\js\JSHTMLSelectElementCustom.h"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBAny.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45308,7 +45348,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSHTMLSelectElementCustom.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBAny.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bindings\js\JSIDBAnyCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45360,11 +45404,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSHTMLSelectElementCustom.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBAny.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBCursor.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45416,11 +45456,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBAny.h"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSIDBAnyCustom.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBCursor.h"
>
<FileConfiguration
Name="Debug|Win32"
@@ -51405,19 +51441,19 @@
>
</File>
<File
- RelativePath="..\storage\Metadata.h"
+ RelativePath="..\storage\LocalStorageThread.cpp"
>
</File>
<File
- RelativePath="..\storage\MetadataCallback.h"
+ RelativePath="..\storage\LocalStorageThread.h"
>
</File>
<File
- RelativePath="..\storage\LocalStorageThread.cpp"
+ RelativePath="..\storage\Metadata.h"
>
</File>
<File
- RelativePath="..\storage\LocalStorageThread.h"
+ RelativePath="..\storage\MetadataCallback.h"
>
</File>
<File
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c4e315a..01eaef4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-25 Brent Fulgham <bfulgham at webkit.org>
+
+ Build fix, no review.
+
+ Add conditional guards around Safari-specific
+ include files.
+
+ * WebProcess/WebPage/win/WebPageWin.cpp:
+
2010-08-25 Adam Roben <aroben at apple.com>
Clean up Connection::open on Windows
diff --git a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
index e4b28b2..ddf8d35 100644
--- a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
+++ b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
@@ -35,7 +35,9 @@
#include <WebCore/Page.h>
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/Settings.h>
+#if PLATFORM(CG)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
#include <WinUser.h>
using namespace WebCore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list