Commit 7f31e453 authored by vicki's avatar vicki
Browse files

Reviewed by Dave Hyatt.

	- fixed <rdar://problem/4255274> REGRESSION: in some cases, link jumping to images is broken (4964)

        * khtml/xml/dom_nodeimpl.cpp:
        (DOM::ContainerNodeImpl::getUpperLeftCorner):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@10534 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b445dea7
2005-09-14 Vicki Murley <vicki@apple.com>
Reviewed by Dave Hyatt.
- fixed <rdar://problem/4255274> REGRESSION: in some cases, link jumping to images is broken (4964)
* khtml/xml/dom_nodeimpl.cpp:
(DOM::ContainerNodeImpl::getUpperLeftCorner):
2005-09-14 Darin Adler <darin@apple.com>
Reviewed by John.
......
......@@ -2235,6 +2235,8 @@ bool ContainerNodeImpl::getUpperLeftCorner(int &xPos, int &yPos) const
else if(o->nextSibling())
o = o->nextSibling();
else {
// FIXME: If the element we're scrolling to doesn't have a child or next sibling and none of the nodes on
// the parent chain have siblings, then this loop returns false prematurely - 4256060
RenderObject *next = 0;
while(!next) {
o = o->parent();
......@@ -2243,7 +2245,7 @@ bool ContainerNodeImpl::getUpperLeftCorner(int &xPos, int &yPos) const
}
o = next;
}
if (o->parent()->element() == this && !static_cast<RenderText*>(o)->firstTextBox() ) {
if (o->parent()->element() == this && o->isText() && !o->isBR() && !static_cast<RenderText*>(o)->firstTextBox()) {
// do nothing - skip child node of the named anchor if it doesn't have a text box rdar://problems/4233844&4246096
}
else if((o->isText() && !o->isBR()) || o->isReplaced()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment