[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
jer.noble at apple.com
jer.noble at apple.com
Fri Jan 21 15:09:42 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit f59c5718583fa2e31aa162198aaf8a3ecef78c5d
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 8 00:21:41 2011 +0000
GTK Linux build fix: isDocumentRunningFullScreenAnimation should
be protected both by ENABLE(FULLSCREEN_API) && USE(ACCELERATED_COMPOSITING)
* page/FrameView.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75290 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1e3094..dec33af 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07 Jer Noble <jer.noble at apple.com>
+
+ GTK Linux build fix: isDocumentRunningFullScreenAnimation should
+ be protected both by ENABLE(FULLSCREEN_API) && USE(ACCELERATED_COMPOSITING)
+
+ * page/FrameView.cpp:
+
2011-01-07 Rafael Weinstein <rafaelw at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 3958192..77e1976 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -529,7 +529,7 @@ void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
}
}
-#if ENABLE(FULLSCREEN_API)
+#if ENABLE(FULLSCREEN_API) && USE(ACCELERATED_COMPOSITING)
static bool isDocumentRunningFullScreenAnimation(Document* document)
{
return document->webkitIsFullScreen() && document->fullScreenRenderer() && document->fullScreenRenderer()->isAnimating();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list