Changeset 147701 in webkit

Timestamp:

Apr 4, 2013 8:46:22 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] DOMSupport::isFixedPositionOrHasFixedPositionAncestor stops traversing render tree when it hits an iframe element
​https://bugs.webkit.org/show_bug.cgi?id=113944

Patch by Andrew Lo <​anlo@rim.com> on 2013-04-04
Reviewed by Rob Buis.
Internally reviewed by Mike Fenton.

Internal PR 320732.
When checking whether a RenderObject is fixed position or has a fixed position
ancestor, we traverse the render tree upwards.

When we reach the root of the tree, check whether the root is an
iframe and has an element owner. If so, we also need to continue iterating
up the tree from the owner to see if the iframe is a descendant of a fixed
position element.

• WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::isFixedPositionOrHasFixedPositionAncestor):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/DOMSupport.cpp (modified) (2 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-04  Andrew Lo  <anlo@rim.com>
+
+        [BlackBerry] DOMSupport::isFixedPositionOrHasFixedPositionAncestor stops traversing render tree when it hits an iframe element
+        https://bugs.webkit.org/show_bug.cgi?id=113944
+
+        Reviewed by Rob Buis.
+        Internally reviewed by Mike Fenton.
+
+        Internal PR 320732.
+        When checking whether a RenderObject is fixed position or has a fixed position
+        ancestor, we traverse the render tree upwards.
+
+        When we reach the root of the tree, check whether the root is an
+        iframe and has an element owner. If so, we also need to continue iterating
+        up the tree from the owner to see if the iframe is a descendant of a fixed
+        position element.
+
+        * WebKitSupport/DOMSupport.cpp:
+        (BlackBerry::WebKit::DOMSupport::isFixedPositionOrHasFixedPositionAncestor):
+
 2013-04-04  Tiancheng Jiang  <tijiang@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp

@@ -24 +24 @@
 #include "FrameView.h"
 #include "HTMLFormElement.h"
+#include "HTMLFrameOwnerElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -597 +598 @@
             return true;
 
+        // Check if the current frame is an iframe. If so, continue checking with the iframe's owner element.
+        if (!currentRenderer->parent() && currentRenderer->isRenderView() && currentRenderer->frame() && currentRenderer->frame()->ownerElement()) {
+            currentRenderer = currentRenderer->frame()->ownerElement()->renderer();
+            continue;
+        }
+
         currentRenderer = currentRenderer->parent();
     }