Title: [158024] branches/safari-537.73-branch/Source/WebCore
- Revision
- 158024
- Author
- [email protected]
- Date
- 2013-10-25 11:04:28 -0700 (Fri, 25 Oct 2013)
Log Message
Merged r154915. <rdar://problem/15109453>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158023 => 158024)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 18:02:21 UTC (rev 158023)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 18:04:28 UTC (rev 158024)
@@ -1,5 +1,21 @@
2013-10-25 Lucas Forschler <[email protected]>
+ Merge r154915
+
+ 2013-08-30 Brent Fulgham <[email protected]>
+
+ [Windows] Update to incorporate additional suggestions
+ https://bugs.webkit.org/show_bug.cgi?id=120448
+
+ Reviewed by Darin Adler
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Add
+ notes as to why AVFoundationCF needs this extra method call.
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h: Use OVERRIDE
+ * rendering/RenderVideo.cpp: Replace ternary operator with logical &&.
+
+2013-10-25 Lucas Forschler <[email protected]>
+
Merge r154914
2013-08-30 Brent Fulgham <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (158023 => 158024)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 18:02:21 UTC (rev 158023)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 18:04:28 UTC (rev 158024)
@@ -952,6 +952,17 @@
setNaturalSize(IntSize(naturalSize));
}
+bool MediaPlayerPrivateAVFoundationCF::requiresImmediateCompositing() const
+{
+ // The AVFoundationCF player needs to have the root compositor available at construction time
+ // so it can attach to the rendering device. Otherwise it falls back to CPU-only mode.
+ //
+ // It would be nice if AVCFPlayer had some way to switch to hardware-accelerated mode
+ // when asked, then we could follow AVFoundation's model and switch to compositing
+ // mode when beginning to play media.
+ return true;
+}
+
#if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
void MediaPlayerPrivateAVFoundationCF::processLegacyClosedCaptionsTracks()
{
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (158023 => 158024)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2013-10-25 18:02:21 UTC (rev 158023)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2013-10-25 18:04:28 UTC (rev 158024)
@@ -85,7 +85,7 @@
virtual float platformMaxTimeLoaded() const;
virtual void beginLoadingMetadata();
virtual void sizeChanged();
- virtual bool requiresImmediateCompositing() const { return true; }
+ virtual bool requiresImmediateCompositing() const OVERRIDE;
virtual bool hasAvailableVideoFrame() const;
Modified: branches/safari-537.73-branch/Source/WebCore/rendering/RenderVideo.cpp (158023 => 158024)
--- branches/safari-537.73-branch/Source/WebCore/rendering/RenderVideo.cpp 2013-10-25 18:02:21 UTC (rev 158023)
+++ branches/safari-537.73-branch/Source/WebCore/rendering/RenderVideo.cpp 2013-10-25 18:04:28 UTC (rev 158024)
@@ -298,8 +298,8 @@
bool RenderVideo::requiresImmediateCompositing() const
{
- MediaPlayer* p = mediaElement()->player();
- return p ? p->requiresImmediateCompositing() : false;
+ MediaPlayer* player = mediaElement()->player();
+ return player && player->requiresImmediateCompositing();
}
#if ENABLE(FULLSCREEN_API)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
