Title: [147701] trunk/Source/WebKit/blackberry
- Revision
- 147701
- Author
- [email protected]
- Date
- 2013-04-04 20:46:22 -0700 (Thu, 04 Apr 2013)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147700 => 147701)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-05 02:52:06 UTC (rev 147700)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-05 03:46:22 UTC (rev 147701)
@@ -1,3 +1,23 @@
+2013-04-04 Andrew Lo <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Adjust fatfinger result priority
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (147700 => 147701)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2013-04-05 02:52:06 UTC (rev 147700)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2013-04-05 03:46:22 UTC (rev 147701)
@@ -23,6 +23,7 @@
#include "Frame.h"
#include "FrameView.h"
#include "HTMLFormElement.h"
+#include "HTMLFrameOwnerElement.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "HTMLTextAreaElement.h"
@@ -596,6 +597,12 @@
if (currentRenderer->isOutOfFlowPositioned() && currentRenderer->style()->position() == FixedPosition)
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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
