Commit dd53e679 authored by bfulgham@apple.com's avatar bfulgham@apple.com

Source/WebCore: [Win] Implement the media controls in JavaScript

https://bugs.webkit.org/show_bug.cgi?id=122166

Reviewed by Jer Noble.

* DerivedSources.make: Uncomment feature flag test.
* WebCore.vcxproj/WebCore.vcxproj: Add new media control implementation files.
Also cleaned up some misplaced files in the project tree.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.vcxproj/WebCoreCommon.props: Add missing include path for the
mediacontrols path.
* WebCore.vcxproj/copyForwardingHeaders.cmd: Add Modules/mediacontrols to copied headers.
* rendering/RenderThemeWin.cpp: Add missing include for UserAgentScripts.

WebKitLibraries: [Win] Implement the media controls in JavaScript.
https://bugs.webkit.org/show_bug.cgi?id=122166

Reviewed by Jer Noble.

* win/tools/vsprops/FeatureDefines.props: Activate the
ENABLE_MEDIA_CONTROLS_SCRIPT flag.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 288d7158
2013-10-01 Brent Fulgham <bfulgham@apple.com>
[Win] Implement the media controls in JavaScript
https://bugs.webkit.org/show_bug.cgi?id=122166
Reviewed by Jer Noble.
* DerivedSources.make: Uncomment feature flag test.
* WebCore.vcxproj/WebCore.vcxproj: Add new media control implementation files.
Also cleaned up some misplaced files in the project tree.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.vcxproj/WebCoreCommon.props: Add missing include path for the
mediacontrols path.
* WebCore.vcxproj/copyForwardingHeaders.cmd: Add Modules/mediacontrols to copied headers.
* rendering/RenderThemeWin.cpp: Add missing include for UserAgentScripts.
2013-10-01 Alex Christensen <achristensen@webkit.org>
Added adoptCOM to COMPtr on Windows.
......@@ -829,9 +829,9 @@ ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_DEFINES)), ENABLE_FULLSCREEN_
USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/fullscreen.css
endif
# ifeq ($(findstring ENABLE_MEDIA_CONTROLS_SCRIPT,$(FEATURE_DEFINES)), ENABLE_MEDIA_CONTROLS_SCRIPT)
ifeq ($(findstring ENABLE_MEDIA_CONTROLS_SCRIPT,$(FEATURE_DEFINES)), ENABLE_MEDIA_CONTROLS_SCRIPT)
USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/Modules/mediacontrols/mediaControlsApple.css
# endif
endif
UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
......
......@@ -6425,6 +6425,7 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\MathMLNames.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementFactory.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGNames.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScriptsData.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentStyleSheetsData.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
......@@ -6565,7 +6566,7 @@
<ClCompile Include="..\Modules\quota\StorageErrorCallback.cpp" />
<ClCompile Include="..\Modules\quota\StorageInfo.cpp" />
<ClCompile Include="..\Modules\quota\StorageQuota.cpp" />
<ClInclude Include="..\Modules\mediacontrols\MediaControlsHost.cpp" />
<ClCompile Include="..\Modules\mediacontrols\MediaControlsHost.cpp" />
<ClCompile Include="..\Modules\mediasource\MediaSource.cpp" />
<ClCompile Include="..\Modules\mediasource\MediaSourceRegistry.cpp" />
<ClCompile Include="..\Modules\mediasource\SourceBuffer.cpp" />
......@@ -18226,6 +18227,7 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementFactory.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementTypeHelpers.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGNames.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScripts.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentStyleSheets.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\WebKitFontFamilyNames.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\XMLNames.h" />
......@@ -20611,6 +20613,8 @@
<None Include="..\css\themeWin.css" />
<None Include="..\css\themeWinQuirks.css" />
<None Include="..\css\view-source.css" />
<None Include="..\Modules\mediacontrols\mediaControlsApple.css" />
<None Include="..\Modules\mediacontrols\mediaControlsApple.js" />
<None Include="..\xml\XPathGrammar.y" />
<None Include="..\bindings\scripts\CodeGenerator.pm" />
<None Include="..\bindings\scripts\CodeGeneratorJS.pm" />
......@@ -295,6 +295,12 @@
<Filter Include="platform\graphics\egl">
<UniqueIdentifier>{e27b348d-0b87-4e5f-b5b9-b99e283ea22b}</UniqueIdentifier>
</Filter>
<Filter Include="rendering\shapes">
<UniqueIdentifier>{c1c88449-966f-4628-a88b-16c30f08dd7e}</UniqueIdentifier>
</Filter>
<Filter Include="Modules\indexeddb\leveldb">
<UniqueIdentifier>{54c889f7-b5e7-491e-9029-65dc7185b9d0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\DerivedSources.cpp">
......@@ -2361,21 +2367,6 @@
<ClCompile Include="..\rendering\EllipsisBox.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\PolygonShape.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\RectangleShape.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\Shape.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\ShapeInsideInfo.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\ShapeOutsideInfo.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\FilterEffectRenderer.cpp">
<Filter>rendering</Filter>
</ClCompile>
......@@ -6853,9 +6844,6 @@
<ClCompile Include="..\dom\InlineStyleSheetOwner.cpp">
<Filter>dom</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\RasterShape.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\style\StyleFontSizeFunctions.cpp">
<Filter>css</Filter>
</ClCompile>
......@@ -6871,21 +6859,69 @@
<ClCompile Include="..\bindings\js\WebCoreTypedArrayController.cpp">
<Filter>bindings\js</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderBlockFlow.cpp" />
<ClCompile Include="..\platform\win\StructuredExceptionHandlerSuppressor.cpp">
<Filter>platform\win</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.cpp" />
<ClCompile Include="..\rendering\FloatingObjects.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBCursorBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBDatabaseBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBFactoryBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBObjectStoreBackendLevelDB.cpp" />
<ClCompile Include="..\platform\graphics\FloatPolygon.cpp" />
<ClCompile Include="..\rendering\LineWidth.cpp" />
<ClCompile Include="..\rendering\RenderLineBreak.cpp" />
<ClCompile Include="..\rendering\RenderElement.cpp" />
<ClCompile Include="..\rendering\shapes\ShapeInfo.cpp" />
<ClCompile Include="..\rendering\FloatingObjects.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderBlockFlow.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderElement.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderLineBreak.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\platform\graphics\FloatPolygon.cpp">
<Filter>platform\graphics</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\Shape.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\ShapeInfo.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\ShapeInsideInfo.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\ShapeOutsideInfo.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\PolygonShape.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\RasterShape.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\rendering\shapes\RectangleShape.cpp">
<Filter>rendering\shapes</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBCursorBackendLevelDB.cpp">
<Filter>Modules\indexeddb\leveldb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBDatabaseBackendLevelDB.cpp">
<Filter>Modules\indexeddb\leveldb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBFactoryBackendLevelDB.cpp">
<Filter>Modules\indexeddb\leveldb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBObjectStoreBackendLevelDB.cpp">
<Filter>Modules\indexeddb\leveldb</Filter>
</ClCompile>
<ClCompile Include="..\rendering\LineWidth.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScriptsData.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="..\Modules\mediacontrols\MediaControlsHost.cpp">
<Filter>Modules\mediacontrols</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\geolocation\Coordinates.h">
......@@ -9096,24 +9132,6 @@
<ClInclude Include="..\rendering\EllipsisBox.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\PolygonShape.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\RectangleShape.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\Shape.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeInsideInfo.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeInterval.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeOutsideInfo.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\FilterEffectRenderer.h">
<Filter>rendering</Filter>
</ClInclude>
......@@ -14453,9 +14471,6 @@
<ClInclude Include="..\dom\InlineStyleSheetOwner.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\RasterShape.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\style\StyleResolveTree.h">
<Filter>css</Filter>
</ClInclude>
......@@ -14468,21 +14483,64 @@
<ClInclude Include="..\dom\TextNodeTraversal.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementTypeHelpers.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementTypeHelpers.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.h" />
<ClInclude Include="..\rendering\FloatingObjects.h" />
<ClInclude Include="..\platform\graphics\win\SharedGDIObject.h">
<Filter>platform\graphics\win</Filter>
</ClInclude>
<ClInclude Include="..\Modules\mediacontrols\MediaControlsHost.cpp" />
<ClInclude Include="..\platform\graphics\FloatPolygon.h" />
<ClInclude Include="..\rendering\LineInfo.h" />
<ClInclude Include="..\rendering\LineLayoutState.h" />
<ClInclude Include="..\rendering\LineWidth.h" />
<ClInclude Include="..\rendering\RenderElement.h" />
<ClInclude Include="..\rendering\RenderLineBreak.h" />
<ClInclude Include="..\rendering\shapes\ShapeInfo.h" />
<ClInclude Include="..\rendering\FloatingObjects.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderLineBreak.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderElement.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\platform\graphics\FloatPolygon.h">
<Filter>platform\graphics</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeOutsideInfo.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\Shape.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeInfo.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeInsideInfo.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\ShapeInterval.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\RasterShape.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\PolygonShape.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\shapes\RectangleShape.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\LineWidth.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\LineLayoutState.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\LineInfo.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementTypeHelpers.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementTypeHelpers.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScripts.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
......@@ -15330,6 +15388,12 @@
<None Include="..\Resources\plugIns.js">
<Filter>plugins</Filter>
</None>
<None Include="..\Modules\mediacontrols\mediaControlsApple.css">
<Filter>Modules\mediacontrols</Filter>
</None>
<None Include="..\Modules\mediacontrols\mediaControlsApple.js">
<Filter>Modules\mediacontrols</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.h">
......
......@@ -7,11 +7,11 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\mediastream;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\shapes;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\style;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(ProjectDir)..\platform\graphics\gpu;$(ProjectDir)..\platform\graphics\egl;$(ProjectDir)..\platform\graphics\surfaces;$(ProjectDir)..\platform\graphics\surfaces\egl;$(ProjectDir)..\platform\graphics\opengl;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\mediacontrols;$(ProjectDir)..\Modules\mediastream;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\shapes;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\style;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(ProjectDir)..\platform\graphics\gpu;$(ProjectDir)..\platform\graphics\egl;$(ProjectDir)..\platform\graphics\surfaces;$(ProjectDir)..\platform\graphics\surfaces\egl;$(ProjectDir)..\platform\graphics\opengl;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>WebCorePrefix.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>WebCorePrefix.h;ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -16,6 +16,7 @@ xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\mediacontrols\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\mediasource\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\navigatorcontentutils\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\notifications\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
......
......@@ -36,6 +36,7 @@
#include "Settings.h"
#include "SoftLinking.h"
#include "SystemInfo.h"
#include "UserAgentScripts.h"
#include "UserAgentStyleSheets.h"
#include <wtf/win/GDIObject.h>
......
2013-10-01 Brent Fulgham <bfulgham@apple.com>
[Win] Implement the media controls in JavaScript.
https://bugs.webkit.org/show_bug.cgi?id=122166
Reviewed by Jer Noble.
* win/tools/vsprops/FeatureDefines.props: Activate the
ENABLE_MEDIA_CONTROLS_SCRIPT flag.
2013-09-24 Bear Travis <betravis@adobe.com>
Disable CSS_SHAPES on Windows
......
......@@ -52,6 +52,7 @@
<ENABLE_LINK_PREFETCH />
<ENABLE_LINK_PRERENDER />
<ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
<ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
<ENABLE_MEDIA_SOURCE />
<ENABLE_MEDIA_STATISTICS>ENABLE_MEDIA_STATISTICS</ENABLE_MEDIA_STATISTICS>
<ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
......@@ -91,7 +92,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -299,6 +300,10 @@
<Value>$(ENABLE_MATHML)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="ENABLE_MEDIA_CONTROLS_SCRIPT">
<Value>$(ENABLE_MEDIA_CONTROLS_SCRIPT)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="ENABLE_MEDIA_SOURCE">
<Value>$(ENABLE_MEDIA_SOURCE)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment