Title: [190480] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 190480
- Author
- [email protected]
- Date
- 2015-10-02 01:17:42 -0700 (Fri, 02 Oct 2015)
Log Message
Merged r190447. rdar://problem/22865007
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190479 => 190480)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 08:16:46 UTC (rev 190479)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 08:17:42 UTC (rev 190480)
@@ -1,5 +1,18 @@
2015-10-02 Babak Shafiei <[email protected]>
+ Merge r190447.
+
+ 2015-10-01 Jaehun Lim <[email protected]>
+
+ Unreviewed, fix build warning after r190434
+
+ Fix error: variable ‘interruption’ set but not used [-Werror=unused-but-set-variable]
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::beginMediaSessionInterruption):
+
+2015-10-02 Babak Shafiei <[email protected]>
+
Merge r190434.
2015-10-01 Eric Carlson <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp (190479 => 190480)
--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-02 08:16:46 UTC (rev 190479)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-02 08:17:42 UTC (rev 190480)
@@ -2633,7 +2633,7 @@
return;
}
- PlatformMediaSessionManager::sharedManager().beginInterruption(PlatformMediaSession::SystemInterruption);
+ PlatformMediaSessionManager::sharedManager().beginInterruption(interruption);
}
void Internals::endMediaSessionInterruption(const String& flagsString)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
