Title: [190795] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 190795
- Author
- matthew_han...@apple.com
- Date
- 2015-10-09 07:21:58 -0700 (Fri, 09 Oct 2015)
Log Message
Merge r190447. rdar://problem/22865007
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190794 => 190795)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:58 UTC (rev 190794)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:58 UTC (rev 190795)
@@ -1,5 +1,18 @@
2015-10-08 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-08 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190434. rdar://problem/22865007
2015-10-01 Eric Carlson <eric.carl...@apple.com>
@@ -275,19 +288,23 @@
Roll out r190434.
-2015-10-02 Babak Shafiei <bshaf...@apple.com>
+2015-10-08 Matthew Hanson <matthew_han...@apple.com>
- Merge r190447.
+ Merge r190480. rdar://problem/22865007
- 2015-10-01 Jaehun Lim <ljaehun....@samsung.com>
+ 2015-10-02 Babak Shafiei <bshaf...@apple.com>
- Unreviewed, fix build warning after r190434
+ Merge r190447.
- Fix error: variable ‘interruption’ set but not used [-Werror=unused-but-set-variable]
+ 2015-10-01 Jaehun Lim <ljaehun....@samsung.com>
- * testing/Internals.cpp:
- (WebCore::Internals::beginMediaSessionInterruption):
+ 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-08 Matthew Hanson <matthew_han...@apple.com>
Merge r190478. rdar://problem/22865007
Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp (190794 => 190795)
--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-09 14:21:58 UTC (rev 190794)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-09 14:21:58 UTC (rev 190795)
@@ -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
