From b1e9e47fa11f608ae16bc07f97a2acf95bf80272 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 1 Jun 2012 10:36:58 +0200 Subject: Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200) Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage of libpng/libjpeg if available in the system. --- Source/WebCore/page/FrameView.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/page/FrameView.cpp') diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 8d141b8d1..adbe04968 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -1259,7 +1259,11 @@ bool FrameView::useSlowRepaints(bool considerOverlap) const { bool mustBeSlow = m_slowRepaintObjectCount > 0 || (platformWidget() && m_fixedObjectCount > 0); - if (contentsInCompositedLayer()) + // FIXME: WidgetMac.mm makes the assumption that useSlowRepaints == + // m_contentIsOpaque, so don't take the fast path for composited layers + // if they are a platform widget in order to get painting correctness + // for transparent layers. See the comment in WidgetMac::paint. + if (contentsInCompositedLayer() && !platformWidget()) return mustBeSlow; #if PLATFORM(CHROMIUM) -- cgit v1.2.1