Title: [174674] trunk/Source/WebCore
- Revision
- 174674
- Author
- [email protected]
- Date
- 2014-10-14 01:14:01 -0700 (Tue, 14 Oct 2014)
Log Message
Fix the !ENABLE(VIDEO) build after r174353
https://bugs.webkit.org/show_bug.cgi?id=137655
Reviewed by Darin Adler.
* dom/Document.cpp:
* dom/Document.h:
* page/Page.cpp:
* page/Page.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174673 => 174674)
--- trunk/Source/WebCore/ChangeLog 2014-10-14 08:11:19 UTC (rev 174673)
+++ trunk/Source/WebCore/ChangeLog 2014-10-14 08:14:01 UTC (rev 174674)
@@ -1,3 +1,15 @@
+2014-10-14 Csaba Osztrogonác <[email protected]>
+
+ Fix the !ENABLE(VIDEO) build after r174353
+ https://bugs.webkit.org/show_bug.cgi?id=137655
+
+ Reviewed by Darin Adler.
+
+ * dom/Document.cpp:
+ * dom/Document.h:
+ * page/Page.cpp:
+ * page/Page.h:
+
2014-10-14 [email protected] <[email protected]>
[Curl] Compile error in CurlDownload.cpp.
Modified: trunk/Source/WebCore/dom/Document.cpp (174673 => 174674)
--- trunk/Source/WebCore/dom/Document.cpp 2014-10-14 08:11:19 UTC (rev 174673)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-10-14 08:14:01 UTC (rev 174674)
@@ -3269,6 +3269,7 @@
}
}
+#if ENABLE(VIDEO)
void Document::registerMediaSession(MediaSession& mediaSession)
{
m_mediaSessions.add(&mediaSession);
@@ -3299,6 +3300,7 @@
if (page())
page()->updateIsPlayingAudio();
}
+#endif
void Document::styleResolverChanged(StyleResolverUpdateFlag updateFlag)
{
Modified: trunk/Source/WebCore/dom/Document.h (174673 => 174674)
--- trunk/Source/WebCore/dom/Document.h 2014-10-14 08:11:19 UTC (rev 174673)
+++ trunk/Source/WebCore/dom/Document.h 2014-10-14 08:14:01 UTC (rev 174674)
@@ -1289,10 +1289,12 @@
bool hasStyleWithViewportUnits() const { return m_hasStyleWithViewportUnits; }
void updateViewportUnitsOnResize();
+#if ENABLE(VIDEO)
void registerMediaSession(MediaSession&);
void unregisterMediaSession(MediaSession&);
bool isPlayingAudio() const { return m_isPlayingAudio; }
void updateIsPlayingAudio();
+#endif
protected:
enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
Modified: trunk/Source/WebCore/page/Page.cpp (174673 => 174674)
--- trunk/Source/WebCore/page/Page.cpp 2014-10-14 08:11:19 UTC (rev 174673)
+++ trunk/Source/WebCore/page/Page.cpp 2014-10-14 08:14:01 UTC (rev 174674)
@@ -1193,6 +1193,7 @@
setSessionID(privateBrowsingEnabled ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID());
}
+#if ENABLE(VIDEO)
void Page::updateIsPlayingAudio()
{
bool isPlayingAudio = false;
@@ -1210,6 +1211,7 @@
chrome().client().isPlayingAudioDidChange(m_isPlayingAudio);
}
+#endif
#if !ASSERT_DISABLED
void Page::checkSubframeCountConsistency() const
Modified: trunk/Source/WebCore/page/Page.h (174673 => 174674)
--- trunk/Source/WebCore/page/Page.h 2014-10-14 08:11:19 UTC (rev 174673)
+++ trunk/Source/WebCore/page/Page.h 2014-10-14 08:14:01 UTC (rev 174674)
@@ -436,8 +436,10 @@
WEBCORE_EXPORT void enableLegacyPrivateBrowsing(bool privateBrowsingEnabled);
bool usesEphemeralSession() const { return m_sessionID.isEphemeral(); }
+#if ENABLE(VIDEO)
bool isPlayingAudio() const { return m_isPlayingAudio; }
void updateIsPlayingAudio();
+#endif
private:
WEBCORE_EXPORT void initGroup();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
