Title: [185058] trunk/Source/WebCore
- Revision
- 185058
- Author
- o...@webkit.org
- Date
- 2015-06-01 08:28:49 -0700 (Mon, 01 Jun 2015)
Log Message
Fix the !ENABLE(VIDEO_TRACK) build after r184799
https://bugs.webkit.org/show_bug.cgi?id=145510
Reviewed by Eric Carlson.
* testing/Internals.cpp:
(WebCore::Internals::userPreferredAudioCharacteristics):
(WebCore::Internals::setUserPreferredAudioCharacteristic):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185057 => 185058)
--- trunk/Source/WebCore/ChangeLog 2015-06-01 11:36:41 UTC (rev 185057)
+++ trunk/Source/WebCore/ChangeLog 2015-06-01 15:28:49 UTC (rev 185058)
@@ -1,5 +1,16 @@
2015-06-01 Csaba Osztrogonác <o...@webkit.org>
+ Fix the !ENABLE(VIDEO_TRACK) build after r184799
+ https://bugs.webkit.org/show_bug.cgi?id=145510
+
+ Reviewed by Eric Carlson.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::userPreferredAudioCharacteristics):
+ (WebCore::Internals::setUserPreferredAudioCharacteristic):
+
+2015-06-01 Csaba Osztrogonác <o...@webkit.org>
+
Fix logical-not-parentheses warning in CachedScript.cpp
https://bugs.webkit.org/show_bug.cgi?id=145254
Modified: trunk/Source/WebCore/testing/Internals.cpp (185057 => 185058)
--- trunk/Source/WebCore/testing/Internals.cpp 2015-06-01 11:36:41 UTC (rev 185057)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-06-01 15:28:49 UTC (rev 185058)
@@ -1303,7 +1303,11 @@
Document* document = contextDocument();
if (!document || !document->page())
return Vector<String>();
+#if ENABLE(VIDEO_TRACK)
return document->page()->group().captionPreferences()->preferredAudioCharacteristics();
+#else
+ return Vector<String>();
+#endif
}
void Internals::setUserPreferredAudioCharacteristic(const String& characteristic)
@@ -1311,7 +1315,11 @@
Document* document = contextDocument();
if (!document || !document->page())
return;
+#if ENABLE(VIDEO_TRACK)
document->page()->group().captionPreferences()->setPreferredAudioCharacteristic(characteristic);
+#else
+ UNUSED_PARAM(characteristic);
+#endif
}
unsigned Internals::wheelEventHandlerCount(ExceptionCode& ec)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
