Changeset 84454 in webkit

Timestamp:

Apr 20, 2011 7:13:10 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9095366> With a non-1 page scale, scrolling to reveal selection fails
​https://bugs.webkit.org/show_bug.cgi?id=59046

Reviewed by Maciej Stachowiak.

Source/WebCore:

Test: fast/transforms/selection-bounds-in-transformed-view.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::repaintUsingContainer): If the repaint container is the RenderView, and
it has a composited layer that paints straight to the window, then translate from view coordinates
to window coordinates here.

• rendering/RenderView.cpp:

(WebCore::RenderView::mapLocalToContainer): Do not apply our transform if we are the painting root.
(WebCore::RenderView::computeRectForRepaint): Ditto. Applying the transform here was compensating
for not applying it in RenderObject::repaintUsingContainer(), but for purposes other than repainting,
such as computing selection bounds, this function was returning the wrong results.

LayoutTests:

• fast/transforms/selection-bounds-in-transformed-view-expected.txt: Added.
• fast/transforms/selection-bounds-in-transformed-view.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/transforms/selection-bounds-in-transformed-view-expected.txt (added)
• LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9095366> With a non-1 page scale, scrolling to reveal selection fails
+        https://bugs.webkit.org/show_bug.cgi?id=59046
+
+        * fast/transforms/selection-bounds-in-transformed-view-expected.txt: Added.
+        * fast/transforms/selection-bounds-in-transformed-view.html: Added.
+
 2011-04-20  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9095366> With a non-1 page scale, scrolling to reveal selection fails
+        https://bugs.webkit.org/show_bug.cgi?id=59046
+
+        Test: fast/transforms/selection-bounds-in-transformed-view.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::repaintUsingContainer): If the repaint container is the RenderView, and
+        it has a composited layer that paints straight to the window, then translate from view coordinates
+        to window coordinates here.
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::mapLocalToContainer): Do not apply our transform if we are the painting root.
+        (WebCore::RenderView::computeRectForRepaint): Ditto. Applying the transform here was compensating
+        for not applying it in RenderObject::repaintUsingContainer(), but for purposes other than repainting,
+        such as computing selection bounds, this function was returning the wrong results.
+
 2011-04-20  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1158 +1158 @@
     if (repaintContainer->isRenderView()) {
         ASSERT(repaintContainer == v);
-        if (!v->hasLayer() || !v->layer()->isComposited() || v->layer()->backing()->paintingGoesToWindow()) {
-            v->repaintViewRectangle(r, immediate);
+        bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited();
+        if (!viewHasCompositedLayer || v->layer()->backing()->paintingGoesToWindow()) {
+            IntRect repaintRectangle = r;
+            if (viewHasCompositedLayer &&  v->layer()->transform())
+                repaintRectangle = v->layer()->transform()->mapRect(r);
+            v->repaintViewRectangle(repaintRectangle, immediate);
             return;
         }

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -141 +141 @@
     // If a container was specified, and was not 0 or the RenderView,
     // then we should have found it by now.
-    ASSERT_UNUSED(repaintContainer, !repaintContainer || repaintContainer == this);
-
-    if (useTransforms && shouldUseTransformFromContainer(0)) {
+    ASSERT_ARG(repaintContainer, !repaintContainer || repaintContainer == this);
+
+    if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {
         TransformationMatrix t;
         getTransformFromContainer(0, IntSize(), t);
@@ -300 +300 @@
     // If a container was specified, and was not 0 or the RenderView,
     // then we should have found it by now.
-    ASSERT_UNUSED(repaintContainer, !repaintContainer || repaintContainer == this);
+    ASSERT_ARG(repaintContainer, !repaintContainer || repaintContainer == this);
 
     if (printing())
@@ -318 +318 @@
         
     // Apply our transform if we have one (because of full page zooming).
-    if (m_layer && m_layer->transform())
+    if (!repaintContainer && m_layer && m_layer->transform())
         rect = m_layer->transform()->mapRect(rect);
 }