Title: [187337] trunk/Source/WebKit2
- Revision
- 187337
- Author
- carlo...@webkit.org
- Date
- 2015-07-24 04:58:52 -0700 (Fri, 24 Jul 2015)
Log Message
Unreviewed. Fix the build with MEDIA_STREAM disabled after r187282.
RealtimeMediaSource is only defined when MEDIA_STREAM is enabled.
* UIProcess/UserMediaPermissionRequestProxy.cpp:
* UIProcess/UserMediaPermissionRequestProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187336 => 187337)
--- trunk/Source/WebKit2/ChangeLog 2015-07-24 11:27:32 UTC (rev 187336)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-24 11:58:52 UTC (rev 187337)
@@ -1,5 +1,14 @@
2015-07-24 Carlos Garcia Campos <cgar...@igalia.com>
+ Unreviewed. Fix the build with MEDIA_STREAM disabled after r187282.
+
+ RealtimeMediaSource is only defined when MEDIA_STREAM is enabled.
+
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ * UIProcess/UserMediaPermissionRequestProxy.h:
+
+2015-07-24 Carlos Garcia Campos <cgar...@igalia.com>
+
REGRESSION(r187100): [GTK] ASSERTION FAILED: Attempt to access post layout data before receiving it when typing backspace
https://bugs.webkit.org/show_bug.cgi?id=147196
Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp (187336 => 187337)
--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-07-24 11:27:32 UTC (rev 187336)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-07-24 11:58:52 UTC (rev 187337)
@@ -51,10 +51,12 @@
m_manager.invalidateRequests();
}
+#if ENABLE(MEDIA_STREAM)
const String& UserMediaPermissionRequestProxy::getDeviceNameForUID(const String& UID, WebCore::RealtimeMediaSource::Type type)
{
return WebCore::RealtimeMediaSourceCenter::singleton().sourceWithUID(UID, type, nullptr)->label();
}
+#endif
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h (187336 => 187337)
--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-07-24 11:27:32 UTC (rev 187336)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-07-24 11:58:52 UTC (rev 187337)
@@ -40,8 +40,10 @@
void deny();
void invalidate();
-
+
+#if ENABLE(MEDIA_STREAM)
const String& getDeviceNameForUID(const String&, WebCore::RealtimeMediaSource::Type);
+#endif
bool requiresAudio() const { return m_requiresAudio; }
bool requiresVideo() const { return m_requiresVideo; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
