[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:20 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit e13253f446bd15ed68b808ca3a57503a82c16052
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 7 23:18:50 2011 +0000
Further build fixes. Add a ENABLE(FULLSCREEN_API) guard around
the implementation of requiresCompositingfForFullScreen.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForFullScreen):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75282 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f9e09e..3a714b7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
2011-01-07 Jer Noble <jer.noble at apple.com>
+ Further build fixes. Add a ENABLE(FULLSCREEN_API) guard around
+ the implementation of requiresCompositingfForFullScreen.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForFullScreen):
+
+2011-01-07 Jer Noble <jer.noble at apple.com>
+
No review, build fix only. Removed parameter who was causing
a warning in Release builds.
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 343eb89..de6cef2 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1325,7 +1325,11 @@ bool RenderLayerCompositor::requiresCompositingWhenDescendantsAreCompositing(Ren
bool RenderLayerCompositor::requiresCompositingForFullScreen(RenderObject* renderer) const
{
+#if ENABLE(FULLSCREEN_API)
return renderer->isRenderFullScreen() && toRenderFullScreen(renderer)->isAnimating();
+#else
+ return false;
+#endif
}
// If an element has negative z-index children, those children render in front of the
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list