Diff
Modified: trunk/Source/WTF/ChangeLog (145636 => 145637)
--- trunk/Source/WTF/ChangeLog 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WTF/ChangeLog 2013-03-13 00:43:44 UTC (rev 145637)
@@ -1,3 +1,11 @@
+2013-03-12 Tim Horton <[email protected]>
+
+ Unreviewed attempted Windows build fix after http://trac.webkit.org/changeset/145592.
+
+ * WTF.vcproj/WTF.vcproj:
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+
2013-03-12 James Robinson <[email protected]>
Build fix for r145592 - update gyp files to refer to new file locations.
Modified: trunk/Source/WTF/WTF.vcproj/WTF.vcproj (145636 => 145637)
--- trunk/Source/WTF/WTF.vcproj/WTF.vcproj 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WTF/WTF.vcproj/WTF.vcproj 2013-03-13 00:43:44 UTC (rev 145637)
@@ -613,6 +613,18 @@
>
</File>
<File
+ RelativePath="..\wtf\AutodrainedPool.h"
+ >
+ </File>
+ <File
+ RelativePath="..\wtf\SchedulePair.h">
+ >
+ </File>
+ <File
+ RelativePath="..\wtf\SchedulePair.cpp"
+ >
+ </File>
+ <File
RelativePath="..\wtf\Bitmap.h"
>
</File>
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (145636 => 145637)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-03-13 00:43:44 UTC (rev 145637)
@@ -81,6 +81,7 @@
<ClCompile Include="..\wtf\win\MainThreadWin.cpp" />
<ClCompile Include="..\wtf\win\OwnPtrWin.cpp" />
<ClCompile Include="..\wtf\WTFThreadData.cpp" />
+ <ClCompile Include="..\wtf\SchedulePair.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\WTF\config.h" />
@@ -91,6 +92,7 @@
<ClInclude Include="..\wtf\ASCIICType.h" />
<ClInclude Include="..\wtf\Assertions.h" />
<ClInclude Include="..\wtf\Atomics.h" />
+ <ClInclude Include="..\wtf\AutodrainedPool.h" />
<ClInclude Include="..\wtf\AVLTree.h" />
<ClInclude Include="..\wtf\BitArray.h" />
<ClInclude Include="..\wtf\Bitmap.h" />
@@ -204,6 +206,7 @@
<ClInclude Include="..\wtf\RefPtrHashMap.h" />
<ClInclude Include="..\wtf\RetainPtr.h" />
<ClInclude Include="..\wtf\SaturatedArithmetic.h" />
+ <ClInclude Include="..\wtf\SchedulePair.h" />
<ClInclude Include="..\wtf\SegmentedVector.h" />
<ClInclude Include="..\wtf\SentinelLinkedList.h" />
<ClInclude Include="..\wtf\SHA1.h" />
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (145636 => 145637)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-03-13 00:43:44 UTC (rev 145637)
@@ -213,6 +213,9 @@
<ClCompile Include="..\wtf\WTFThreadData.cpp">
<Filter>wtf</Filter>
</ClCompile>
+ <ClCompile Include="..\wtf\SchedulePair.cpp">
+ <Filter>wtf</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\wtf\dtoa\utils.h">
@@ -725,6 +728,12 @@
<ClInclude Include="..\wtf\VMTags.h">
<Filter>wtf</Filter>
</ClInclude>
+ <ClInclude Include="..\wtf\SchedulePair.h">
+ <Filter>wtf</Filter>
+ </ClInclude>
+ <ClInclude Include="..\wtf\AutodrainedPool.h">
+ <Filter>wtf</Filter>
+ </ClInclude>
<ClInclude Include="..\WTF\config.h" />
</ItemGroup>
<ItemGroup>
Modified: trunk/Source/WebCore/ChangeLog (145636 => 145637)
--- trunk/Source/WebCore/ChangeLog 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WebCore/ChangeLog 2013-03-13 00:43:44 UTC (rev 145637)
@@ -1,3 +1,11 @@
+2013-03-12 Tim Horton <[email protected]>
+
+ Unreviewed attempted Windows build fix after http://trac.webkit.org/changeset/145592.
+
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+
2013-03-12 James Robinson <[email protected]>
Fix Gamepad::axes and Gamepad::buttons to avoid calling std::copy(..., ..., 0)
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (145636 => 145637)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-13 00:43:44 UTC (rev 145637)
@@ -28643,10 +28643,6 @@
>
</File>
<File
- RelativePath="..\platform\AutodrainedPool.h"
- >
- </File>
- <File
RelativePath="..\platform\CalculationValue.cpp"
>
</File>
@@ -29726,14 +29722,6 @@
>
</File>
<File
- RelativePath="..\platform\cf\SchedulePair.cpp"
- >
- </File>
- <File
- RelativePath="..\platform\cf\SchedulePair.h"
- >
- </File>
- <File
RelativePath="..\platform\cf\SharedBufferCF.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (145636 => 145637)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-13 00:43:44 UTC (rev 145637)
@@ -3246,7 +3246,6 @@
<ClCompile Include="..\platform\cf\BinaryPropertyList.cpp" />
<ClCompile Include="..\platform\cf\FileSystemCF.cpp" />
<ClCompile Include="..\platform\cf\KURLCFNet.cpp" />
- <ClCompile Include="..\platform\cf\SchedulePair.cpp" />
<ClCompile Include="..\platform\cf\SharedBufferCF.cpp" />
<ClCompile Include="..\platform\cf\win\CertificateCFWin.cpp" />
<ClCompile Include="..\platform\graphics\BitmapImage.cpp" />
@@ -9081,7 +9080,6 @@
<ClInclude Include="..\platform\Arena.h" />
<ClInclude Include="..\platform\AsyncFileSystem.h" />
<ClInclude Include="..\platform\AsyncFileSystemCallbacks.h" />
- <ClInclude Include="..\platform\AutodrainedPool.h" />
<ClInclude Include="..\platform\CalculationValue.h" />
<ClInclude Include="..\platform\Clock.h" />
<ClInclude Include="..\platform\ClockGeneric.h" />
@@ -9205,7 +9203,6 @@
<ClInclude Include="..\platform\win\WindowMessageListener.h" />
<ClInclude Include="..\platform\win\WindowsTouch.h" />
<ClInclude Include="..\platform\cf\BinaryPropertyList.h" />
- <ClInclude Include="..\platform\cf\SchedulePair.h" />
<ClInclude Include="..\platform\cf\win\CertificateCFWin.h" />
<ClInclude Include="..\platform\graphics\BitmapImage.h" />
<ClInclude Include="..\platform\graphics\Color.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (145636 => 145637)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-13 00:41:13 UTC (rev 145636)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-13 00:43:44 UTC (rev 145637)
@@ -6627,9 +6627,6 @@
<ClCompile Include="..\platform\cf\KURLCFNet.cpp">
<Filter>platform\cf</Filter>
</ClCompile>
- <ClCompile Include="..\platform\cf\SchedulePair.cpp">
- <Filter>platform\cf</Filter>
- </ClCompile>
<ClCompile Include="..\platform\cf\win\CertificateCFWin.cpp">
<Filter>platform\cf\win</Filter>
</ClCompile>
@@ -9222,9 +9219,6 @@
<ClInclude Include="..\platform\AsyncFileSystemCallbacks.h">
<Filter>platform</Filter>
</ClInclude>
- <ClInclude Include="..\platform\AutodrainedPool.h">
- <Filter>platform</Filter>
- </ClInclude>
<ClInclude Include="..\platform\CalculationValue.h">
<Filter>platform</Filter>
</ClInclude>
@@ -14167,9 +14161,6 @@
<ClInclude Include="..\platform\cf\BinaryPropertyList.h">
<Filter>platform\cf</Filter>
</ClInclude>
- <ClInclude Include="..\platform\cf\SchedulePair.h">
- <Filter>platform\cf</Filter>
- </ClInclude>
<ClInclude Include="..\platform\cf\win\CertificateCFWin.h">
<Filter>platform\cf\win</Filter>
</ClInclude>