Title: [158020] branches/safari-537.73-branch/Source/WebCore
- Revision
- 158020
- Author
- lforsch...@apple.com
- Date
- 2013-10-25 10:47:02 -0700 (Fri, 25 Oct 2013)
Log Message
Merged r154890. <rdar://problem/15109453>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158019 => 158020)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 17:44:12 UTC (rev 158019)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 17:47:02 UTC (rev 158020)
@@ -1,5 +1,20 @@
2013-10-25 Lucas Forschler <lforsch...@apple.com>
+ Merge r154890
+
+ 2013-08-30 Brent Fulgham <bfulg...@apple.com>
+
+ [Windows] Video inside page always uses non-hardware accelerated playback
+ https://bugs.webkit.org/show_bug.cgi?id=120448
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createAVPlayer): Check for
+ D3D device. If it doesn't exist, switch to compositing mode and try again.
+
+2013-10-25 Lucas Forschler <lforsch...@apple.com>
+
Merge r154856
2013-08-29 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (158019 => 158020)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 17:44:12 UTC (rev 158019)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 17:47:02 UTC (rev 158020)
@@ -401,7 +401,15 @@
ASSERT(m_avfWrapper);
setDelayCallbacks(true);
- m_avfWrapper->createPlayer(reinterpret_cast<IDirect3DDevice9*>(player()->graphicsDeviceAdapter()));
+
+ IDirect3DDevice9* device = reinterpret_cast<IDirect3DDevice9*>(player()->graphicsDeviceAdapter());
+ if (!device) {
+ player()->frameView()->enterCompositingMode();
+ player()->mediaPlayerClient()->mediaPlayerRenderingModeChanged(player());
+ device = reinterpret_cast<IDirect3DDevice9*>(player()->graphicsDeviceAdapter());
+ }
+
+ m_avfWrapper->createPlayer(device);
setDelayCallbacks(false);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
