diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-26 11:37:00 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-26 11:36:36 +0100 |
| commit | f474b2b60ec57205facd4eec2181ebe69b686772 (patch) | |
| tree | 42a132541a82c97039ea8a98b40e5012187ede28 /Source/WebKit2/WebProcess | |
| parent | 061d58bc0fa016cfeed744fd3e4663460635d69b (diff) | |
| download | qtwebkit-f474b2b60ec57205facd4eec2181ebe69b686772.tar.gz | |
Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit.org/repository/webkit/trunk@135696)
New snapshot that fixes build after QMacStyle removal
Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp index e5639cf79..c7808b2b2 100644 --- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp +++ b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp @@ -860,7 +860,10 @@ bool CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms() if (!m_layerTransform.combined().isAffine()) return true; - return false; + if (!parent()) + return false; + + return toCoordinatedGraphicsLayer(parent())->selfOrAncestorHaveNonAffineTransforms(); } bool CoordinatedGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double delayAsNegativeTimeOffset) |