[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
cmarrin at apple.com
cmarrin at apple.com
Sun Feb 20 22:53:24 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 95bd99e10b83eaa62f7774f0209f4b821dccd02f
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 13 00:35:59 2011 +0000
2011-01-12 Chris Marrin <cmarrin at apple.com>
Unreviewed.
Getting rid of an assert that was causing build failures that turns out not to be needed.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintsWithTransform):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75656 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c29074d..7192b5b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,15 @@
Unreviewed.
+ Getting rid of an assert that was causing build failures that turns out not to be needed.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintsWithTransform):
+
+2011-01-12 Chris Marrin <cmarrin at apple.com>
+
+ Unreviewed.
+
Another fix for Gtk
* rendering/RenderLayer.cpp:
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index e5ed3b4..df55602 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -3483,7 +3483,6 @@ bool RenderLayer::hasCompositedMask() const
bool RenderLayer::paintsWithTransform(PaintBehavior paintBehavior) const
{
#if USE(ACCELERATED_COMPOSITING)
- ASSERT(backing());
bool paintsToWindow = !isComposited() || backing()->paintingGoesToWindow();
#else
bool paintsToWindow = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list