From 3916d6ff306e57dce3a2a9c908ea5f33d202480b Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Mon, 31 Jan 2011 17:32:54 -0500
Subject: Use fixedClipRect when modifying clipRect for fixed elements.

Bug:3408368
Change-Id: I21a61bd409b635e5779408f43b6265d640476c03
---
 WebCore/rendering/RenderLayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebCore/rendering/RenderLayer.cpp')

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 =
-- 
cgit v1.1