Title: [215980] trunk/Source
- Revision
- 215980
- Author
- commit-qu...@webkit.org
- Date
- 2017-04-29 20:30:32 -0700 (Sat, 29 Apr 2017)
Log Message
Readd assertion removed accidentally in r215955
https://bugs.webkit.org/show_bug.cgi?id=171466
Patch by Youenn Fablet <you...@apple.com> on 2017-04-29
Reviewed by Eric Carlson.
Source/WebCore:
Unreviewed.
* platform/mediastream/mac/MockRealtimeVideoSourceMac.mm:
(WebCore::MockRealtimeVideoSourceMac::orientationChanged): Improved FIXME after review.
Source/WebKit2:
* WebProcess/WebPage/WebBackForwardListProxy.cpp:
(WebKit::WebBackForwardListProxy::addItemFromUIProcess):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215979 => 215980)
--- trunk/Source/WebCore/ChangeLog 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebCore/ChangeLog 2017-04-30 03:30:32 UTC (rev 215980)
@@ -1,3 +1,15 @@
+2017-04-29 Youenn Fablet <you...@apple.com>
+
+ Readd assertion removed accidentally in r215955
+ https://bugs.webkit.org/show_bug.cgi?id=171466
+
+ Reviewed by Eric Carlson.
+
+ Unreviewed.
+
+ * platform/mediastream/mac/MockRealtimeVideoSourceMac.mm:
+ (WebCore::MockRealtimeVideoSourceMac::orientationChanged): Improved FIXME after review.
+
2017-04-29 Andy Estes <aes...@apple.com>
[macOS] Picture-in-picture should be disabled in WebPlaybackControlsManager during external media playback
Modified: trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm (215979 => 215980)
--- trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm 2017-04-30 03:30:32 UTC (rev 215980)
@@ -164,7 +164,7 @@
void MockRealtimeVideoSourceMac::orientationChanged(int orientation)
{
- // FIXME: Do something with m_deviceOrientation
+ // FIXME: Do something with m_deviceOrientation. See bug 169822.
switch (orientation) {
case 0:
m_deviceOrientation = MediaSample::VideoRotation::None;
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (215979 => 215980)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2017-04-30 03:30:32 UTC (rev 215980)
@@ -137,7 +137,7 @@
if (!audioDeviceID.isEmpty() && m_audioFactory) {
auto audioSource = m_audioFactory->createAudioCaptureSource(audioDeviceID, audioConstraints);
- if (!!audioSource)
+ if (audioSource)
audioSources.append(audioSource.source());
#if !LOG_DISABLED
if (!audioSource.errorMessage.isEmpty())
@@ -146,7 +146,7 @@
}
if (!videoDeviceID.isEmpty() && m_videoFactory) {
auto videoSource = m_videoFactory->createVideoCaptureSource(videoDeviceID, videoConstraints);
- if (!!videoSource)
+ if (videoSource)
videoSources.append(videoSource.source());
#if !LOG_DISABLED
if (!videoSource.errorMessage.isEmpty())
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (215979 => 215980)
--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2017-04-30 03:30:32 UTC (rev 215980)
@@ -87,7 +87,7 @@
Vector<DeviceInfo> deviceInfo;
for (const auto& device : MockRealtimeMediaSource::audioDevices()) {
auto sourceOrError = MockRealtimeAudioSource::create(device.label(), nullptr);
- if (!!sourceOrError && sourceOrError.captureSource->supportsConstraints(audioConstraints, invalidConstraint))
+ if (sourceOrError && sourceOrError.captureSource->supportsConstraints(audioConstraints, invalidConstraint))
deviceInfo.append({sourceOrError.captureSource->fitnessScore(), device.persistentId()});
}
@@ -138,7 +138,7 @@
if (audioDeviceID == captureDevice.persistentId()) {
auto sourceOrError = MockRealtimeAudioSource::create(captureDevice.label(), audioConstraints);
- if (!!sourceOrError)
+ if (sourceOrError)
audioSources.append(sourceOrError.source());
}
}
@@ -151,7 +151,7 @@
if (videoDeviceID == captureDevice.persistentId()) {
auto sourceOrError = MockRealtimeVideoSource::create(captureDevice.label(), videoConstraints);
- if (!!sourceOrError)
+ if (sourceOrError)
videoSources.append(sourceOrError.source());
}
}
Modified: trunk/Source/WebKit2/ChangeLog (215979 => 215980)
--- trunk/Source/WebKit2/ChangeLog 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-30 03:30:32 UTC (rev 215980)
@@ -1,3 +1,13 @@
+2017-04-29 Youenn Fablet <you...@apple.com>
+
+ Readd assertion removed accidentally in r215955
+ https://bugs.webkit.org/show_bug.cgi?id=171466
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+ (WebKit::WebBackForwardListProxy::addItemFromUIProcess):
+
2017-04-29 Andy Estes <aes...@apple.com>
[macOS] Picture-in-picture should be disabled in WebPlaybackControlsManager during external media playback
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp (215979 => 215980)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2017-04-30 03:28:27 UTC (rev 215979)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2017-04-30 03:30:32 UTC (rev 215980)
@@ -98,7 +98,7 @@
{
// This item/itemID pair should not already exist in our maps.
ASSERT(!historyItemToIDMap().contains(item.ptr()));
-// ASSERT(!idToHistoryItemMap().contains(itemID));
+ ASSERT(!idToHistoryItemMap().contains(itemID));
historyItemToIDMap().set<ItemAndPageID>(item.ptr(), { .itemID = itemID, .pageID = pageID });
idToHistoryItemMap().set(itemID, item.ptr());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
