Commit 2edc679f authored by bfulgham@apple.com's avatar bfulgham@apple.com

Prepare CaptionUserPreferencesMac for use on Windows port.

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

Reviewed by Eric Carlson.

* WebCore.vcxproj/WebCore.vcxproj: Add new files.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Update for new file name.
* page/CaptionUserPreferencesMac.h: Removed.
* page/CaptionUserPreferencesMac.mm: Removed.
* page/CaptionUserPreferencesMediaAF.cpp: Copied from page/CaptionUserPreferencesMac.mm.
* page/CaptionUserPreferencesMediaAF.h: Copied from page/CaptionUserPreferencesMac.h.
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences): Updated to new class name.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152004 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9d34c608
2013-06-26 Brent Fulgham <bfulgham@apple.com>
Prepare CaptionUserPreferencesMac for use on Windows port.
https://bugs.webkit.org/show_bug.cgi?id=118069
Reviewed by Eric Carlson.
* WebCore.vcxproj/WebCore.vcxproj: Add new files.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Update for new file name.
* page/CaptionUserPreferencesMac.h: Removed.
* page/CaptionUserPreferencesMac.mm: Removed.
* page/CaptionUserPreferencesMediaAF.cpp: Copied from page/CaptionUserPreferencesMac.mm.
* page/CaptionUserPreferencesMediaAF.h: Copied from page/CaptionUserPreferencesMac.h.
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences): Updated to new class name.
2013-06-26 Ryosuke Niwa <rniwa@webkit.org>
Remove unneccesary cast to Node* in MediaControlTextTrackContainerElement::updateDisplay
......@@ -4141,6 +4141,14 @@
<ClCompile Include="..\page\AutoscrollController.cpp" />
<ClCompile Include="..\page\BarProp.cpp" />
<ClCompile Include="..\page\CaptionUserPreferences.cpp" />
<ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\page\Chrome.cpp" />
<ClCompile Include="..\page\animation\CompositeAnimation.cpp" />
<ClCompile Include="..\page\Console.cpp" />
......@@ -11643,6 +11651,8 @@
<ClInclude Include="..\page\animation\AnimationControllerPrivate.h" />
<ClInclude Include="..\page\AutoscrollController.h" />
<ClInclude Include="..\page\BarProp.h" />
<ClInclude Include="..\page\CaptionUserPreferences.h" />
<ClInclude Include="..\page\CaptionUserPreferencesMediaAF.h" />
<ClInclude Include="..\page\Chrome.h" />
<ClInclude Include="..\page\ChromeClient.h" />
<ClInclude Include="..\page\animation\CompositeAnimation.h" />
......@@ -7033,6 +7033,9 @@
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp">
<Filter>platform\graphics\opengl</Filter>
</ClCompile>
<ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
<Filter>page</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
......@@ -14720,6 +14723,12 @@
<ClInclude Include="..\platform\graphics\opengl\GLPlatformSurface.h">
<Filter>platform\graphics\opengl</Filter>
</ClInclude>
<ClInclude Include="..\page\CaptionUserPreferences.h">
<Filter>page</Filter>
</ClInclude>
<ClInclude Include="..\page\CaptionUserPreferencesMediaAF.h">
<Filter>page</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
......
......@@ -121,8 +121,8 @@
07941792166E855F009416C2 /* InbandTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07941790166E855F009416C2 /* InbandTextTrack.h */; };
07941794166EA04E009416C2 /* InbandTextTrackPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07941793166EA04E009416C2 /* InbandTextTrackPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
079D0868162F20E800DB8658 /* CaptionUserPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 079D0867162F20E800DB8658 /* CaptionUserPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
079D086B162F21F900DB8658 /* CaptionUserPreferencesMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 079D0869162F21F900DB8658 /* CaptionUserPreferencesMac.h */; };
079D086C162F21F900DB8658 /* CaptionUserPreferencesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 079D086A162F21F900DB8658 /* CaptionUserPreferencesMac.mm */; };
079D086B162F21F900DB8658 /* CaptionUserPreferencesMediaAF.h in Headers */ = {isa = PBXBuildFile; fileRef = 079D0869162F21F900DB8658 /* CaptionUserPreferencesMediaAF.h */; };
079D086C162F21F900DB8658 /* CaptionUserPreferencesMediaAF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 079D086A162F21F900DB8658 /* CaptionUserPreferencesMediaAF.cpp */; };
07A6D1EB1491137700051D0C /* MediaFragmentURIParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A6D1E91491137700051D0C /* MediaFragmentURIParser.cpp */; };
07A6D1EC1491137700051D0C /* MediaFragmentURIParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */; };
07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07AA6B6A166D019500D45671 /* InbandTextTrackPrivateAVFObjC.mm */; };
......@@ -6323,8 +6323,8 @@
07941790166E855F009416C2 /* InbandTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrack.h; sourceTree = "<group>"; };
07941793166EA04E009416C2 /* InbandTextTrackPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrackPrivate.h; sourceTree = "<group>"; };
079D0867162F20E800DB8658 /* CaptionUserPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CaptionUserPreferences.h; sourceTree = "<group>"; };
079D0869162F21F900DB8658 /* CaptionUserPreferencesMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CaptionUserPreferencesMac.h; sourceTree = "<group>"; };
079D086A162F21F900DB8658 /* CaptionUserPreferencesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CaptionUserPreferencesMac.mm; sourceTree = "<group>"; };
079D0869162F21F900DB8658 /* CaptionUserPreferencesMediaAF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CaptionUserPreferencesMediaAF.h; sourceTree = "<group>"; };
079D086A162F21F900DB8658 /* CaptionUserPreferencesMediaAF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CaptionUserPreferencesMediaAF.cpp; sourceTree = "<group>"; };
079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivate.h; sourceTree = "<group>"; };
07A6D1E91491137700051D0C /* MediaFragmentURIParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaFragmentURIParser.cpp; sourceTree = "<group>"; };
07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaFragmentURIParser.h; sourceTree = "<group>"; };
......@@ -14664,8 +14664,8 @@
BC124EE60C2641CD009E2349 /* BarProp.idl */,
072CA86016CB4DC3008AE131 /* CaptionUserPreferences.cpp */,
079D0867162F20E800DB8658 /* CaptionUserPreferences.h */,
079D0869162F21F900DB8658 /* CaptionUserPreferencesMac.h */,
079D086A162F21F900DB8658 /* CaptionUserPreferencesMac.mm */,
079D0869162F21F900DB8658 /* CaptionUserPreferencesMediaAF.h */,
079D086A162F21F900DB8658 /* CaptionUserPreferencesMediaAF.cpp */,
14D8238A0AF92DF60004F057 /* Chrome.cpp */,
14D823500AF92A790004F057 /* Chrome.h */,
14D824060AF93AEB0004F057 /* ChromeClient.h */,
......@@ -21082,7 +21082,7 @@
49484FCB102CF23C00187DD3 /* CanvasRenderingContext2D.h in Headers */,
49484FCE102CF23C00187DD3 /* CanvasStyle.h in Headers */,
079D0868162F20E800DB8658 /* CaptionUserPreferences.h in Headers */,
079D086B162F21F900DB8658 /* CaptionUserPreferencesMac.h in Headers */,
079D086B162F21F900DB8658 /* CaptionUserPreferencesMediaAF.h in Headers */,
6550B69E099DF0270090D781 /* CDATASection.h in Headers */,
E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
......@@ -24517,7 +24517,7 @@
49484FCA102CF23C00187DD3 /* CanvasRenderingContext2D.cpp in Sources */,
49484FCD102CF23C00187DD3 /* CanvasStyle.cpp in Sources */,
072CA86116CB4DC3008AE131 /* CaptionUserPreferences.cpp in Sources */,
079D086C162F21F900DB8658 /* CaptionUserPreferencesMac.mm in Sources */,
079D086C162F21F900DB8658 /* CaptionUserPreferencesMediaAF.cpp in Sources */,
6550B69D099DF0270090D781 /* CDATASection.cpp in Sources */,
CDA98E0B1603CD6000FEA3B1 /* CDM.cpp in Sources */,
CD47B3FC16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm in Sources */,
......@@ -20,11 +20,11 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CaptionUserPreferencesMac_h
#define CaptionUserPreferencesMac_h
#ifndef CaptionUserPreferencesMediaAF_h
#define CaptionUserPreferencesMediaAF_h
#if ENABLE(VIDEO_TRACK)
......@@ -35,10 +35,10 @@
namespace WebCore {
class CaptionUserPreferencesMac : public CaptionUserPreferences {
class CaptionUserPreferencesMediaAF : public CaptionUserPreferences {
public:
static PassOwnPtr<CaptionUserPreferencesMac> create(PageGroup* group) { return adoptPtr(new CaptionUserPreferencesMac(group)); }
virtual ~CaptionUserPreferencesMac();
static PassOwnPtr<CaptionUserPreferencesMediaAF> create(PageGroup* group) { return adoptPtr(new CaptionUserPreferencesMediaAF(group)); }
virtual ~CaptionUserPreferencesMediaAF();
#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
virtual CaptionDisplayMode captionDisplayMode() const OVERRIDE;
......@@ -46,7 +46,7 @@ public:
virtual bool userPrefersCaptions() const OVERRIDE;
virtual bool userPrefersSubtitles() const OVERRIDE;
virtual float captionFontSizeScaleAndImportance(bool&) const OVERRIDE;
virtual void setInterestedInCaptionPreferenceChanges() OVERRIDE;
......@@ -67,7 +67,7 @@ public:
virtual String displayNameForTrack(TextTrack*) const OVERRIDE;
private:
CaptionUserPreferencesMac(PageGroup*);
CaptionUserPreferencesMediaAF(PageGroup*);
#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
String captionsWindowCSS() const;
......@@ -84,7 +84,7 @@ private:
bool m_listeningForPreferenceChanges;
#endif
};
}
#endif
......
......@@ -41,7 +41,7 @@
#if ENABLE(VIDEO_TRACK)
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
#include "CaptionUserPreferencesMac.h"
#include "CaptionUserPreferencesMediaAF.h"
#else
#include "CaptionUserPreferences.h"
#endif
......@@ -420,7 +420,7 @@ CaptionUserPreferences* PageGroup::captionPreferences()
{
if (!m_captionPreferences)
#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
m_captionPreferences = CaptionUserPreferencesMac::create(this);
m_captionPreferences = CaptionUserPreferencesMediaAF::create(this);
#else
m_captionPreferences = CaptionUserPreferences::create(this);
#endif
......
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