Changeset 63633 in webkit

Timestamp:

Jul 18, 2010 2:55:49 PM (14 years ago)

Author:

dino@apple.com

Message:

2010-07-18 Dean Jackson <​dino@apple.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=41259
Interacting with a <select> element within a transformed and clipped
container scrolls the container

The Node::getRect and ContainerNode::getRect functions were not
transform-aware. This fixes both, and has a test to make sure
we're not breaking any existing scrollToView code. This means
that a <select> popup will appear in the correct place if it
is within a transformed and scrolled container.

The test makes sure that existing scrollToView
code doesn't break, but also checks that a <select> popup will appear
in the correct place.

Test: fast/transforms/scrollIntoView-transformed.html

• dom/ContainerNode.cpp: (WebCore::ContainerNode::getUpperLeftCorner): (WebCore::ContainerNode::getLowerRightCorner):
• make sure we call localToAbsolute in the right order (after we've done a local move) and pass in the flags to indicate it should look for transforms.
• dom/Node.cpp: (WebCore::Node::getRect):
• make sure localToAbsolute gets told to look for transforms.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/transforms/scrollIntoView-transformed-expected.txt (added)
• LayoutTests/fast/transforms/scrollIntoView-transformed.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/dom/ContainerNode.cpp (modified) (8 diffs)
• WebCore/dom/Node.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-18  Dean Jackson  <dino@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41259
+        Interacting with a <select> element within a transformed and clipped
+        container scrolls the container
+
+        The Node::getRect and ContainerNode::getRect methods were not
+        transform-aware. This test makes sure that existing scrollToView
+        code doesn't break, but also checks that a <select> popup will appear
+        in the correct place when inside a transformed, scrolled container.
+
+        * fast/transforms/scrollIntoView-transformed.html: Added.
+        * fast/transforms/scrollIntoView-transformed-expected.txt: Added.
+
 2010-07-18  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-18  Dean Jackson  <dino@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41259
+        Interacting with a <select> element within a transformed and clipped
+        container scrolls the container
+
+        The Node::getRect and ContainerNode::getRect functions were not
+        transform-aware. This fixes both, and has a test to make sure
+        we're not breaking any existing scrollToView code. This means
+        that a <select> popup will appear in the correct place if it
+        is within a transformed and scrolled container.
+
+        Test: fast/transforms/scrollIntoView-transformed.html
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::getUpperLeftCorner):
+        (WebCore::ContainerNode::getLowerRightCorner):
+        - make sure we call localToAbsolute in the right order
+        (after we've done a local move) and pass in the flags to
+        indicate it should look for transforms.
+        * dom/Node.cpp:
+        (WebCore::Node::getRect):
+        - make sure localToAbsolute gets told to look for transforms.
+
 2010-07-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -19871 +19871 @@
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
                         compatibilityVersion = "Xcode 2.4";
+                        developmentRegion = English;
                         hasScannedForEncodings = 1;
                         knownRegions = (

trunk/WebCore/dom/ContainerNode.cpp

@@ -704 +704 @@
 }
 
-// FIXME: This doesn't work correctly with transforms.
 bool ContainerNode::getUpperLeftCorner(FloatPoint& point) const
 {
@@ -714 +713 @@
 
     if (!o->isInline() || o->isReplaced()) {
-        point = o->localToAbsolute();
+        point = o->localToAbsolute(FloatPoint(), false, true);
         return true;
     }
@@ -739 +738 @@
 
         if (!o->isInline() || o->isReplaced()) {
-            point = o->localToAbsolute();
+            point = o->localToAbsolute(FloatPoint(), false, true);
             return true;
         }
@@ -746 +745 @@
                 // do nothing - skip unrendered whitespace that is a child or next sibling of the anchor
         } else if ((o->isText() && !o->isBR()) || o->isReplaced()) {
-            point = o->container()->localToAbsolute();
+            point = FloatPoint();
             if (o->isText() && toRenderText(o)->firstTextBox()) {
                 point.move(toRenderText(o)->linesBoundingBox().x(),
@@ -754 +753 @@
                 point.move(box->x(), box->y());
             }
+            point = o->container()->localToAbsolute(point, false, true);
             return true;
         }
@@ -776 +776 @@
     if (!o->isInline() || o->isReplaced()) {
         RenderBox* box = toRenderBox(o);
-        point = o->localToAbsolute();
+        point = o->localToAbsolute(FloatPoint(), false, true);
         point.move(box->width(), box->height());
         return true;
@@ -799 +799 @@
         ASSERT(o);
         if (o->isText() || o->isReplaced()) {
-            point = o->container()->localToAbsolute();
+            point = FloatPoint();
             if (o->isText()) {
                 RenderText* text = toRenderText(o);
@@ -808 +808 @@
                 point.move(box->x() + box->width(), box->y() + box->height());
             }
+            point = o->container()->localToAbsolute(point, false, true);
             return true;
         }

trunk/WebCore/dom/Node.cpp

@@ -679 +679 @@
 IntRect Node::getRect() const
 {
-    // FIXME: broken with transforms
     if (renderer())
-        return renderer()->absoluteBoundingBoxRect();
+        return renderer()->absoluteBoundingBoxRect(true);
     return IntRect();
 }