Title: [269295] trunk/Source/WebCore
- Revision
- 269295
- Author
- [email protected]
- Date
- 2020-11-03 05:35:47 -0800 (Tue, 03 Nov 2020)
Log Message
REGRESSION (r269244?): ASSERTION FAILED: m_idHashSalt.isEmpty() || m_idHashSalt == salt in WebCore::Document::setDeviceIDHashSalt
https://bugs.webkit.org/show_bug.cgi?id=218458
<rdar://problem/70963733>
Reviewed by Eric Carlson.
Remove no longer needed code.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::allow):
* dom/Document.cpp:
* dom/Document.h:
(WebCore::Document::hasHadCaptureMediaStreamTrack const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (269294 => 269295)
--- trunk/Source/WebCore/ChangeLog 2020-11-03 12:55:56 UTC (rev 269294)
+++ trunk/Source/WebCore/ChangeLog 2020-11-03 13:35:47 UTC (rev 269295)
@@ -1,3 +1,19 @@
+2020-11-03 Youenn Fablet <[email protected]>
+
+ REGRESSION (r269244?): ASSERTION FAILED: m_idHashSalt.isEmpty() || m_idHashSalt == salt in WebCore::Document::setDeviceIDHashSalt
+ https://bugs.webkit.org/show_bug.cgi?id=218458
+ <rdar://problem/70963733>
+
+ Reviewed by Eric Carlson.
+
+ Remove no longer needed code.
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::allow):
+ * dom/Document.cpp:
+ * dom/Document.h:
+ (WebCore::Document::hasHadCaptureMediaStreamTrack const):
+
2020-11-03 Adrian Perez de Castro <[email protected]>
Non-unified build fixes, early November 2020 edition
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (269294 => 269295)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2020-11-03 12:55:56 UTC (rev 269294)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2020-11-03 13:35:47 UTC (rev 269295)
@@ -257,8 +257,6 @@
};
auto& document = downcast<Document>(*scriptExecutionContext());
- document.setDeviceIDHashSalt(deviceIdentifierHashSalt);
-
RealtimeMediaSourceCenter::singleton().createMediaStream(document.logger(), WTFMove(callback), WTFMove(deviceIdentifierHashSalt), WTFMove(audioDevice), WTFMove(videoDevice), m_request);
if (!m_scriptExecutionContext)
Modified: trunk/Source/WebCore/dom/Document.cpp (269294 => 269295)
--- trunk/Source/WebCore/dom/Document.cpp 2020-11-03 12:55:56 UTC (rev 269294)
+++ trunk/Source/WebCore/dom/Document.cpp 2020-11-03 13:35:47 UTC (rev 269295)
@@ -7952,12 +7952,6 @@
});
}
-void Document::setDeviceIDHashSalt(const String& salt)
-{
- ASSERT(m_idHashSalt.isEmpty() || m_idHashSalt == salt);
- m_idHashSalt = salt;
-}
-
#endif
const AtomString& Document::bgColor() const
Modified: trunk/Source/WebCore/dom/Document.h (269294 => 269295)
--- trunk/Source/WebCore/dom/Document.h 2020-11-03 12:55:56 UTC (rev 269294)
+++ trunk/Source/WebCore/dom/Document.h 2020-11-03 13:35:47 UTC (rev 269295)
@@ -1425,8 +1425,6 @@
#if ENABLE(MEDIA_STREAM)
void setHasCaptureMediaStreamTrack() { m_hasHadCaptureMediaStreamTrack = true; }
bool hasHadCaptureMediaStreamTrack() const { return m_hasHadCaptureMediaStreamTrack; }
- void setDeviceIDHashSalt(const String&);
- String deviceIDHashSalt() const { return m_idHashSalt; }
void stopMediaCapture();
void mediaStreamCaptureStateChanged();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
