diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-31 15:01:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 15:01:45 -0800 |
| commit | 8bd09088fb4573e601b30ac044f9a318a8e709e7 (patch) | |
| tree | 2ab884b01545bcb58c07299ff51a80e07706c3e1 /WebCore/rendering/RenderLayer.cpp | |
| parent | 9b4518afdef9240b40c293834fab99b312d41d57 (diff) | |
| parent | 3916d6ff306e57dce3a2a9c908ea5f33d202480b (diff) | |
| download | external_webkit-8bd09088fb4573e601b30ac044f9a318a8e709e7.zip external_webkit-8bd09088fb4573e601b30ac044f9a318a8e709e7.tar.gz external_webkit-8bd09088fb4573e601b30ac044f9a318a8e709e7.tar.bz2 | |
Merge "Use fixedClipRect when modifying clipRect for fixed elements." into honeycomb
Diffstat (limited to 'WebCore/rendering/RenderLayer.cpp')
| -rw-r--r-- | WebCore/rendering/RenderLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index e68db1e..1b1273e 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -3251,7 +3251,8 @@ void RenderLayer::calculateClipRects(const RenderLayer* rootLayer, ClipRects& cl if (renderer()->hasOverflowClip()) { IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y); #if ENABLE(ANDROID_OVERFLOW_SCROLL) - clipRects.setHitTestClip(intersection(newOverflowClip, clipRects.hitTestClip())); + clipRects.setHitTestClip(intersection(clipRects.fixed() ? clipRects.fixedClipRect() + : newOverflowClip, clipRects.hitTestClip())); if (hasOverflowScroll()) { RenderBox* box = toRenderBox(renderer()); newOverflowClip = |