Title: [166252] trunk/Source/WebCore
- Revision
- 166252
- Author
- jer.no...@apple.com
- Date
- 2014-03-25 14:07:32 -0700 (Tue, 25 Mar 2014)
Log Message
Unreviewed build fix after r166247. Un-platform-protect the declaration of HTMLMediaElement::shouldDisableSleep()
and make WebVideoFullscreenController's _displaySleepDisabler a std::unique_ptr.
* html/HTMLMediaElement.h:
* platform/mac/WebVideoFullscreenController.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166251 => 166252)
--- trunk/Source/WebCore/ChangeLog 2014-03-25 21:03:46 UTC (rev 166251)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 21:07:32 UTC (rev 166252)
@@ -1,3 +1,11 @@
+2014-03-25 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r166247. Un-platform-protect the declaration of HTMLMediaElement::shouldDisableSleep()
+ and make WebVideoFullscreenController's _displaySleepDisabler a std::unique_ptr.
+
+ * html/HTMLMediaElement.h:
+ * platform/mac/WebVideoFullscreenController.h:
+
2014-03-25 Brent Fulgham <bfulg...@apple.com>
[iOS] Pass additional options to AVFoundation during playback.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (166251 => 166252)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-03-25 21:03:46 UTC (rev 166251)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-03-25 21:07:32 UTC (rev 166252)
@@ -686,9 +686,7 @@
bool isAutoplaying() const { return m_autoplaying; }
void updateSleepDisabling();
-#if PLATFORM(COCOA)
bool shouldDisableSleep() const;
-#endif
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
virtual void didAddUserAgentShadowRoot(ShadowRoot*) override;
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h (166251 => 166252)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2014-03-25 21:03:46 UTC (rev 166251)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2014-03-25 21:07:32 UTC (rev 166252)
@@ -53,7 +53,7 @@
BOOL _isEndingFullscreen;
BOOL _forceDisableAnimation;
- OwnPtr<WebCore::DisplaySleepDisabler> _displaySleepDisabler;
+ std::unique_ptr<WebCore::DisplaySleepDisabler> _displaySleepDisabler;
}
- (id <WebVideoFullscreenControllerDelegate>)delegate;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
