Title: [184237] branches/safari-601.1.32-branch/Source/WebCore
- Revision
- 184237
- Author
- [email protected]
- Date
- 2015-05-12 20:22:07 -0700 (Tue, 12 May 2015)
Log Message
Merge r183927. rdar://problem/20854785
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184236 => 184237)
--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:15:51 UTC (rev 184236)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:22:07 UTC (rev 184237)
@@ -2,62 +2,54 @@
Dana Burkart <[email protected]
[email protected]>
- Merge r183909. rdar://problem/18894598
+ Merge r183927. rdar://problem/20854785
- 2015-05-06 Daniel Bates <[email protected]>
+ 2015-05-07 Eric Carlson <[email protected]>
- [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
- https://bugs.webkit.org/show_bug.cgi?id=144657
- <rdar://problem/18894598>
+ [Mac] Playback target isn't set on new element
+ https://bugs.webkit.org/show_bug.cgi?id=144724
- Reviewed by Andy Estes.
+ Reviewed by Jer Noble.
- Export WebCore functionality to pause and resume the database thread so that we can
- make use of this functionality from WebKit2.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setShouldPlayToPlaybackTarget
+ if necessary.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Remember
+ the setting in case we don't have an AVPlayer yet.
- * Modules/webdatabase/AbstractDatabaseServer.h:
- * Modules/webdatabase/DatabaseManager.cpp:
- (WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
- * Modules/webdatabase/DatabaseManager.h:
- * Modules/webdatabase/DatabaseServer.cpp:
- (WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
- DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
- For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
- we fix <https://bugs.webkit.org/show_bug.cgi?id=144660>.
- * Modules/webdatabase/DatabaseServer.h:
-
2015-05-12 Dana Burkart
- Dana Burkart <[email protected]>
+ Dana Burkart <[email protected]
+ [email protected]>
- Merge r183942. rdar://problem/20049088
+ Merge r183909. rdar://problem/18894598
- 2015-05-06 Dean Jackson <[email protected]>
+ 2015-05-06 Daniel Bates <[email protected]>
- Handle backdrop views that have to tile
- https://bugs.webkit.org/show_bug.cgi?id=142317
- <rdar://problem/20049088>
+ [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+ https://bugs.webkit.org/show_bug.cgi?id=144657
+ <rdar://problem/18894598>
- Reviewed by Simon Fraser.
+ Reviewed by Andy Estes.
- Take 2 - this was rolled out because Mavericks was crashing.
+ Export WebCore functionality to pause and resume the database thread so that we can
+ make use of this functionality from WebKit2.
- Make sure backdrop layers don't tile. If they are big
- enough, we'll leave it to the platform compositor to handle.
+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
+ DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
+ For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
+ we fix <https://bugs.webkit.org/show_bug.cgi?id=144660>.
+ * Modules/webdatabase/DatabaseServer.h:
- This also fixes a bug where if a layer changed from a backdrop
- type to a tiled type, it would still retain its custom appearance
- and we'd try to add children to the wrong layer.
-
- Test: compositing/media-controls-bar-appearance-big.html
-
- * platform/graphics/ca/GraphicsLayerCA.cpp:
- (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
- a layer needs a backdrop before checking if it needs to tile.
-
2015-05-12 Dana Burkart
Dana Burkart <[email protected]>
- Merge r183894. rdar://problem/20049088
+ Merge r183942. rdar://problem/20049088
2015-05-06 Dean Jackson <[email protected]>
@@ -67,6 +59,8 @@
Reviewed by Simon Fraser.
+ Take 2 - this was rolled out because Mavericks was crashing.
+
Make sure backdrop layers don't tile. If they are big
enough, we'll leave it to the platform compositor to handle.
@@ -80,6 +74,32 @@
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
a layer needs a backdrop before checking if it needs to tile.
+ 2015-05-12 Dana Burkart
+ Dana Burkart <[email protected]>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <[email protected]>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Make sure backdrop layers don't tile. If they are big
+ enough, we'll leave it to the platform compositor to handle.
+
+ This also fixes a bug where if a layer changed from a backdrop
+ type to a tiled type, it would still retain its custom appearance
+ and we'd try to add children to the wrong layer.
+
+ Test: compositing/media-controls-bar-appearance-big.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
+ a layer needs a backdrop before checking if it needs to tile.
+
2015-05-06 Brent Fulgham <[email protected]>
Scroll-snap points do not handle margins and padding propertly
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (184236 => 184237)
--- branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-13 03:15:51 UTC (rev 184236)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-13 03:22:07 UTC (rev 184237)
@@ -379,6 +379,7 @@
bool m_cachedCanPlayFastReverse;
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
mutable bool m_allowsWirelessVideoPlayback;
+ bool m_shouldPlayToPlaybackTarget { false };
#endif
};
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184236 => 184237)
--- branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-13 03:15:51 UTC (rev 184236)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-13 03:22:07 UTC (rev 184237)
@@ -946,6 +946,11 @@
[m_avPlayer.get() setAllowsExternalPlayback:m_allowsWirelessVideoPlayback];
#endif
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+ if (m_shouldPlayToPlaybackTarget)
+ setShouldPlayToPlaybackTarget(true);
+#endif
+
if (player()->client().mediaPlayerIsVideo())
createAVPlayerLayer();
@@ -2781,6 +2786,8 @@
void MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(bool shouldPlay)
{
+ m_shouldPlayToPlaybackTarget = shouldPlay;
+
if (!m_avPlayer)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
