Title: [128644] trunk
- Revision
- 128644
- Author
- [email protected]
- Date
- 2012-09-14 13:01:36 -0700 (Fri, 14 Sep 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=96226
REGRESSION (r128006): Three spatial navigation tests are failing
Reviewed by Ryosuke Niwa.
Source/WebCore:
Fix spatial navigation regression by reverting parts of r128006.
Specifically the change to remove the overridden boundingBox
method in ContainerNode.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getUpperLeftCorner):
(WebCore):
(WebCore::ContainerNode::getLowerRightCorner):
(WebCore::ContainerNode::boundingBox):
* dom/ContainerNode.h:
(ContainerNode):
LayoutTests:
Remove spatial navigation tests from Skipped list.
* platform/mac/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (128643 => 128644)
--- trunk/LayoutTests/ChangeLog 2012-09-14 20:00:58 UTC (rev 128643)
+++ trunk/LayoutTests/ChangeLog 2012-09-14 20:01:36 UTC (rev 128644)
@@ -1,3 +1,14 @@
+2012-09-14 Emil A Eklund <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=96226
+ REGRESSION (r128006): Three spatial navigation tests are failing
+
+ Reviewed by Ryosuke Niwa.
+
+ Remove spatial navigation tests from Skipped list.
+
+ * platform/mac/Skipped:
+
2012-09-14 James Robinson <[email protected]>
Unreviewed, rolling out r128627.
Modified: trunk/LayoutTests/platform/mac/Skipped (128643 => 128644)
--- trunk/LayoutTests/platform/mac/Skipped 2012-09-14 20:00:58 UTC (rev 128643)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-09-14 20:01:36 UTC (rev 128644)
@@ -1010,12 +1010,6 @@
# ASSERTION FAILED: m_wrapper || !m_jsFunction
svg/custom/use-instanceRoot-as-event-target.xhtml
-# https://bugs.webkit.org/show_bug.cgi?id=96226
-# REGRESSION (r128006): Three spatial navigation tests are failing
-fast/spatial-navigation/snav-container-white-space.html
-fast/spatial-navigation/snav-div-overflow-scrol-hidden.html
-fast/spatial-navigation/snav-imagemap-overlapped-areas.html
-
# Assorted failures that need investigation
# --- Canvas ---
Modified: trunk/Source/WebCore/ChangeLog (128643 => 128644)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 20:00:58 UTC (rev 128643)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 20:01:36 UTC (rev 128644)
@@ -1,3 +1,22 @@
+2012-09-14 Emil A Eklund <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=96226
+ REGRESSION (r128006): Three spatial navigation tests are failing
+
+ Reviewed by Ryosuke Niwa.
+
+ Fix spatial navigation regression by reverting parts of r128006.
+ Specifically the change to remove the overridden boundingBox
+ method in ContainerNode.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getUpperLeftCorner):
+ (WebCore):
+ (WebCore::ContainerNode::getLowerRightCorner):
+ (WebCore::ContainerNode::boundingBox):
+ * dom/ContainerNode.h:
+ (ContainerNode):
+
2012-09-14 James Robinson <[email protected]>
Unreviewed, rolling out r128627.
Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (128643 => 128644)
--- trunk/Source/WebCore/dom/ContainerNode.cpp 2012-09-14 20:00:58 UTC (rev 128643)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2012-09-14 20:01:36 UTC (rev 128644)
@@ -726,6 +726,134 @@
}
}
+bool ContainerNode::getUpperLeftCorner(FloatPoint& point) const
+{
+ if (!renderer())
+ return false;
+ // What is this code really trying to do?
+ RenderObject* o = renderer();
+ RenderObject* p = o;
+
+ if (!o->isInline() || o->isReplaced()) {
+ point = o->localToAbsolute(FloatPoint(), false, true);
+ return true;
+ }
+
+ // find the next text/image child, to get a position
+ while (o) {
+ p = o;
+ if (o->firstChild())
+ o = o->firstChild();
+ else if (o->nextSibling())
+ o = o->nextSibling();
+ else {
+ RenderObject* next = 0;
+ while (!next && o->parent()) {
+ o = o->parent();
+ next = o->nextSibling();
+ }
+ o = next;
+
+ if (!o)
+ break;
+ }
+ ASSERT(o);
+
+ if (!o->isInline() || o->isReplaced()) {
+ point = o->localToAbsolute(FloatPoint(), false, true);
+ return true;
+ }
+
+ if (p->node() && p->node() == this && o->isText() && !o->isBR() && !toRenderText(o)->firstTextBox()) {
+ // do nothing - skip unrendered whitespace that is a child or next sibling of the anchor
+ } else if ((o->isText() && !o->isBR()) || o->isReplaced()) {
+ point = FloatPoint();
+ if (o->isText() && toRenderText(o)->firstTextBox()) {
+ point.move(toRenderText(o)->linesBoundingBox().x(), toRenderText(o)->firstTextBox()->root()->lineTop());
+ } else if (o->isBox()) {
+ RenderBox* box = toRenderBox(o);
+ point.moveBy(box->location());
+ }
+ point = o->container()->localToAbsolute(point, false, true);
+ return true;
+ }
+ }
+
+ // If the target doesn't have any children or siblings that could be used to calculate the scroll position, we must be
+ // at the end of the document. Scroll to the bottom. FIXME: who said anything about scrolling?
+ if (!o && document()->view()) {
+ point = FloatPoint(0, document()->view()->contentsHeight());
+ return true;
+ }
+ return false;
+}
+
+bool ContainerNode::getLowerRightCorner(FloatPoint& point) const
+{
+ if (!renderer())
+ return false;
+
+ RenderObject* o = renderer();
+ if (!o->isInline() || o->isReplaced()) {
+ RenderBox* box = toRenderBox(o);
+ point = o->localToAbsolute(LayoutPoint(box->size()), false, true);
+ return true;
+ }
+
+ // find the last text/image child, to get a position
+ while (o) {
+ if (o->lastChild())
+ o = o->lastChild();
+ else if (o->previousSibling())
+ o = o->previousSibling();
+ else {
+ RenderObject* prev = 0;
+ while (!prev) {
+ o = o->parent();
+ if (!o)
+ return false;
+ prev = o->previousSibling();
+ }
+ o = prev;
+ }
+ ASSERT(o);
+ if (o->isText() || o->isReplaced()) {
+ point = FloatPoint();
+ if (o->isText()) {
+ RenderText* text = toRenderText(o);
+ IntRect linesBox = text->linesBoundingBox();
+ if (!linesBox.maxX() && !linesBox.maxY())
+ continue;
+ point.moveBy(linesBox.maxXMaxYCorner());
+ } else {
+ RenderBox* box = toRenderBox(o);
+ point.moveBy(box->frameRect().maxXMaxYCorner());
+ }
+ point = o->container()->localToAbsolute(point, false, true);
+ return true;
+ }
+ }
+ return true;
+}
+
+LayoutRect ContainerNode::boundingBox() const
+{
+ FloatPoint upperLeft, lowerRight;
+ bool foundUpperLeft = getUpperLeftCorner(upperLeft);
+ bool foundLowerRight = getLowerRightCorner(lowerRight);
+
+ // If we've found one corner, but not the other,
+ // then we should just return a point at the corner that we did find.
+ if (foundUpperLeft != foundLowerRight) {
+ if (foundUpperLeft)
+ lowerRight = upperLeft;
+ else
+ upperLeft = lowerRight;
+ }
+
+ return enclosingLayoutRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
+}
+
void ContainerNode::setFocus(bool received)
{
if (focused() == received)
Modified: trunk/Source/WebCore/dom/ContainerNode.h (128643 => 128644)
--- trunk/Source/WebCore/dom/ContainerNode.h 2012-09-14 20:00:58 UTC (rev 128643)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2012-09-14 20:01:36 UTC (rev 128644)
@@ -75,6 +75,7 @@
virtual void attach() OVERRIDE;
virtual void detach() OVERRIDE;
+ virtual LayoutRect boundingBox() const OVERRIDE;
virtual void setFocus(bool = true) OVERRIDE;
virtual void setActive(bool active = true, bool pause = false) OVERRIDE;
virtual void setHovered(bool = true) OVERRIDE;
@@ -131,6 +132,9 @@
static void dispatchPostAttachCallbacks();
+ bool getUpperLeftCorner(FloatPoint&) const;
+ bool getLowerRightCorner(FloatPoint&) const;
+
Node* m_firstChild;
Node* m_lastChild;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
