Title: [166255] trunk/Source/WebCore
- Revision
- 166255
- Author
- jer.no...@apple.com
- Date
- 2014-03-25 14:33:45 -0700 (Tue, 25 Mar 2014)
Log Message
Even further unreviewed build fix after r166247. Unprotect the implementation of HTMLMediaElement::shouldDisableSleep().
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166254 => 166255)
--- trunk/Source/WebCore/ChangeLog 2014-03-25 21:26:17 UTC (rev 166254)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 21:33:45 UTC (rev 166255)
@@ -1,5 +1,12 @@
2014-03-25 Jer Noble <jer.no...@apple.com>
+ Even further unreviewed build fix after r166247. Unprotect the implementation of HTMLMediaElement::shouldDisableSleep().
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+
+2014-03-25 Jer Noble <jer.no...@apple.com>
+
Further unreviewed build fix after r166247. Add DisplaySleepDisabler to the windows project file and
move the definition of DisplaySleepDisabler's constructor and destructor into the cpp file.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166254 => 166255)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 21:26:17 UTC (rev 166254)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 21:33:45 UTC (rev 166255)
@@ -5642,7 +5642,6 @@
m_sleepDisabler = DisplaySleepDisabler::create("com.apple.WebCore: HTMLMediaElement playback");
}
-#if PLATFORM(COCOA)
bool HTMLMediaElement::shouldDisableSleep() const
{
#if !PLATFORM(COCOA)
@@ -5656,7 +5655,6 @@
return m_player && !m_player->paused() && hasVideo() && hasAudio() && !loop();
}
-#endif
String HTMLMediaElement::mediaPlayerReferrer() const
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes