Diff
Modified: trunk/Source/WebCore/ChangeLog (166781 => 166782)
--- trunk/Source/WebCore/ChangeLog 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 16:12:35 UTC (rev 166782)
@@ -1,3 +1,20 @@
+2014-04-03 Brent Fulgham <[email protected]>
+
+ [Win] Load Media Controls js/css from bundle
+ https://bugs.webkit.org/show_bug.cgi?id=131194
+
+ Reviewed by Dean Jackson.
+
+ * DerivedSources.cpp: Remove no-longer generated file.
+ * DerivedSources.make: Don't generate unneeded files.
+ * WebCore.vcxproj/WebCore.vcxproj: Don't compile unneeded files.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * WebCore.vcxproj/copyWebCoreResourceFiles.cmd: Copy css/js to resource
+ * rendering/RenderThemeSafari.cpp:
+ * rendering/RenderThemeSafari.h:
+ * rendering/RenderThemeWin.cpp:
+ * rendering/RenderThemeWin.h:
+
2014-04-04 Mihnea Ovidenie <[email protected]>
[CSSRegions] Region's behaviour not updated when becoming valid from invalid
Modified: trunk/Source/WebCore/DerivedSources.cpp (166781 => 166782)
--- trunk/Source/WebCore/DerivedSources.cpp 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-04-04 16:12:35 UTC (rev 166782)
@@ -246,7 +246,6 @@
#include "JSMediaController.cpp"
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
#include "JSMediaControlsHost.cpp"
-#include "UserAgentScriptsData.cpp"
#endif
#include "JSMediaError.cpp"
#include "JSMediaList.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (166781 => 166782)
--- trunk/Source/WebCore/DerivedSources.make 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/DerivedSources.make 2014-04-04 16:12:35 UTC (rev 166782)
@@ -882,12 +882,6 @@
USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/fullscreen.css
endif
-ifeq ($(OS),Windows_NT)
-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
-
ifeq ($(findstring ENABLE_IMAGE_CONTROLS,$(FEATURE_DEFINES)), ENABLE_IMAGE_CONTROLS)
USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/html/shadow/mac/imageControlsMac.css
endif
@@ -905,12 +899,6 @@
USER_AGENT_SCRIPTS =
-ifeq ($(OS),Windows_NT)
-ifeq ($(findstring ENABLE_MEDIA_CONTROLS_SCRIPT,$(FEATURE_DEFINES)), ENABLE_MEDIA_CONTROLS_SCRIPT)
- USER_AGENT_SCRIPTS := $(USER_AGENT_SCRIPTS) $(WebCore)/Modules/mediacontrols/mediaControlsApple.js
-endif
-endif
-
ifeq ($(OS),MACOS)
USER_AGENT_SCRIPTS := $(USER_AGENT_SCRIPTS) $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js
endif
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166781 => 166782)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-04-04 16:12:35 UTC (rev 166782)
@@ -6425,20 +6425,6 @@
<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">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
<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>
@@ -18539,7 +18525,6 @@
<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" />
@@ -21155,4 +21140,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 (166781 => 166782)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-04-04 16:12:35 UTC (rev 166782)
@@ -6829,9 +6829,6 @@
<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>
@@ -14829,9 +14826,6 @@
<ClInclude Include="..\rendering\TextPaintStyle.h">
<Filter>rendering</Filter>
</ClInclude>
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScripts.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
<ClInclude Include="..\rendering\OrderIterator.h">
<Filter>rendering</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd (166781 => 166782)
--- trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2014-04-04 16:12:35 UTC (rev 166782)
@@ -1,2 +1,4 @@
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
+xcopy /y /d /s "%ProjectDir%..\Modules\mediacontrols\mediaControlsApple.css" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
+xcopy /y /d /s "%ProjectDir%..\Modules\mediacontrols\mediaControlsApple.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (166781 => 166782)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-04 16:12:35 UTC (rev 166782)
@@ -46,13 +46,10 @@
#include "SoftLinking.h"
#include "StyleResolver.h"
#include "UserAgentStyleSheets.h"
+#include "WebCoreBundleWin.h"
#include <CoreGraphics/CoreGraphics.h>
#include <wtf/RetainPtr.h>
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
-#include "UserAgentScripts.h"
-#endif
-
using std::min;
// FIXME: The platform-independent code in this class should be factored out and merged with RenderThemeMac.
@@ -1178,7 +1175,9 @@
String RenderThemeSafari::mediaControlsStyleSheet()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- return String(mediaControlsAppleUserAgentStyleSheet, sizeof(mediaControlsAppleUserAgentStyleSheet));
+ if (m_mediaControlsStyleSheet.isEmpty())
+ m_mediaControlsStyleSheet = RenderThemeWin::stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("css"));
+ return m_mediaControlsStyleSheet;
#else
return emptyString();
#endif
@@ -1187,7 +1186,9 @@
String RenderThemeSafari::mediaControlsScript()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- return String(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
+ if (m_mediaControlsScript.isEmpty())
+ m_mediaControlsScript = RenderThemeWin::stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("js"));
+ return m_mediaControlsScript;
#else
return emptyString();
#endif
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (166781 => 166782)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-04 16:12:35 UTC (rev 166782)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2008, 2013 Apple Inc.
+ * Copyright (C) 2007, 2008, 2013, 2014 Apple Inc.
* Copyright (C) 2009 Kenneth Rohde Christiansen
*
* This library is free software; you can redistribute it and/or
@@ -181,6 +181,9 @@
void setSearchFieldSize(RenderStyle*) const;
ThemeControlState determineState(RenderObject*) const;
+
+ String m_mediaControlsScript;
+ String m_mediaControlsStyleSheet;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (166781 => 166782)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-04 16:12:35 UTC (rev 166782)
@@ -37,12 +37,9 @@
#include "SoftLinking.h"
#include "SystemInfo.h"
#include "UserAgentStyleSheets.h"
+#include "WebCoreBundleWin.h"
#include <wtf/win/GDIObject.h>
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
-#include "UserAgentScripts.h"
-#endif
-
#if ENABLE(VIDEO)
#include "RenderMediaControls.h"
#endif
@@ -1079,10 +1076,65 @@
}
#if ENABLE(VIDEO)
+static const size_t maximumReasonableBufferSize = 32768;
+
+static void fillBufferWithContentsOfFile(PlatformFileHandle file, long long filesize, Vector<char>& buffer)
+{
+ // Load the file content into buffer
+ buffer.resize(filesize + 1);
+
+ int bufferPosition = 0;
+ int bufferReadSize = 4096;
+ int bytesRead = 0;
+ while (filesize > bufferPosition) {
+ if (filesize - bufferPosition < bufferReadSize)
+ bufferReadSize = filesize - bufferPosition;
+
+ bytesRead = readFromFile(file, buffer.data() + bufferPosition, bufferReadSize);
+ if (bytesRead != bufferReadSize) {
+ buffer.clear();
+ return;
+ }
+
+ bufferPosition += bufferReadSize;
+ }
+
+ buffer[filesize] = 0;
+}
+
+String RenderThemeWin::stringWithContentsOfFile(CFStringRef name, CFStringRef type)
+{
+ RetainPtr<CFURLRef> requestedURLRef = adoptCF(CFBundleCopyResourceURL(webKitBundle(), name, type, 0));
+ if (!requestedURLRef)
+ return String();
+
+ UInt8 requestedFilePath[MAX_PATH];
+ if (!CFURLGetFileSystemRepresentation(requestedURLRef.get(), false, requestedFilePath, MAX_PATH))
+ return String();
+
+ PlatformFileHandle requestedFileHandle = openFile(requestedFilePath, OpenForRead);
+ if (!isHandleValid(requestedFileHandle))
+ return String();
+
+ long long filesize = -1;
+ if (!getFileSize(requestedFilePath, filesize)) {
+ closeFile(requestedFileHandle);
+ return String();
+ }
+
+ Vector<char> fileContents;
+ fillBufferWithContentsOfFile(requestedFileHandle, filesize, fileContents);
+ closeFile(requestedFileHandle);
+
+ return String(fileContents.data(), static_cast<size_t>(filesize));
+}
+
String RenderThemeWin::mediaControlsStyleSheet()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- return String(mediaControlsAppleUserAgentStyleSheet, sizeof(mediaControlsAppleUserAgentStyleSheet));
+ if (m_mediaControlsStyleSheet.isEmpty())
+ m_mediaControlsStyleSheet = stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("css"));
+ return m_mediaControlsStyleSheet;
#else
return emptyString();
#endif
@@ -1091,7 +1143,9 @@
String RenderThemeWin::mediaControlsScript()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- return String(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
+ if (m_mediaControlsScript.isEmpty())
+ m_mediaControlsScript = stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("js"));
+ return m_mediaControlsScript;
#else
return emptyString();
#endif
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (166781 => 166782)
--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2014-04-04 15:05:43 UTC (rev 166781)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2014-04-04 16:12:35 UTC (rev 166782)
@@ -1,7 +1,7 @@
/*
* This file is part of the WebKit project.
*
- * Copyright (C) 2006, 2008, 2013 Apple Inc.
+ * Copyright (C) 2006, 2008, 2013, 2014 Apple Inc.
* Copyright (C) 2009 Kenneth Rohde Christiansen
*
* This library is free software; you can redistribute it and/or
@@ -120,6 +120,8 @@
static void setWebKitIsBeingUnloaded();
+ static String stringWithContentsOfFile(CFStringRef name, CFStringRef type);
+
virtual bool supportsFocusRing(const RenderStyle*) const;
#if ENABLE(VIDEO)
@@ -173,6 +175,9 @@
mutable HANDLE m_sliderTheme;
mutable HANDLE m_spinButtonTheme;
mutable HANDLE m_progressBarTheme;
+
+ String m_mediaControlsScript;
+ String m_mediaControlsStyleSheet;
};
};
