Title: [216310] releases/WebKitGTK/webkit-2.16/Source/WebKit2
- Revision
- 216310
- Author
- [email protected]
- Date
- 2017-05-06 01:08:32 -0700 (Sat, 06 May 2017)
Log Message
Merge r215009 - [GTK] Fix build with MEDIA_CAPTURE enabled
https://bugs.webkit.org/show_bug.cgi?id=170539
Patch by Adrian Perez de Castro <[email protected]> on 2017-04-06
Reviewed by Carlos Garcia Campos.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp:
(webkit_dom_html_input_element_get_capture): Add missing namespace in usage of WebCore::MediaCaptureTypeNone.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (216309 => 216310)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-05-06 05:19:39 UTC (rev 216309)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-05-06 08:08:32 UTC (rev 216310)
@@ -1,3 +1,13 @@
+2017-04-06 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Fix build with MEDIA_CAPTURE enabled
+ https://bugs.webkit.org/show_bug.cgi?id=170539
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp:
+ (webkit_dom_html_input_element_get_capture): Add missing namespace in usage of WebCore::MediaCaptureTypeNone.
+
2017-04-05 Carlos Garcia Campos <[email protected]>
Show a log message when an invalid message is received in non cocoa ports
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp (216309 => 216310)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp 2017-05-06 05:19:39 UTC (rev 216309)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp 2017-05-06 08:08:32 UTC (rev 216310)
@@ -165,7 +165,7 @@
#if ENABLE(MEDIA_CAPTURE)
WebCore::JSMainThreadNullState state;
WebCore::HTMLInputElement* item = WebKit::core(self);
- return item->mediaCaptureType() != MediaCaptureTypeNone;
+ return item->mediaCaptureType() != WebCore::MediaCaptureTypeNone;
#else
UNUSED_PARAM(self);
WEBKIT_WARN_FEATURE_NOT_PRESENT("Media Capture")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
