Title: [226178] trunk/Source
- Revision
- 226178
- Author
- ms2...@igalia.com
- Date
- 2017-12-20 06:31:58 -0800 (Wed, 20 Dec 2017)
Log Message
REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
https://bugs.webkit.org/show_bug.cgi?id=181026
Unreviewed build fix.
Source/WebCore:
* platform/mediastream/MediaStreamRequest.h: Fix namespace, unconditionally include header.
Source/WebKit:
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
Remove UNUSED_PARAM macros that check for (undefined) members rather than params.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226177 => 226178)
--- trunk/Source/WebCore/ChangeLog 2017-12-20 14:28:05 UTC (rev 226177)
+++ trunk/Source/WebCore/ChangeLog 2017-12-20 14:31:58 UTC (rev 226178)
@@ -1,3 +1,12 @@
+2017-12-20 Ms2ger <ms2...@igalia.com>
+
+ REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
+ https://bugs.webkit.org/show_bug.cgi?id=181026
+
+ Unreviewed build fix.
+
+ * platform/mediastream/MediaStreamRequest.h: Fix namespace, unconditionally include header.
+
2017-12-20 Frederic Wang <fw...@igalia.com>
Refactor RenderMathMLFraction to remove members modified during layout
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamRequest.h (226177 => 226178)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamRequest.h 2017-12-20 14:28:05 UTC (rev 226177)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamRequest.h 2017-12-20 14:31:58 UTC (rev 226178)
@@ -25,10 +25,11 @@
#pragma once
+#include <wtf/EnumTraits.h>
+
#if ENABLE(MEDIA_STREAM)
#include "MediaConstraints.h"
-#include <wtf/EnumTraits.h>
namespace WebCore {
@@ -60,11 +61,15 @@
#else
+namespace WebCore {
+
struct MediaStreamRequest {
enum class Type { UserMedia };
Type type;
};
+} // namespace WebCore
+
#endif // ENABLE(MEDIA_STREAM)
namespace WTF {
Modified: trunk/Source/WebKit/ChangeLog (226177 => 226178)
--- trunk/Source/WebKit/ChangeLog 2017-12-20 14:28:05 UTC (rev 226177)
+++ trunk/Source/WebKit/ChangeLog 2017-12-20 14:31:58 UTC (rev 226178)
@@ -1,3 +1,14 @@
+2017-12-20 Ms2ger <ms2...@igalia.com>
+
+ REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
+ https://bugs.webkit.org/show_bug.cgi?id=181026
+
+ Unreviewed build fix.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
+ Remove UNUSED_PARAM macros that check for (undefined) members rather than params.
+
2017-12-19 Myles C. Maxfield <mmaxfi...@apple.com>
Refactor user-installed font setting for clarity
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (226177 => 226178)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-12-20 14:28:05 UTC (rev 226177)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-12-20 14:31:58 UTC (rev 226178)
@@ -331,8 +331,6 @@
UNUSED_PARAM(frameID);
UNUSED_PARAM(userMediaDocumentOrigin);
UNUSED_PARAM(topLevelDocumentOrigin);
- UNUSED_PARAM(audioConstraints);
- UNUSED_PARAM(videoConstraints);
UNUSED_PARAM(userRequest);
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
