Title: [183239] trunk/Source/WebKit/win
- Revision
- 183239
- Author
- [email protected]
- Date
- 2015-04-23 20:49:12 -0700 (Thu, 23 Apr 2015)
Log Message
Try to fix the Windows build after r183234.
* FullscreenVideoController.cpp:
(FullscreenVideoController::FullscreenVideoController): FullscreenVideoController inherits privately from
WebCore::MediaPlayerPrivateFullscreenClient, so make_unique isn't allowed to upcast. Add an explicit upcast.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (183238 => 183239)
--- trunk/Source/WebKit/win/ChangeLog 2015-04-24 03:08:31 UTC (rev 183238)
+++ trunk/Source/WebKit/win/ChangeLog 2015-04-24 03:49:12 UTC (rev 183239)
@@ -1,3 +1,11 @@
+2015-04-23 Andy Estes <[email protected]>
+
+ Try to fix the Windows build after r183234.
+
+ * FullscreenVideoController.cpp:
+ (FullscreenVideoController::FullscreenVideoController): FullscreenVideoController inherits privately from
+ WebCore::MediaPlayerPrivateFullscreenClient, so make_unique isn't allowed to upcast. Add an explicit upcast.
+
2015-04-23 Darin Adler <[email protected]>
Another round of removing use of OwnPtr, PassOwnPtr, and deleteOwnedPtr
Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (183238 => 183239)
--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-04-24 03:08:31 UTC (rev 183238)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-04-24 03:49:12 UTC (rev 183239)
@@ -245,7 +245,7 @@
, m_timer(*this, &FullscreenVideoController::timerFired)
, m_layerClient(std::make_unique<LayerClient>(this))
, m_rootChild(PlatformCALayerWin::create(PlatformCALayer::LayerTypeLayer, m_layerClient.get()))
- , m_fullscreenWindow(std::make_unique<MediaPlayerPrivateFullscreenWindow>(this))
+ , m_fullscreenWindow(std::make_unique<MediaPlayerPrivateFullscreenWindow>(static_cast<MediaPlayerPrivateFullscreenClient*>(this)))
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
