Title: [216661] branches/safari-604.1.21-branch/Source/WebKit2
- Revision
- 216661
- Author
- [email protected]
- Date
- 2017-05-11 00:27:23 -0700 (Thu, 11 May 2017)
Log Message
Cherry-pick r216442. rdar://problem/32051789
Modified Paths
Diff
Modified: branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog (216660 => 216661)
--- branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog 2017-05-11 07:27:21 UTC (rev 216660)
+++ branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog 2017-05-11 07:27:23 UTC (rev 216661)
@@ -1,3 +1,18 @@
+2017-05-10 Jason Marcell <[email protected]>
+
+ Cherry-pick r216442. rdar://problem/32051789
+
+ 2017-05-08 Youenn Fablet <[email protected]>
+
+ Clean UserMediaCaptureManager::capabilities return value
+ https://bugs.webkit.org/show_bug.cgi?id=171808
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+ (WebKit::UserMediaCaptureManager::capabilities):
+ * WebProcess/cocoa/UserMediaCaptureManager.h:
+
2017-05-03 John Wilander <[email protected]>
Resource Load Statistics: Remove all statistics for modifiedSince website data removals
Modified: branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.cpp (216660 => 216661)
--- branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.cpp 2017-05-11 07:27:21 UTC (rev 216660)
+++ branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.cpp 2017-05-11 07:27:23 UTC (rev 216661)
@@ -257,11 +257,11 @@
m_process.send(Messages::UserMediaCaptureManagerProxy::StopProducingData(id), 0);
}
-WebCore::RealtimeMediaSourceCapabilities&& UserMediaCaptureManager::capabilities(uint64_t id)
+WebCore::RealtimeMediaSourceCapabilities UserMediaCaptureManager::capabilities(uint64_t id)
{
WebCore::RealtimeMediaSourceCapabilities capabilities;
m_process.sendSync(Messages::UserMediaCaptureManagerProxy::Capabilities(id), Messages::UserMediaCaptureManagerProxy::Capabilities::Reply(capabilities), 0);
- return WTFMove(capabilities);
+ return capabilities;
}
void UserMediaCaptureManager::setMuted(uint64_t id, bool muted)
Modified: branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.h (216660 => 216661)
--- branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.h 2017-05-11 07:27:21 UTC (rev 216660)
+++ branches/safari-604.1.21-branch/Source/WebKit2/WebProcess/cocoa/UserMediaCaptureManager.h 2017-05-11 07:27:23 UTC (rev 216661)
@@ -72,7 +72,7 @@
void startProducingData(uint64_t);
void stopProducingData(uint64_t);
- WebCore::RealtimeMediaSourceCapabilities&& capabilities(uint64_t);
+ WebCore::RealtimeMediaSourceCapabilities capabilities(uint64_t);
void setMuted(uint64_t, bool);
void setEnabled(uint64_t, bool);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
