Skip to site navigation (Press enter)

[webkit-changes] [165417] trunk/Source/WebCore

bfulgham Mon, 10 Mar 2014 17:11:25 -0700

Title: [165417] trunk/Source/WebCore

Revision: 165417
Author: [email protected]
Date: 2014-03-10 17:16:40 -0700 (Mon, 10 Mar 2014)

Log Message

Unreviewed Windows Build Fix.

* WebCore.vcxproj/WebCore.vcxproj: Don't build cURL files for Apple Windows port.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::LayerClient::platformCALayerPaintContents): Correct
method signature to match base class.
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::loadInternal): Use proper character encoding.


Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (165416 => 165417)


--- trunk/Source/WebCore/ChangeLog	2014-03-10 23:41:42 UTC (rev 165416)
+++ trunk/Source/WebCore/ChangeLog	2014-03-11 00:16:40 UTC (rev 165417)
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        Unreviewed Windows Build Fix.
+
+        * WebCore.vcxproj/WebCore.vcxproj: Don't build cURL files for Apple Windows port.
+        * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::LayerClient::platformCALayerPaintContents): Correct
+        method signature to match base class.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::loadInternal): Use proper character encoding.
+
 2014-03-10  Simon Fraser  <[email protected]>
 
         Fix three leaks

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (165416 => 165417)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2014-03-10 23:41:42 UTC (rev 165416)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2014-03-11 00:16:40 UTC (rev 165417)
@@ -7512,12 +7512,12 @@
     <ClCompile Include="..\platform\win\SharedTimerWin.cpp" />
     <ClCompile Include="..\platform\win\SoundWin.cpp" />
     <ClCompile Include="..\platform\win\StructuredExceptionHandlerSuppressor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\platform\win\SystemInfo.cpp" />
     <ClCompile Include="..\platform\win\TemporaryLinkStubs.cpp" />
@@ -8346,12 +8346,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\platform\network\curl\CurlCacheManager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\platform\network\curl\CurlDownload.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -8388,6 +8396,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\platform\network\curl\ProxyServerCurl.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -19344,12 +19356,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
     <CustomBuildStep Include="..\platform\network\curl\CurlCacheEntry.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
     <CustomBuildStep Include="..\platform\network\curl\FormDataStreamCurl.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -19366,6 +19386,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
     <CustomBuildStep Include="..\platform\network\curl\ResourceError.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -19902,7 +19926,7 @@
     <ClInclude Include="..\rendering\svg\SVGTextMetricsBuilder.h" />
     <ClInclude Include="..\rendering\svg\SVGTextQuery.h" />
     <ClInclude Include="..\rendering\svg\SVGTextRunRenderingContext.h" />
-    <ClInclude Include="..\replay\UserInputBridge.h" />   
+    <ClInclude Include="..\replay\UserInputBridge.h" />
     <ClInclude Include="..\xml\DOMParser.h" />
     <ClInclude Include="..\xml\NativeXPathNSResolver.h" />
     <ClInclude Include="..\xml\XMLErrors.h" />
@@ -20857,4 +20881,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (165416 => 165417)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2014-03-10 23:41:42 UTC (rev 165416)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2014-03-11 00:16:40 UTC (rev 165417)
@@ -888,9 +888,6 @@
     <ClCompile Include="..\loader\PingLoader.cpp">
       <Filter>loader</Filter>
     </ClCompile>
-    <ClCompile Include="..\loader\PlaceholderDocument.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
     <ClCompile Include="..\loader\PolicyCallback.cpp">
       <Filter>loader</Filter>
     </ClCompile>
@@ -2727,7 +2724,7 @@
     <ClCompile Include="..\rendering\mathml\RenderMathMLMath.cpp">
       <Filter>rendering\mathml</Filter>
     </ClCompile>
-	<ClCompile Include="..\rendering\mathml\RenderMathMLMenclose.cpp">
+    <ClCompile Include="..\rendering\mathml\RenderMathMLMenclose.cpp">
       <Filter>rendering\mathml</Filter>
     </ClCompile>
     <ClCompile Include="..\rendering\mathml\RenderMathMLOperator.cpp">
@@ -4071,9 +4068,6 @@
     <ClCompile Include="..\html\forms\FileIconLoader.cpp">
       <Filter>html\forms</Filter>
     </ClCompile>
-    <ClCompile Include="..\html\parser\CompactHTMLToken.cpp">
-      <Filter>html\parser</Filter>
-    </ClCompile>
     <ClCompile Include="..\html\parser\CSSPreloadScanner.cpp">
       <Filter>html\parser</Filter>
     </ClCompile>
@@ -7011,6 +7005,16 @@
     <ClCompile Include="..\rendering\line\LineInfo.cpp" />
     <ClCompile Include="..\rendering\line\TrailingObjects.cpp" />
     <ClCompile Include="..\inspector\InspectorNodeFinder.cpp" />
+    <ClCompile Include="..\Modules\indexeddb\IDBKeyData.cpp" />
+    <ClCompile Include="..\page\ContextMenuContext.cpp" />
+    <ClCompile Include="..\platform\audio\AudioSession.cpp" />
+    <ClCompile Include="..\platform\audio\MediaSession.cpp" />
+    <ClCompile Include="..\platform\audio\MediaSessionManager.cpp" />
+    <ClCompile Include="..\platform\text\icu\UTextProvider.cpp" />
+    <ClCompile Include="..\platform\text\icu\UTextProviderLatin1.cpp" />
+    <ClCompile Include="..\platform\text\icu\UTextProviderUTF16.cpp" />
+    <ClCompile Include="..\dom\CollectionIndexCache.cpp" />
+    <ClCompile Include="..\html\HTMLMediaSession.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Modules\geolocation\Coordinates.h">
@@ -7499,9 +7503,6 @@
     <ClInclude Include="..\page\DOMWindowProperty.h">
       <Filter>page</Filter>
     </ClInclude>
-    <ClCompile Include="..\page\DefaultVisitedLinkStore.h">
-      <Filter>page</Filter>
-    </ClCompile>
     <ClInclude Include="..\page\DragActions.h">
       <Filter>page</Filter>
     </ClInclude>
@@ -7613,9 +7614,6 @@
     <ClInclude Include="..\page\UserStyleSheetTypes.h">
       <Filter>page</Filter>
     </ClInclude>
-    <ClCompile Include="..\page\VisitedLinkStore.h">
-      <Filter>page</Filter>
-    </ClCompile>
     <ClInclude Include="..\fileapi\WebKitBlobBuilder.h">
       <Filter>page</Filter>
     </ClInclude>
@@ -7718,9 +7716,6 @@
     <ClInclude Include="..\loader\PingLoader.h">
       <Filter>loader</Filter>
     </ClInclude>
-    <ClInclude Include="..\loader\PlaceholderDocument.h">
-      <Filter>loader</Filter>
-    </ClInclude>
     <ClInclude Include="..\loader\PolicyCallback.h">
       <Filter>loader</Filter>
     </ClInclude>
@@ -11051,9 +11046,6 @@
     <ClInclude Include="..\html\URLInputType.h">
       <Filter>html</Filter>
     </ClInclude>
-    <ClCompile Include="..\html\URLUtils.h">
-      <Filter>html</Filter>
-    </ClCompile>
     <ClInclude Include="..\html\ValidationMessage.h">
       <Filter>html</Filter>
     </ClInclude>
@@ -11072,9 +11064,6 @@
     <ClInclude Include="..\html\parser\AtomicHTMLToken.h">
       <Filter>html\parser</Filter>
     </ClInclude>
-    <ClInclude Include="..\html\parser\CompactHTMLToken.h">
-      <Filter>html\parser</Filter>
-    </ClInclude>
     <ClInclude Include="..\html\parser\CSSPreloadScanner.h">
       <Filter>html\parser</Filter>
     </ClInclude>
@@ -14377,18 +14366,6 @@
     <ClInclude Include="..\html\canvas\EXTTextureFilterAnisotropic.h">
       <Filter>html\canvas</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\audio\AudioSession.h">
-      <Filter>platform\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\audio\AudioSessionListener.h">
-      <Filter>platform\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\audio\MediaSession.h">
-      <Filter>platform\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\audio\MediaSessionManager.h">
-      <Filter>platform\audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\platform\graphics\ANGLEWebKitBridge.h">
       <Filter>platform\graphics</Filter>
     </ClInclude>
@@ -14825,6 +14802,15 @@
     <ClInclude Include="..\rendering\line\LineInlineHeaders.h" />
     <ClInclude Include="..\rendering\line\LineWidth.h" />
     <ClInclude Include="..\rendering\line\TrailingObjects.h" />
+    <ClInclude Include="..\page\ContextMenuContext.h" />
+    <ClInclude Include="..\page\DefaultVisitedLinkStore.h" />
+    <ClInclude Include="..\page\VisitedLinkStore.h" />
+    <ClInclude Include="..\platform\audio\AudioSession.h" />
+    <ClInclude Include="..\platform\audio\AudioSessionListener.h" />
+    <ClInclude Include="..\platform\audio\MediaSession.h" />
+    <ClInclude Include="..\platform\audio\MediaSessionManager.h" />
+    <ClInclude Include="..\html\ElementMediaSession.h" />
+    <ClInclude Include="..\html\URLUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\css\CSSGrammar.y.in">
@@ -15035,4 +15021,4 @@
       <Filter>platform\win</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (165416 => 165417)


--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp	2014-03-10 23:41:42 UTC (rev 165416)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp	2014-03-11 00:16:40 UTC (rev 165417)
@@ -96,7 +96,7 @@
 
     virtual void platformCALayerAnimationStarted(CFTimeInterval beginTime) { }
     virtual GraphicsLayer::CompositingCoordinatesOrientation platformCALayerContentsOrientation() const { return GraphicsLayer::CompositingCoordinatesBottomUp; }
-    virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const IntRect& inClip) { }
+    virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const FloatRect& inClip) { }
     virtual bool platformCALayerShowDebugBorders() const { return false; }
     virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const { return false; }
     virtual int platformCALayerIncrementRepaintCount(PlatformCALayer*) { return 0; }
@@ -366,7 +366,7 @@
 
     m_movie = adoptRef(new QTMovie(m_movieClient.get()));
 
-    m_movie->load(url.characters(), url.length(), m_player->preservesPitch());
+    m_movie->load(url.characters16(), url.length(), m_player->preservesPitch());
     m_movie->setVolume(m_player->volume());
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes