Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 07:59:09 UTC (rev 184761)
@@ -1,3 +1,57 @@
+2015-05-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r184670.
+
+ 2015-05-19 Jer Noble <jer.no...@apple.com>
+
+ Touching HTMLMediaElement.h or MediaPlayer.h causes a world rebuild.
+ https://bugs.webkit.org/show_bug.cgi?id=145193
+
+ Reviewed by Eric Carlson.
+
+ HTMLMediaElement.h and MediaPlayer.h are included in a number of headers solely for access to the enums
+ defined within the classes contained within. Move these enums into their own--otherwise empty--classes.
+ Then add `using` declarations to pull those inherited enums back into the namespace of HTMLMediaElement
+ and MediaPlayer.
+
+ Classes and headers which do not need to directly include HTMLMediaElement.h can now include HTMLMediaElementEnums.h
+ instead; the same goes for MediaPlayer.h and MediaPlayerEnums.h.
+
+ * WebCore.xcodeproj/project.pbxproj: Add new files to project.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::TrackGroup::TrackGroup): Move definition here from the header.
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::videoFullscreenGravity): MediaPlayer -> MediaPlayerEnums.
+ (WebCore::HTMLMediaElement::preloadValue): Ditto.
+ (WebCore::HTMLMediaElement::TrackGroup::TrackGroup): Deleted; moved to implementation file.
+ * html/HTMLMediaElementEnums.h: Added.
+ * html/MediaControllerInterface.h: Inherit from HTMLMediaElementEnums.
+ * page/ChromeClient.h: HTMLMediaElement -> HTMLMediaElementEnums.
+ * platform/graphics/MediaPlayer.h: MediaPlayer -> MediaPlayerEnums.
+ * platform/graphics/MediaPlayerEnums.h: Added.
+ * platform/ios/WebVideoFullscreenControllerAVKit.h:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (-[WebVideoFullscreenController enterFullscreen:mode:]): HTMLMediaElement -> HTMLMediaElementEnums.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreenInternal): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreenInternal): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::cleanupFullscreenInternal): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoOptimized): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::willStartOptimizedFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::didStopOptimizedFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::didCancelOptimizedFullscreen): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::setMode): Ditto.
+ (WebVideoFullscreenInterfaceAVKit::clearMode): Ditto.
+ * platform/ios/WebVideoFullscreenModel.h:
+ * platform/ios/WebVideoFullscreenModelVideoElement.h:
+ * platform/ios/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::setVideoElement): Ditto.
+ (WebVideoFullscreenModelVideoElement::fullscreenModeChanged): Ditto.
+
2015-05-21 Babak Shafiei <bshaf...@apple.com>
Merge r184740.
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-22 07:59:09 UTC (rev 184761)
@@ -5729,6 +5729,8 @@
CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */; };
CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */; };
CD4AC52A1496AE9A0087C4EF /* Composite.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD4AC5281496AE2F0087C4EF /* Composite.wav */; };
+ CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ CD5209E61B0BD9E10077184E /* HTMLMediaElementEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5209E51B0BD9E10077184E /* HTMLMediaElementEnums.h */; settings = {ATTRIBUTES = (Private, ); }; };
CD52481A18E200ED0008A07D /* DisplaySleepDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD52481818E200ED0008A07D /* DisplaySleepDisabler.cpp */; };
CD52481B18E200ED0008A07D /* DisplaySleepDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = CD52481918E200ED0008A07D /* DisplaySleepDisabler.h */; settings = {ATTRIBUTES = (Private, ); }; };
CD5393D3175E018600C07123 /* JSMemoryInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5393D1175E018600C07123 /* JSMemoryInfo.cpp */; };
@@ -13287,6 +13289,8 @@
CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNSURLConnectionSPI.h; sourceTree = "<group>"; };
CD4AC5281496AE2F0087C4EF /* Composite.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = Composite.wav; path = platform/audio/resources/Composite.wav; sourceTree = SOURCE_ROOT; };
CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = "<group>"; };
+ CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerEnums.h; sourceTree = "<group>"; };
+ CD5209E51B0BD9E10077184E /* HTMLMediaElementEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementEnums.h; sourceTree = "<group>"; };
CD52481818E200ED0008A07D /* DisplaySleepDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplaySleepDisabler.cpp; sourceTree = "<group>"; };
CD52481918E200ED0008A07D /* DisplaySleepDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplaySleepDisabler.h; sourceTree = "<group>"; };
CD5393CB175DCCE600C07123 /* MemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInfo.h; sourceTree = "<group>"; };
@@ -18154,6 +18158,7 @@
E44613920CD6331000FADA75 /* HTMLMediaElement.cpp */,
E44613930CD6331000FADA75 /* HTMLMediaElement.h */,
E44613940CD6331000FADA75 /* HTMLMediaElement.idl */,
+ CD5209E51B0BD9E10077184E /* HTMLMediaElementEnums.h */,
07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */,
07FE99DB18807A7D00256648 /* HTMLMediaSession.h */,
A8EA79EC0A1916DF00A8EF5F /* HTMLMenuElement.cpp */,
@@ -20880,6 +20885,7 @@
079216531AA560AA00A3C049 /* MediaPlaybackTargetClient.h */,
E4B41E0C0CBF90BD00AF2ECE /* MediaPlayer.cpp */,
E4B41E0D0CBF90BD00AF2ECE /* MediaPlayer.h */,
+ CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */,
079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */,
CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */,
CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */,
@@ -23838,6 +23844,7 @@
51741D0F0B07259A00ED442C /* BackForwardClient.h in Headers */,
BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */,
BCA8CA6011E4E6D100812FB7 /* BackForwardList.h in Headers */,
+ CD5209E61B0BD9E10077184E /* HTMLMediaElementEnums.h in Headers */,
BC124EE80C2641CD009E2349 /* BarProp.h in Headers */,
379E61CA126CA5C400B63E8D /* BaseButtonInputType.h in Headers */,
379E61CC126CA5C400B63E8D /* BaseCheckableInputType.h in Headers */,
@@ -27024,6 +27031,7 @@
7AF9B20618CFB2DF00C64BEF /* VTTRegionList.h in Headers */,
7A93868618DCC14500B8263D /* VTTScanner.h in Headers */,
A14832B0187F618D00DA63A6 /* WAKAppKitStubs.h in Headers */,
+ CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */,
A14832B2187F61ED00DA63A6 /* WAKClipView.h in Headers */,
A14832B4187F629A00DA63A6 /* WAKResponder.h in Headers */,
A14832B6187F631F00DA63A6 /* WAKScrollView.h in Headers */,
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.cpp (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 07:59:09 UTC (rev 184761)
@@ -62,6 +62,7 @@
#include "MediaFragmentURIParser.h"
#include "MediaKeyEvent.h"
#include "MediaList.h"
+#include "MediaPlayer.h"
#include "MediaQueryEvaluator.h"
#include "MediaResourceLoader.h"
#include "MediaSessionManager.h"
@@ -253,6 +254,24 @@
};
#endif
+struct HTMLMediaElement::TrackGroup {
+ enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, Other };
+
+ TrackGroup(GroupKind kind)
+ : visibleTrack(0)
+ , defaultTrack(0)
+ , kind(kind)
+ , hasSrcLang(false)
+ {
+ }
+
+ Vector<RefPtr<TextTrack>> tracks;
+ RefPtr<TextTrack> visibleTrack;
+ RefPtr<TextTrack> defaultTrack;
+ GroupKind kind;
+ bool hasSrcLang;
+};
+
HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
: HTMLElement(tagName, document)
, ActiveDOMObject(&document)
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -31,10 +31,10 @@
#include "ActiveDOMObject.h"
#include "GenericEventQueue.h"
#include "GenericTaskQueue.h"
+#include "HTMLMediaElementEnums.h"
#include "HTMLMediaSession.h"
#include "MediaCanStartListener.h"
#include "MediaControllerInterface.h"
-#include "MediaPlayer.h"
#include "MediaProducer.h"
#include "PageThrottler.h"
@@ -67,6 +67,7 @@
class MediaControls;
class MediaControlsHost;
class MediaError;
+class MediaPlayer;
class TimeRanges;
#if ENABLE(ENCRYPTED_MEDIA_V2)
class MediaKeys;
@@ -131,22 +132,14 @@
void setVideoFullscreenLayer(PlatformLayer*);
PlatformLayer* videoFullscreenLayer() const { return m_videoFullscreenLayer.get(); }
void setVideoFullscreenFrame(FloatRect);
- void setVideoFullscreenGravity(MediaPlayer::VideoGravity);
- MediaPlayer::VideoGravity videoFullscreenGravity() const { return m_videoFullscreenGravity; }
+ void setVideoFullscreenGravity(MediaPlayerEnums::VideoGravity);
+ MediaPlayerEnums::VideoGravity videoFullscreenGravity() const { return m_videoFullscreenGravity; }
#endif
- enum DelayedActionType {
- LoadMediaResource = 1 << 0,
- ConfigureTextTracks = 1 << 1,
- TextTrackChangesNotification = 1 << 2,
- ConfigureTextTrackDisplay = 1 << 3,
- CheckPlaybackTargetCompatablity = 1 << 4,
-
- EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity,
- };
+ using HTMLMediaElementEnums::DelayedActionType;
void scheduleDelayedAction(DelayedActionType);
- MediaPlayer::MovieLoadType movieLoadType() const;
+ MediaPlayerEnums::MovieLoadType movieLoadType() const;
bool inActiveDocument() const { return m_inActiveDocument; }
@@ -163,7 +156,7 @@
#endif
// network state
- enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE };
+ using HTMLMediaElementEnums::NetworkState;
NetworkState networkState() const;
String preload() const;
@@ -174,6 +167,7 @@
String canPlayType(const String& mimeType, const String& keySystem = String(), const URL& = URL()) const;
// ready state
+ using HTMLMediaElementEnums::ReadyState;
virtual ReadyState readyState() const override;
bool seeking() const;
@@ -306,24 +300,7 @@
PlatformTextTrackMenuInterface* platformTextTrackMenu();
#endif
- struct TrackGroup {
- enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, Other };
-
- TrackGroup(GroupKind kind)
- : visibleTrack(0)
- , defaultTrack(0)
- , kind(kind)
- , hasSrcLang(false)
- {
- }
-
- Vector<RefPtr<TextTrack>> tracks;
- RefPtr<TextTrack> visibleTrack;
- RefPtr<TextTrack> defaultTrack;
- GroupKind kind;
- bool hasSrcLang;
- };
-
+ struct TrackGroup;
void configureTextTrackGroupForLanguage(const TrackGroup&) const;
void configureTextTracks();
void configureTextTrackGroup(const TrackGroup&);
@@ -331,7 +308,7 @@
void setSelectedTextTrack(TextTrack*);
bool textTracksAreReady() const;
- enum TextTrackVisibilityCheckType { CheckTextTrackVisibility, AssumeTextTrackVisibilityChanged };
+ using HTMLMediaElementEnums::TextTrackVisibilityCheckType;
void configureTextTrackDisplay(TextTrackVisibilityCheckType checkType = CheckTextTrackVisibility);
void updateTextTrackDisplay();
@@ -381,13 +358,7 @@
WEBCORE_EXPORT virtual bool isFullscreen() const override;
void toggleFullscreenState();
- enum {
- VideoFullscreenModeNone = 0,
- VideoFullscreenModeStandard = 1 << 0,
- VideoFullscreenModeOptimized = 1 << 1,
- };
- typedef uint32_t VideoFullscreenMode;
-
+ using MediaPlayerEnums::VideoFullscreenMode;
VideoFullscreenMode fullscreenMode() const { return m_videoFullscreenMode; }
virtual void fullscreenModeChanged(VideoFullscreenMode mode) { m_videoFullscreenMode = mode; }
@@ -424,7 +395,7 @@
AudioSourceProvider* audioSourceProvider();
#endif
- enum InvalidURLAction { DoNothing, Complain };
+ using HTMLMediaElementEnums::InvalidURLAction;
bool isSafeToLoadURL(const URL&, InvalidURLAction);
const String& mediaGroup() const;
@@ -437,14 +408,14 @@
unsigned long long fileSize() const;
- void mediaLoadingFailed(MediaPlayer::NetworkState);
- void mediaLoadingFailedFatally(MediaPlayer::NetworkState);
+ void mediaLoadingFailed(MediaPlayerEnums::NetworkState);
+ void mediaLoadingFailedFatally(MediaPlayerEnums::NetworkState);
#if ENABLE(MEDIA_SOURCE)
RefPtr<VideoPlaybackQuality> getVideoPlaybackQuality();
#endif
- MediaPlayer::Preload preloadValue() const { return m_preload; }
+ MediaPlayerEnums::Preload preloadValue() const { return m_preload; }
HTMLMediaSession& mediaSession() const { return *m_mediaSession; }
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
@@ -522,8 +493,8 @@
virtual void updateDisplayState() { }
- void setReadyState(MediaPlayer::ReadyState);
- void setNetworkState(MediaPlayer::NetworkState);
+ void setReadyState(MediaPlayerEnums::ReadyState);
+ void setNetworkState(MediaPlayerEnums::NetworkState);
double effectivePlaybackRate() const;
double requestedPlaybackRate() const;
@@ -703,7 +674,7 @@
bool isBlocked() const;
bool isBlockedOnMediaController() const;
virtual bool hasCurrentSrc() const override { return !m_currentSrc.isEmpty(); }
- virtual bool isLiveStream() const override { return movieLoadType() == MediaPlayer::LiveStream; }
+ virtual bool isLiveStream() const override { return movieLoadType() == MediaPlayerEnums::LiveStream; }
bool isAutoplaying() const { return m_autoplaying; }
void updateSleepDisabling();
@@ -798,12 +769,12 @@
#if PLATFORM(IOS)
RetainPtr<PlatformLayer> m_videoFullscreenLayer;
FloatRect m_videoFullscreenFrame;
- MediaPlayer::VideoGravity m_videoFullscreenGravity;
+ MediaPlayerEnums::VideoGravity m_videoFullscreenGravity;
#endif
std::unique_ptr<MediaPlayer> m_player;
- MediaPlayer::Preload m_preload;
+ MediaPlayerEnums::Preload m_preload;
DisplayMode m_displayMode;
Copied: branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElementEnums.h (from rev 184670, trunk/Source/WebCore/html/HTMLMediaElementEnums.h) (0 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElementEnums.h (rev 0)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElementEnums.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * 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.
+ */
+
+#ifndef HTMLMediaElementEnums_h
+#define HTMLMediaElementEnums_h
+
+#include "MediaPlayerEnums.h"
+
+namespace WebCore {
+
+class HTMLMediaElementEnums : public MediaPlayerEnums {
+public:
+ using MediaPlayerEnums::VideoFullscreenMode;
+
+ enum DelayedActionType {
+ LoadMediaResource = 1 << 0,
+ ConfigureTextTracks = 1 << 1,
+ TextTrackChangesNotification = 1 << 2,
+ ConfigureTextTrackDisplay = 1 << 3,
+ CheckPlaybackTargetCompatablity = 1 << 4,
+
+ EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity,
+ };
+
+ enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
+ enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE };
+ enum TextTrackVisibilityCheckType { CheckTextTrackVisibility, AssumeTextTrackVisibilityChanged };
+ enum InvalidURLAction { DoNothing, Complain };
+};
+
+}
+
+#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/html/MediaControllerInterface.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/html/MediaControllerInterface.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/MediaControllerInterface.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -28,6 +28,7 @@
#if ENABLE(VIDEO)
+#include "HTMLMediaElementEnums.h"
#include <wtf/PassRefPtr.h>
namespace WebCore {
@@ -36,7 +37,7 @@
typedef int ExceptionCode;
-class MediaControllerInterface {
+class MediaControllerInterface : public HTMLMediaElementEnums {
public:
virtual ~MediaControllerInterface() { };
@@ -64,8 +65,8 @@
virtual bool muted() const = 0;
virtual void setMuted(bool) = 0;
-
- enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
+
+ using HTMLMediaElementEnums::ReadyState;
virtual ReadyState readyState() const = 0;
// MediaControlElements:
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/page/ChromeClient.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/page/ChromeClient.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/page/ChromeClient.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -29,7 +29,7 @@
#include "FocusDirection.h"
#include "FrameLoader.h"
#include "GraphicsContext.h"
-#include "HTMLMediaElement.h"
+#include "HTMLMediaElementEnums.h"
#include "HostWindow.h"
#include "LayerFlushThrottleState.h"
#include "MediaProducer.h"
@@ -332,7 +332,7 @@
virtual bool supportsVideoFullscreen() { return false; }
#if ENABLE(VIDEO)
- virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElement::VideoFullscreenMode) { }
+ virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElementEnums::VideoFullscreenMode) { }
#endif
virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) { }
virtual bool requiresFullscreenForVideoPlayback() { return false; }
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -35,6 +35,7 @@
#include "IntRect.h"
#include "URL.h"
#include "LayoutRect.h"
+#include "MediaPlayerEnums.h"
#include "MediaSession.h"
#include "NativeImagePtr.h"
#include "PlatformLayer.h"
@@ -285,7 +286,7 @@
virtual String mediaPlayerDocumentHost() const { return String(); }
};
-class MediaPlayer {
+class MediaPlayer : public MediaPlayerEnums {
WTF_MAKE_NONCOPYABLE(MediaPlayer); WTF_MAKE_FAST_ALLOCATED;
public:
explicit MediaPlayer(MediaPlayerClient&);
@@ -311,7 +312,7 @@
#if PLATFORM(IOS)
void setVideoFullscreenLayer(PlatformLayer*);
void setVideoFullscreenFrame(FloatRect);
- enum VideoGravity { VideoGravityResize, VideoGravityResizeAspect, VideoGravityResizeAspectFill };
+ using MediaPlayerEnums::VideoGravity;
void setVideoFullscreenGravity(VideoGravity);
NSArray *timedMetadata() const;
@@ -422,16 +423,16 @@
PassNativeImagePtr nativeImageForCurrentTime();
- enum NetworkState { Empty, Idle, Loading, Loaded, FormatError, NetworkError, DecodeError };
+ using MediaPlayerEnums::NetworkState;
NetworkState networkState();
- enum ReadyState { HaveNothing, HaveMetadata, HaveCurrentData, HaveFutureData, HaveEnoughData };
+ using MediaPlayerEnums::ReadyState;
ReadyState readyState();
- enum MovieLoadType { Unknown, Download, StoredStream, LiveStream };
+ using MediaPlayerEnums::MovieLoadType;
MovieLoadType movieLoadType() const;
- enum Preload { None, MetaData, Auto };
+ using MediaPlayerEnums::Preload;
Preload preload() const;
void setPreload(Preload);
Copied: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerEnums.h (from rev 184670, trunk/Source/WebCore/platform/graphics/MediaPlayerEnums.h) (0 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerEnums.h (rev 0)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerEnums.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * 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.
+ */
+
+#ifndef MediaPlayerEnums_h
+#define MediaPlayerEnums_h
+
+namespace WebCore {
+
+class MediaPlayerEnums {
+public:
+ enum NetworkState { Empty, Idle, Loading, Loaded, FormatError, NetworkError, DecodeError };
+ enum ReadyState { HaveNothing, HaveMetadata, HaveCurrentData, HaveFutureData, HaveEnoughData };
+ enum MovieLoadType { Unknown, Download, StoredStream, LiveStream };
+ enum Preload { None, MetaData, Auto };
+ enum VideoGravity { VideoGravityResize, VideoGravityResizeAspect, VideoGravityResizeAspectFill };
+ enum {
+ VideoFullscreenModeNone = 0,
+ VideoFullscreenModeStandard = 1 << 0,
+ VideoFullscreenModeOptimized = 1 << 1,
+ };
+ typedef uint32_t VideoFullscreenMode;
+};
+
+}
+
+#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -28,14 +28,18 @@
#if PLATFORM(IOS)
-#import <WebCore/HTMLVideoElement.h>
+#import <WebCore/HTMLMediaElementEnums.h>
OBJC_CLASS UIView;
+namespace WebCore {
+class HTMLVideoElement;
+}
+
WEBCORE_EXPORT @interface WebVideoFullscreenController : NSObject
- (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement;
- (WebCore::HTMLVideoElement*)videoElement;
-- (void)enterFullscreen:(UIView *)view mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode;
+- (void)enterFullscreen:(UIView *)view mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode;
- (void)exitFullscreen;
- (void)requestHideAndExitFullscreen;
@end
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -33,6 +33,7 @@
#import "WebVideoFullscreenInterfaceAVKit.h"
#import "WebVideoFullscreenModelVideoElement.h"
#import <QuartzCore/CoreAnimation.h>
+#import <WebCore/HTMLVideoElement.h>
#import <WebCore/WebCoreThreadRun.h>
using namespace WebCore;
@@ -121,7 +122,7 @@
return _videoElement.get();
}
-- (void)enterFullscreen:(UIView *)view mode:(HTMLMediaElement::VideoFullscreenMode)mode
+- (void)enterFullscreen:(UIView *)view mode:(HTMLMediaElementEnums::VideoFullscreenMode)mode
{
[self retain]; // Balanced by -release in didExitFullscreen:
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -30,9 +30,11 @@
#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
#include <WebCore/EventListener.h>
-#include <WebCore/HTMLMediaElement.h>
+#include <WebCore/HTMLMediaElementEnums.h>
#include <WebCore/PlatformLayer.h>
#include <WebCore/WebVideoFullscreenInterface.h>
+#include <functional>
+#include <objc/objc.h>
#include <wtf/RefPtr.h>
#include <wtf/RetainPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
@@ -89,7 +91,7 @@
WEBCORE_EXPORT virtual void setLegibleMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex) override;
WEBCORE_EXPORT virtual void setExternalPlayback(bool enabled, ExternalPlaybackTargetType, WTF::String localizedDeviceName) override;
- WEBCORE_EXPORT virtual void setupFullscreen(PlatformLayer&, const IntRect& initialRect, UIView *, HTMLMediaElement::VideoFullscreenMode, bool allowOptimizedFullscreen);
+ WEBCORE_EXPORT virtual void setupFullscreen(PlatformLayer&, const IntRect& initialRect, UIView *, HTMLMediaElementEnums::VideoFullscreenMode, bool allowOptimizedFullscreen);
WEBCORE_EXPORT virtual void enterFullscreen();
WEBCORE_EXPORT virtual void exitFullscreen(const IntRect& finalRect);
WEBCORE_EXPORT virtual void cleanupFullscreen();
@@ -97,7 +99,7 @@
WEBCORE_EXPORT virtual void requestHideAndExitFullscreen();
WEBCORE_EXPORT virtual void preparedToReturnToInline(bool visible, const IntRect& inlineRect);
- HTMLMediaElement::VideoFullscreenMode mode() const { return m_mode; }
+ HTMLMediaElementEnums::VideoFullscreenMode mode() const { return m_mode; }
bool allowOptimizedFullscreen() const { return m_allowOptimizedFullscreen; }
void setIsOptimized(bool);
WEBCORE_EXPORT bool mayAutomaticallyShowVideoOptimized() const;
@@ -111,15 +113,15 @@
void didCancelOptimizedFullscreen();
void prepareForOptimizedFullscreenStopWithCompletionHandler(void (^)(BOOL));
- void setMode(HTMLMediaElement::VideoFullscreenMode);
- void clearMode(HTMLMediaElement::VideoFullscreenMode);
- bool hasMode(HTMLMediaElement::VideoFullscreenMode mode) const { return m_mode & mode; }
- bool isMode(HTMLMediaElement::VideoFullscreenMode mode) const { return m_mode == mode; }
+ void setMode(HTMLMediaElementEnums::VideoFullscreenMode);
+ void clearMode(HTMLMediaElementEnums::VideoFullscreenMode);
+ bool hasMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const { return m_mode & mode; }
+ bool isMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const { return m_mode == mode; }
protected:
WEBCORE_EXPORT WebVideoFullscreenInterfaceAVKit();
void beginSession();
- void setupFullscreenInternal(PlatformLayer&, const IntRect& initialRect, UIView *, HTMLMediaElement::VideoFullscreenMode, bool allowOptimizedFullscreen);
+ void setupFullscreenInternal(PlatformLayer&, const IntRect& initialRect, UIView *, HTMLMediaElementEnums::VideoFullscreenMode, bool allowOptimizedFullscreen);
void enterFullscreenOptimized();
void enterFullscreenStandard();
void exitFullscreenInternal(const IntRect& finalRect);
@@ -138,7 +140,7 @@
RetainPtr<UIViewController> m_viewController;
RetainPtr<UIView> m_parentView;
RetainPtr<UIWindow> m_parentWindow;
- HTMLMediaElement::VideoFullscreenMode m_mode { HTMLMediaElement::VideoFullscreenModeNone };
+ HTMLMediaElementEnums::VideoFullscreenMode m_mode { HTMLMediaElementEnums::VideoFullscreenModeNone };
std::function<void(bool)> m_prepareToInlineCallback;
bool m_allowOptimizedFullscreen { false };
bool m_exitRequested { false };
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -926,11 +926,11 @@
});
}
-void WebVideoFullscreenInterfaceAVKit::setupFullscreen(PlatformLayer& videoLayer, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElement::VideoFullscreenMode mode, bool allowOptimizedFullscreen)
+void WebVideoFullscreenInterfaceAVKit::setupFullscreen(PlatformLayer& videoLayer, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowOptimizedFullscreen)
{
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
- ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
+ ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
m_videoLayer = &videoLayer;
m_mode = mode;
@@ -940,7 +940,7 @@
});
}
-void WebVideoFullscreenInterfaceAVKit::setupFullscreenInternal(PlatformLayer& videoLayer, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElement::VideoFullscreenMode mode, bool allowOptimizedFullscreen)
+void WebVideoFullscreenInterfaceAVKit::setupFullscreenInternal(PlatformLayer& videoLayer, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowOptimizedFullscreen)
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::setupFullscreenInternal(%p)", this);
UNUSED_PARAM(videoLayer);
@@ -1019,9 +1019,9 @@
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
dispatch_async(dispatch_get_main_queue(), [strongThis] {
[strongThis->m_videoLayerContainer setBackgroundColor:[[getUIColorClass() blackColor] CGColor]];
- if (strongThis->mode() == HTMLMediaElement::VideoFullscreenModeOptimized)
+ if (strongThis->mode() == HTMLMediaElementEnums::VideoFullscreenModeOptimized)
strongThis->enterFullscreenOptimized();
- else if (strongThis->mode() == HTMLMediaElement::VideoFullscreenModeStandard)
+ else if (strongThis->mode() == HTMLMediaElementEnums::VideoFullscreenModeStandard)
strongThis->enterFullscreenStandard();
else
ASSERT_NOT_REACHED();
@@ -1084,16 +1084,16 @@
[[m_playerViewController view] layoutIfNeeded];
- if (isMode(HTMLMediaElement::VideoFullscreenModeOptimized)) {
+ if (isMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized)) {
[m_window setHidden:NO];
[m_playerViewController stopOptimizedFullscreen];
- } else if (isMode(HTMLMediaElement::VideoFullscreenModeOptimized | HTMLMediaElement::VideoFullscreenModeStandard)) {
+ } else if (isMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized | HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
[m_playerViewController exitFullScreenAnimated:NO completionHandler:[strongThis] (BOOL, NSError*) {
[strongThis->m_window setHidden:NO];
[strongThis->m_playerViewController stopOptimizedFullscreen];
}];
- } else if (isMode(HTMLMediaElement::VideoFullscreenModeStandard)) {
+ } else if (isMode(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
[m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis] (BOOL, NSError*) {
strongThis->m_exitCompleted = true;
@@ -1147,9 +1147,9 @@
[m_playerViewController setDelegate:nil];
[m_playerViewController setPlayerController:nil];
- if (hasMode(HTMLMediaElement::VideoFullscreenModeOptimized))
+ if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized))
[m_playerViewController cancelOptimizedFullscreen];
- if (hasMode(HTMLMediaElement::VideoFullscreenModeStandard))
+ if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
[m_playerViewController exitFullScreenAnimated:NO completionHandler:[] (BOOL, NSError *) { }];
[[m_playerViewController view] removeFromSuperview];
@@ -1195,7 +1195,7 @@
if (!m_enterRequested)
return;
- if (hasMode(HTMLMediaElement::VideoFullscreenModeOptimized))
+ if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized))
return;
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen(%p)", this);
@@ -1231,7 +1231,7 @@
bool WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoOptimized() const
{
- return [m_playerController isPlaying] && m_mode == HTMLMediaElement::VideoFullscreenModeStandard && wkIsOptimizedFullscreenSupported();
+ return [m_playerController isPlaying] && m_mode == HTMLMediaElementEnums::VideoFullscreenModeStandard && wkIsOptimizedFullscreenSupported();
}
void WebVideoFullscreenInterfaceAVKit::fullscreenMayReturnToInline(std::function<void(bool)> callback)
@@ -1244,9 +1244,9 @@
void WebVideoFullscreenInterfaceAVKit::willStartOptimizedFullscreen()
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartOptimizedFullscreen(%p)", this);
- setMode(HTMLMediaElement::VideoFullscreenModeOptimized);
+ setMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized);
- if (!hasMode(HTMLMediaElement::VideoFullscreenModeStandard))
+ if (!hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
return;
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
@@ -1263,7 +1263,7 @@
[strongThis->m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis] (BOOL completed, NSError*) {
if (!completed)
return;
- strongThis->clearMode(HTMLMediaElement::VideoFullscreenModeStandard);
+ strongThis->clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
[strongThis->m_window setHidden:YES];
}];
});
@@ -1297,7 +1297,7 @@
void WebVideoFullscreenInterfaceAVKit::didStopOptimizedFullscreen()
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::didStopOptimizedFullscreen(%p)", this);
- if (hasMode(HTMLMediaElement::VideoFullscreenModeStandard))
+ if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
return;
m_exitCompleted = true;
@@ -1307,7 +1307,7 @@
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
WebThreadRun([strongThis] {
- strongThis->clearMode(HTMLMediaElement::VideoFullscreenModeOptimized);
+ strongThis->clearMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized);
[strongThis->m_window setHidden:YES];
if (strongThis->m_fullscreenChangeObserver)
strongThis->m_fullscreenChangeObserver->didExitFullscreen();
@@ -1331,12 +1331,12 @@
void WebVideoFullscreenInterfaceAVKit::didCancelOptimizedFullscreen()
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::didCancelOptimizedFullscreen(%p)", this);
- if (hasMode(HTMLMediaElement::VideoFullscreenModeStandard))
+ if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
return;
RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
WebThreadRun([strongThis] {
- strongThis->clearMode(HTMLMediaElement::VideoFullscreenModeOptimized);
+ strongThis->clearMode(HTMLMediaElementEnums::VideoFullscreenModeOptimized);
[strongThis->m_window setHidden:YES];
if (strongThis->m_fullscreenChangeObserver)
strongThis->m_fullscreenChangeObserver->didExitFullscreen();
@@ -1355,9 +1355,9 @@
});
}
-void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElement::VideoFullscreenMode mode)
+void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
{
- HTMLMediaElement::VideoFullscreenMode newMode = m_mode | mode;
+ HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode | mode;
if (m_mode == newMode)
return;
@@ -1366,9 +1366,9 @@
m_videoFullscreenModel->fullscreenModeChanged(m_mode);
}
-void WebVideoFullscreenInterfaceAVKit::clearMode(HTMLMediaElement::VideoFullscreenMode mode)
+void WebVideoFullscreenInterfaceAVKit::clearMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
{
- HTMLMediaElement::VideoFullscreenMode newMode = m_mode & ~mode;
+ HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode & ~mode;
if (m_mode == newMode)
return;
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModel.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModel.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModel.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -54,7 +54,7 @@
virtual VideoGravity videoLayerGravity() const = 0;
virtual void selectAudioMediaOption(uint64_t index) = 0;
virtual void selectLegibleMediaOption(uint64_t index) = 0;
- virtual void fullscreenModeChanged(HTMLMediaElement::VideoFullscreenMode) = 0;
+ virtual void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) = 0;
};
}
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -31,7 +31,7 @@
#include <WebCore/EventListener.h>
#include <WebCore/FloatRect.h>
-#include <WebCore/HTMLMediaElement.h>
+#include <WebCore/HTMLMediaElementEnums.h>
#include <WebCore/PlatformLayer.h>
#include <WebCore/WebVideoFullscreenModel.h>
#include <wtf/RefPtr.h>
@@ -39,6 +39,7 @@
#include <wtf/Vector.h>
namespace WebCore {
+class AudioTrack;
class HTMLVideoElement;
class TextTrack;
class WebVideoFullscreenInterface;
@@ -76,7 +77,7 @@
WEBCORE_EXPORT virtual VideoGravity videoLayerGravity() const override;
WEBCORE_EXPORT virtual void selectAudioMediaOption(uint64_t index) override;
WEBCORE_EXPORT virtual void selectLegibleMediaOption(uint64_t index) override;
- WEBCORE_EXPORT virtual void fullscreenModeChanged(HTMLMediaElement::VideoFullscreenMode) override;
+ WEBCORE_EXPORT virtual void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
protected:
WEBCORE_EXPORT WebVideoFullscreenModelVideoElement();
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -83,7 +83,7 @@
m_videoFullscreenInterface->resetMediaState();
if (m_videoElement && m_videoElement->fullscreenMode())
- m_videoElement->fullscreenModeChanged(HTMLMediaElement::VideoFullscreenModeNone);
+ m_videoElement->fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenModeNone);
if (m_videoElement && m_videoElement->videoFullscreenLayer())
m_videoElement->setVideoFullscreenLayer(nullptr);
@@ -452,7 +452,7 @@
return sEventNameAll;
}
-void WebVideoFullscreenModelVideoElement::fullscreenModeChanged(HTMLMediaElement::VideoFullscreenMode videoFullscreenMode)
+void WebVideoFullscreenModelVideoElement::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
{
__block RefPtr<WebVideoFullscreenModelVideoElement> protect(this);
WebThreadRun(^{
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-22 07:59:09 UTC (rev 184761)
@@ -1,3 +1,23 @@
+2015-05-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r184670.
+
+ 2015-05-19 Jer Noble <jer.no...@apple.com>
+
+ Touching HTMLMediaElement.h or MediaPlayer.h causes a world rebuild.
+ https://bugs.webkit.org/show_bug.cgi?id=145193
+
+ Reviewed by Eric Carlson.
+
+ Use HTMLMediaElementEnums instead of HTMLMediaElement.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::enterVideoFullscreenForVideoElement): HTMLMediaElement -> HTMLMediaElementEnums.
+ * WebView/WebView.mm:
+ (-[WebView _enterVideoFullscreenForVideoElement:mode:]): Ditto.
+ * WebView/WebViewInternal.h:
+
2015-05-20 Babak Shafiei <bshaf...@apple.com>
Merge r184404.
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -179,7 +179,7 @@
#if ENABLE(VIDEO)
virtual bool supportsVideoFullscreen() override;
- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -936,9 +936,9 @@
return true;
}
-void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElement::VideoFullscreenMode mode)
+void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode mode)
{
- ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
+ ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
BEGIN_BLOCK_OBJC_EXCEPTIONS;
[m_webView _enterVideoFullscreenForVideoElement:&videoElement mode:mode];
END_BLOCK_OBJC_EXCEPTIONS;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -8419,7 +8419,7 @@
#endif
#if ENABLE(VIDEO)
-- (void)_enterVideoFullscreenForVideoElement:(WebCore::HTMLVideoElement*)videoElement mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode
+- (void)_enterVideoFullscreenForVideoElement:(WebCore::HTMLVideoElement*)videoElement mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode
{
if (_private->fullscreenController) {
if ([_private->fullscreenController videoElement] == videoElement) {
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebViewInternal.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -37,7 +37,7 @@
#import <WebCore/AlternativeTextClient.h>
#import <WebCore/FindOptions.h>
#import <WebCore/FloatRect.h>
-#import <WebCore/HTMLMediaElement.h>
+#import <WebCore/HTMLMediaElementEnums.h>
#import <WebCore/LayoutMilestones.h>
#import <WebCore/TextAlternativeWithRange.h>
#import <WebCore/TextIndicatorWindow.h>
@@ -242,7 +242,7 @@
- (void)_preferencesChanged:(WebPreferences *)preferences;
#if ENABLE(VIDEO) && defined(__cplusplus)
-- (void)_enterVideoFullscreenForVideoElement:(WebCore::HTMLVideoElement*)videoElement mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode;
+- (void)_enterVideoFullscreenForVideoElement:(WebCore::HTMLVideoElement*)videoElement mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode;
- (void)_exitVideoFullscreen;
#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 07:59:09 UTC (rev 184761)
@@ -1,3 +1,37 @@
+2015-05-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r184670.
+
+ 2015-05-19 Jer Noble <jer.no...@apple.com>
+
+ Touching HTMLMediaElement.h or MediaPlayer.h causes a world rebuild.
+ https://bugs.webkit.org/show_bug.cgi?id=145193
+
+ Reviewed by Eric Carlson.
+
+ Use HTMLMediaElementEnums instead of HTMLMediaElement.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _isShowingVideoOptimized]): HTMLMediaElement -> HTMLMediaElementEnums.
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in:
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::hasMode): Ditto.
+ (WebKit::WebVideoFullscreenModelContext::fullscreenModeChanged): Ditto.
+ (WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID): Ditto.
+ (WebKit::WebVideoFullscreenManagerProxy::fullscreenModeChanged): Ditto.
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::enterVideoFullscreenForVideoElement): Ditto.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/ios/WebVideoFullscreenManager.h:
+ (WebKit::WebVideoFullscreenInterfaceContext::fullscreenMode): Ditto.
+ (WebKit::WebVideoFullscreenInterfaceContext::setFullscreenMode): Ditto.
+ * WebProcess/ios/WebVideoFullscreenManager.messages.in:
+ * WebProcess/ios/WebVideoFullscreenManager.mm:
+ (WebKit::WebVideoFullscreenManager::enterVideoFullscreenForVideoElement): Ditto.
+ (WebKit::WebVideoFullscreenManager::fullscreenModeChanged): Ditto.
+ (WebKit::WebVideoFullscreenManager::didCleanupFullscreen): Ditto.
+
2015-05-21 Babak Shafiei <bshaf...@apple.com>
Merge r184740.
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -245,7 +245,7 @@
if (!_page || !_page->videoFullscreenManager())
return false;
- return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElement::VideoFullscreenModeOptimized);
+ return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModeOptimized);
}
- (BOOL)_mayAutomaticallyShowVideoOptimized
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -83,7 +83,7 @@
virtual VideoGravity videoLayerGravity() const override;
virtual void selectAudioMediaOption(uint64_t) override;
virtual void selectLegibleMediaOption(uint64_t) override;
- virtual void fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
// WebVideoFullscreenChangeObserver
virtual void didSetupFullscreen() override;
@@ -107,7 +107,7 @@
void invalidate();
void requestHideAndExitFullscreen();
- bool hasMode(WebCore::HTMLMediaElement::VideoFullscreenMode) const;
+ bool hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) const;
bool mayAutomaticallyShowVideoOptimized() const;
private:
@@ -123,7 +123,7 @@
WebCore::WebVideoFullscreenInterfaceAVKit& ensureInterface(uint64_t contextId);
// Messages from WebVideoFullscreenManager
- void setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElement::VideoFullscreenMode, bool allowOptimizedFullscreen);
+ void setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowOptimizedFullscreen);
void resetMediaState(uint64_t contextId);
void setCurrentTime(uint64_t contextId, double currentTime, double hostTime);
void setBufferedTime(uint64_t contextId, double bufferedTime);
@@ -160,7 +160,7 @@
void setVideoLayerGravity(uint64_t contextId, WebCore::WebVideoFullscreenModel::VideoGravity);
void selectAudioMediaOption(uint64_t contextId, uint64_t index);
void selectLegibleMediaOption(uint64_t contextId, uint64_t index);
- void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElement::VideoFullscreenMode);
+ void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
void fullscreenMayReturnToInline(uint64_t contextId);
WebPageProxy* m_page;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in 2015-05-22 07:59:09 UTC (rev 184761)
@@ -33,7 +33,7 @@
SetExternalPlaybackProperties(uint64_t contextId, bool enabled, uint32_t targetType, String localizedDeviceName)
SetDuration(uint64_t contextId, double duration)
SetRate(uint64_t contextId, bool isPlaying, double rate)
- SetupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElement::VideoFullscreenMode videoFullscreenMode, bool allowOptimizedFullscreen)
+ SetupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowOptimizedFullscreen)
EnterFullscreen(uint64_t contextId)
ExitFullscreen(uint64_t contextId, WebCore::IntRect finalRect)
CleanupFullscreen(uint64_t contextId)
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -57,7 +57,7 @@
{
}
-bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElement::VideoFullscreenMode) const
+bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode) const
{
return false;
}
@@ -177,7 +177,7 @@
m_manager->selectLegibleMediaOption(m_contextId, optionId);
}
-void WebVideoFullscreenModelContext::fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode mode)
+void WebVideoFullscreenModelContext::fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
{
if (m_manager)
m_manager->fullscreenModeChanged(m_contextId, mode);
@@ -257,7 +257,7 @@
std::get<1>(tuple)->requestHideAndExitFullscreen();
}
-bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElement::VideoFullscreenMode mode) const
+bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const
{
for (auto& tuple : m_contextMap.values()) {
if (std::get<1>(tuple)->hasMode(mode))
@@ -306,7 +306,7 @@
#pragma mark Messages from WebVideoFullscreenManager
-void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElement::VideoFullscreenMode videoFullscreenMode, bool allowOptimizedFullscreen)
+void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowOptimizedFullscreen)
{
ASSERT(videoLayerID);
RefPtr<WebVideoFullscreenModelContext> model;
@@ -542,7 +542,7 @@
m_page->send(Messages::WebVideoFullscreenManager::SelectLegibleMediaOption(contextId, index), m_page->pageID());
}
-void WebVideoFullscreenManagerProxy::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElement::VideoFullscreenMode mode)
+void WebVideoFullscreenManagerProxy::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
{
m_page->send(Messages::WebVideoFullscreenManager::FullscreenModeChanged(contextId, mode), m_page->pageID());
}
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-05-22 07:59:09 UTC (rev 184761)
@@ -915,9 +915,9 @@
return m_page->videoFullscreenManager()->supportsVideoFullscreen();
}
-void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElement::VideoFullscreenMode mode)
+void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
{
- ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
+ ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
m_page->videoFullscreenManager()->enterVideoFullscreenForVideoElement(videoElement, mode);
}
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -250,7 +250,7 @@
#if PLATFORM(IOS)
virtual bool supportsVideoFullscreen() override;
- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2015-05-22 07:59:09 UTC (rev 184761)
@@ -29,7 +29,7 @@
#include "MessageReceiver.h"
#include <WebCore/EventListener.h>
-#include <WebCore/HTMLMediaElement.h>
+#include <WebCore/HTMLMediaElementEnums.h>
#include <WebCore/PlatformCALayer.h>
#include <WebCore/WebVideoFullscreenInterface.h>
#include <WebCore/WebVideoFullscreenModelVideoElement.h>
@@ -73,8 +73,8 @@
bool targetIsFullscreen() const { return m_targetIsFullscreen; }
void setTargetIsFullscreen(bool flag) { m_targetIsFullscreen = flag; }
- WebCore::HTMLMediaElement::VideoFullscreenMode fullscreenMode() const { return m_fullscreenMode; }
- void setFullscreenMode(WebCore::HTMLMediaElement::VideoFullscreenMode mode) { m_fullscreenMode = mode; }
+ WebCore::HTMLMediaElementEnums::VideoFullscreenMode fullscreenMode() const { return m_fullscreenMode; }
+ void setFullscreenMode(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode) { m_fullscreenMode = mode; }
bool isFullscreen() const { return m_isFullscreen; }
void setIsFullscreen(bool flag) { m_isFullscreen = flag; }
@@ -100,7 +100,7 @@
std::unique_ptr<LayerHostingContext> m_layerHostingContext;
bool m_isAnimating { false };
bool m_targetIsFullscreen { false };
- WebCore::HTMLMediaElement::VideoFullscreenMode m_fullscreenMode { WebCore::HTMLMediaElement::VideoFullscreenModeNone };
+ WebCore::HTMLMediaElementEnums::VideoFullscreenMode m_fullscreenMode { WebCore::HTMLMediaElementEnums::VideoFullscreenModeNone };
bool m_isFullscreen { false };
};
@@ -113,7 +113,7 @@
// Interface to ChromeClient
bool supportsVideoFullscreen() const;
- void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode);
+ void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
protected:
@@ -160,7 +160,7 @@
void setVideoLayerGravityEnum(uint64_t contextId, unsigned gravity);
void selectAudioMediaOption(uint64_t contextId, uint64_t index);
void selectLegibleMediaOption(uint64_t contextId, uint64_t index);
- void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElement::VideoFullscreenMode);
+ void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
void fullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible);
WebPage* m_page;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.messages.in (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.messages.in 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.messages.in 2015-05-22 07:59:09 UTC (rev 184761)
@@ -41,7 +41,7 @@
SetVideoLayerGravityEnum(uint64_t contextId, unsigned gravity)
SelectAudioMediaOption(uint64_t contextId, uint64_t index)
SelectLegibleMediaOption(uint64_t contextId, uint64_t index)
- FullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElement::VideoFullscreenMode videoFullscreenMode)
+ FullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
FullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible)
}
#endif
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (184760 => 184761)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-05-22 06:57:30 UTC (rev 184760)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-05-22 07:59:09 UTC (rev 184761)
@@ -217,9 +217,9 @@
return Settings::avKitEnabled();
}
-void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElement::VideoFullscreenMode mode)
+void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode mode)
{
- ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
+ ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
uint64_t contextId;
@@ -394,7 +394,7 @@
ensureModel(contextId).selectLegibleMediaOption(index);
}
-void WebVideoFullscreenManager::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElement::VideoFullscreenMode videoFullscreenMode)
+void WebVideoFullscreenManager::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
{
ensureModel(contextId).fullscreenModeChanged(videoFullscreenMode);
}
@@ -481,7 +481,7 @@
interface->setIsAnimating(false);
interface->setIsFullscreen(false);
- HTMLMediaElement::VideoFullscreenMode mode = interface->fullscreenMode();
+ HTMLMediaElementEnums::VideoFullscreenMode mode = interface->fullscreenMode();
model->setVideoFullscreenLayer(nil);
RefPtr<HTMLVideoElement> videoElement = model->videoElement();
