OSDN Git Service

Use fixedClipRect when modifying clipRect for fixed elements.
authorLeon Scroggins <scroggo@google.com>
Mon, 31 Jan 2011 22:32:54 +0000 (17:32 -0500)
committerLeon Scroggins <scroggo@google.com>
Mon, 31 Jan 2011 22:44:14 +0000 (17:44 -0500)
Bug:3408368
Change-Id: I21a61bd409b635e5779408f43b6265d640476c03

WebCore/rendering/RenderLayer.cpp

index e68db1e..1b1273e 100644 (file)
@@ -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 =