diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebCore/rendering/RenderObject.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebCore/rendering/RenderObject.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 983aced4e..15dcdd058 100644 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -1280,10 +1280,12 @@ RenderLayerModelObject* RenderObject::containerForRepaint() const #endif #if ENABLE(CSS_FILTERS) - if (RenderLayer* parentLayer = enclosingLayer()) { - RenderLayer* enclosingFilterLayer = parentLayer->enclosingFilterLayer(); - if (enclosingFilterLayer) - return enclosingFilterLayer->renderer(); + if (document()->view()->hasSoftwareFilters()) { + if (RenderLayer* parentLayer = enclosingLayer()) { + RenderLayer* enclosingFilterLayer = parentLayer->enclosingFilterLayer(); + if (enclosingFilterLayer) + return enclosingFilterLayer->renderer(); + } } #endif |