[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 15:44:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 998c82811f2f0cb1b01f6b305f7ed299714663d8
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 11 16:02:25 2010 +0000
Windows build fix after r71816
r71816 renamed
WebCore/platform/graphics/cairo/FontPlatformDataCairoWin.h to
WebCore/platform/graphics/win/FontPlatformData.h. This made Apple's
Windows port pick up this header in preference to
WebCore/platform/cg/FontPlatformData.h, thus breaking the build. I
moved the file to
WebCore/platform/graphics/win/cairo/FontPlatformData.h so it won't be
picked up by Apple's Windows build.
* WebCore.vcproj/WebCore.vcproj: Updated for file move and let VS
re-sort the files.
* WebCore.vcproj/WebCoreCairo.vsprops: Added
platform/graphics/win/cairo to the include path.
* WebCore.vcproj/copyForwardingHeaders.cmd: Copy files from
platform/graphics/win/cairo to $WebKitOutputDir.
* platform/graphics/cg/FontPlatformData.h: Touched to force this file
to be recopied for Apple's build.
* platform/graphics/win/cairo/FontPlatformData.h: Renamed from
WebCore/platform/graphics/win/FontPlatformData.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfa3a60..0633b2e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-11-11 Adam Roben <aroben at apple.com>
+
+ Windows build fix after r71816
+
+ r71816 renamed
+ WebCore/platform/graphics/cairo/FontPlatformDataCairoWin.h to
+ WebCore/platform/graphics/win/FontPlatformData.h. This made Apple's
+ Windows port pick up this header in preference to
+ WebCore/platform/cg/FontPlatformData.h, thus breaking the build. I
+ moved the file to
+ WebCore/platform/graphics/win/cairo/FontPlatformData.h so it won't be
+ picked up by Apple's Windows build.
+
+ * WebCore.vcproj/WebCore.vcproj: Updated for file move and let VS
+ re-sort the files.
+
+ * WebCore.vcproj/WebCoreCairo.vsprops: Added
+ platform/graphics/win/cairo to the include path.
+
+ * WebCore.vcproj/copyForwardingHeaders.cmd: Copy files from
+ platform/graphics/win/cairo to $WebKitOutputDir.
+
+ * platform/graphics/cg/FontPlatformData.h: Touched to force this file
+ to be recopied for Apple's build.
+
+ * platform/graphics/win/cairo/FontPlatformData.h: Renamed from
+ WebCore/platform/graphics/win/FontPlatformData.h.
+
2010-11-11 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 95c53cf..b56d76a 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23764,6 +23764,10 @@
Name="loader"
>
<File
+ RelativePath="..\loader\ ResourceLoadScheduler.h"
+ >
+ </File>
+ <File
RelativePath="..\loader\CrossOriginAccessControl.cpp"
>
</File>
@@ -24008,10 +24012,6 @@
>
</File>
<File
- RelativePath="..\loader\ ResourceLoadScheduler.h"
- >
- </File>
- <File
RelativePath="..\loader\SinkDocument.cpp"
>
</File>
@@ -24227,6 +24227,86 @@
Name="cache"
>
<File
+ RelativePath="..\loader\cache\CachedCSSStyleSheet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedCSSStyleSheet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedFont.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedFont.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedImage.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedImage.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClientWalker.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClientWalker.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceHandle.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceHandle.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceLoader.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceLoader.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedScript.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedScript.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedXSLStyleSheet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedXSLStyleSheet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachePolicy.h"
+ >
+ </File>
+ <File
RelativePath="..\loader\cache\MemoryCache.cpp"
>
</File>
@@ -24234,86 +24314,6 @@
RelativePath="..\loader\cache\MemoryCache.h"
>
</File>
- <File
- RelativePath="..\loader\cache\CachedCSSStyleSheet.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedCSSStyleSheet.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedFont.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedFont.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedImage.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedImage.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResource.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResource.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceClient.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceClientWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceClientWalker.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceHandle.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceHandle.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedResourceLoader.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedScript.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedScript.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedXSLStyleSheet.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachedXSLStyleSheet.h"
- >
- </File>
- <File
- RelativePath="..\loader\cache\CachePolicy.h"
- >
- </File>
</Filter>
</Filter>
<Filter
@@ -26545,6 +26545,46 @@
/>
</FileConfiguration>
</File>
+ <Filter
+ Name="cairo"
+ >
+ <File
+ RelativePath="..\platform\graphics\win\cairo\FontPlatformData.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Filter>
<Filter
Name="cg"
@@ -27190,42 +27230,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\platform\graphics\win\FontPlatformData.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\platform\graphics\cairo\GradientCairo.cpp"
>
<FileConfiguration
@@ -41991,7 +41995,7 @@
RelativePath="..\dom\DOMTimeStamp.h"
>
</File>
- <File
+ <File
RelativePath="..\dom\DynamicNodeList.cpp"
>
<FileConfiguration
@@ -45984,7 +45988,7 @@
>
</File>
<File
- RelativePath="..\editing\CorrectionPanelInfo.h"
+ RelativePath="..\editing\CorrectionPanelInfo.h"
>
</File>
<File
@@ -46340,10 +46344,6 @@
>
</File>
<File
- RelativePath="..\editing\EditingStyle.h"
- >
- </File>
- <File
RelativePath="..\editing\EditingStyle.cpp"
>
<FileConfiguration
@@ -46396,6 +46396,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\editing\EditingStyle.h"
+ >
+ </File>
+ <File
RelativePath="..\editing\Editor.cpp"
>
<FileConfiguration
@@ -63968,11 +63972,11 @@
>
</File>
<File
- RelativePath="..\inspector\InspectorFileSystemAgent.h"
+ RelativePath="..\inspector\InspectorFileSystemAgent.cpp"
>
</File>
<File
- RelativePath="..\inspector\InspectorFileSystemAgent.cpp"
+ RelativePath="..\inspector\InspectorFileSystemAgent.h"
>
</File>
<File
diff --git a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
index 8c2e770..adc4548 100644
--- a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
+++ b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
@@ -6,6 +6,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\cairo";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\webp";"$(WebKitLibrariesDir)\include\cairo""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\win\cairo";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\cairo";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\webp";"$(WebKitLibrariesDir)\include\cairo""
/>
</VisualStudioPropertySheet>
diff --git a/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd b/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
index d9d45b5..57ccb7b 100755
--- a/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
+++ b/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
@@ -39,6 +39,7 @@ xcopy /y /d "%ProjectDir%..\platform\graphics\*.h" "%WebKitOutputDir%\include\We
xcopy /y /d "%ProjectDir%..\platform\graphics\%1\*.h" "%WebKitOutputDir%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\graphics\transforms\*.h" "%WebKitOutputDir%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\graphics\win\*.h" "%WebKitOutputDir%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\platform\graphics\win\%1\*.h" "%WebKitOutputDir%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\graphics\opentype\*.h" "%WebKitOutputDir%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\text\*.h" "%WebKitOutputDir%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\text\transcoder\*.h" "%WebKitOutputDir%\include\WebCore"
diff --git a/WebCore/platform/graphics/cg/FontPlatformData.h b/WebCore/platform/graphics/cg/FontPlatformData.h
index b261f87..08da69f 100644
--- a/WebCore/platform/graphics/cg/FontPlatformData.h
+++ b/WebCore/platform/graphics/cg/FontPlatformData.h
@@ -97,6 +97,6 @@ private:
bool m_useGDI;
};
-}
+} // namespace WebCore
#endif
diff --git a/WebCore/platform/graphics/win/FontPlatformData.h b/WebCore/platform/graphics/win/cairo/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/win/FontPlatformData.h
rename to WebCore/platform/graphics/win/cairo/FontPlatformData.h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list