Title: [160396] trunk/Source/WebCore
- Revision
- 160396
- Author
- mrobin...@webkit.org
- Date
- 2013-12-10 16:38:41 -0800 (Tue, 10 Dec 2013)
Log Message
Correct a preprocessor guard from a mis-merged patch
In r160367, I mismerged a patch from Gustavo Noronha. This commit
fixes the merge and thus fixes the CMake build.
* html/HTMLMediaElement.idl: Move the preprocessor guard to the correct property.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160395 => 160396)
--- trunk/Source/WebCore/ChangeLog 2013-12-11 00:19:07 UTC (rev 160395)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 00:38:41 UTC (rev 160396)
@@ -1,3 +1,12 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Correct a preprocessor guard from a mis-merged patch
+
+ In r160367, I mismerged a patch from Gustavo Noronha. This commit
+ fixes the merge and thus fixes the CMake build.
+
+ * html/HTMLMediaElement.idl: Move the preprocessor guard to the correct property.
+
2013-12-10 Rob Buis <rob.b...@samsung.com>
Clean up SVGScriptElement
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (160395 => 160396)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-12-11 00:19:07 UTC (rev 160395)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-12-11 00:38:41 UTC (rev 160396)
@@ -116,10 +116,9 @@
#endif
[Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup;
-
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[CustomSetter] attribute MediaController controller;
-#endif
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[Conditional=MEDIA_SOURCE] VideoPlaybackQuality getVideoPlaybackQuality();
+#endif
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
