Title: [191170] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 191170
- Author
- matthew_han...@apple.com
- Date
- 2015-10-15 23:28:57 -0700 (Thu, 15 Oct 2015)
Log Message
Merge r190447. rdar://problem/22865007
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191169 => 191170)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-16 06:28:55 UTC (rev 191169)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-16 06:28:57 UTC (rev 191170)
@@ -1,5 +1,18 @@
2015-10-15 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190447. rdar://problem/22865007
+
+ 2015-10-01 Jaehun Lim <ljaehun....@samsung.com>
+
+ 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-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190434. rdar://problem/22865007
2015-10-01 Eric Carlson <eric.carl...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp (191169 => 191170)
--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-16 06:28:55 UTC (rev 191169)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-16 06:28:57 UTC (rev 191170)
@@ -2629,7 +2629,7 @@
return;
}
- PlatformMediaSessionManager::sharedManager().beginInterruption(PlatformMediaSession::SystemInterruption);
+ PlatformMediaSessionManager::sharedManager().beginInterruption(interruption);
}
void Internals::endMediaSessionInterruption(const String& flagsString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
