[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
bweinstein at apple.com
bweinstein at apple.com
Thu Apr 8 01:50:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ade7543f54abf2214bdc03b48eb88aa752dc6da8
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 17 08:17:22 2010 +0000
Build fix by adding a return statement.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
index 83d828c..1df73a7 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
@@ -111,7 +111,7 @@ PlatformMedia MediaPlayerPrivate::platformMedia() const
#if USE(ACCELERATED_COMPOSITING)
PlatformLayer* MediaPlayerPrivate::platformLayer() const
{
- m_qtVideoLayer->platformLayer();
+ return m_qtVideoLayer->platformLayer();
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list