Changeset 74003 in webkit

Timestamp:

Dec 13, 2010 10:51:41 PM (13 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-12-13 Antonio Gomes <​agomes@rim.com>

Reviewed by Daniel Bates.

Spatial Navigation: code clean up (part III)
​https://bugs.webkit.org/show_bug.cgi?id=50666

No new tests needed.

• page/SpatialNavigation.h: Added FocusCandidate::isFrameOwnerElement and WebCore::frameOwnerElement helper functions. (WebCore::FocusCandidate::isFrameOwnerElement): Returns true if the Node pointer wrapped by FocusCandidate is an instance of HTMLFrameOwnerElement. Returns false otherwise.
• page/SpatialNavigation.cpp: (WebCore::frameOwnerElement): Returns the HTMLFrameOwnerElement associated with the FocusCandidate if appropriate.
• page/FocusController.cpp: (WebCore::updateFocusCandidateIfNeeded): Make use of newly added frameOwnerElement() helper. (WebCore::FocusController::adva

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (3 diffs)
• page/SpatialNavigation.cpp (modified) (2 diffs)
• page/SpatialNavigation.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Antonio Gomes  <agomes@rim.com>
+
+        Reviewed by Daniel Bates.
+
+        Spatial Navigation: code clean up (part III)
+        https://bugs.webkit.org/show_bug.cgi?id=50666
+
+        No new tests needed.
+
+        * page/SpatialNavigation.h: Added FocusCandidate::isFrameOwnerElement and
+        WebCore::frameOwnerElement helper functions.
+        (WebCore::FocusCandidate::isFrameOwnerElement): Returns true if the Node pointer
+        wrapped by FocusCandidate is an instance of HTMLFrameOwnerElement. Returns false
+        otherwise.
+        * page/SpatialNavigation.cpp:
+        (WebCore::frameOwnerElement): Returns the HTMLFrameOwnerElement associated with
+        the FocusCandidate if appropriate.
+        * page/FocusController.cpp:
+        (WebCore::updateFocusCandidateIfNeeded): Make use of newly added frameOwnerElement() helper.
+        (WebCore::FocusController::advanceFocusDirectionallyInContainer): Ditto.
+
 2010-12-13  Mike Lawther  <mikelawther@chromium.org>
 

trunk/WebCore/page/FocusController.cpp

@@ -42 +42 @@
 #include "FrameView.h"
 #include "HTMLAreaElement.h"
-#include "HTMLFrameOwnerElement.h"
 #include "HTMLImageElement.h"
 #include "HTMLNames.h"
@@ -420 +419 @@
 
     // Ignore iframes that don't have a src attribute
-    if (candidate.visibleNode->isFrameOwnerElement() && (!static_cast<HTMLFrameOwnerElement*>(candidate.visibleNode)->contentFrame() || candidate.rect.isEmpty()))
+    if (frameOwnerElement(candidate) && (!frameOwnerElement(candidate)->contentFrame() || candidate.rect.isEmpty()))
         return;
 
@@ -510 +509 @@
         return false;
     }
-    if (focusCandidate.visibleNode->isFrameOwnerElement()) {
-        HTMLFrameOwnerElement* frameElement = static_cast<HTMLFrameOwnerElement*>(focusCandidate.visibleNode);
+
+    if (HTMLFrameOwnerElement* frameElement = frameOwnerElement(focusCandidate)) {
         // If we have an iframe without the src attribute, it will not have a contentFrame().
         // We ASSERT here to make sure that

trunk/WebCore/page/SpatialNavigation.cpp

@@ -34 +34 @@
 #include "FrameView.h"
 #include "HTMLAreaElement.h"
-#include "HTMLFrameOwnerElement.h"
 #include "HTMLImageElement.h"
 #include "HTMLMapElement.h"
@@ -703 +702 @@
 }
 
+HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
+{
+    return candidate.isFrameOwnerElement() ? static_cast<HTMLFrameOwnerElement*>(candidate.visibleNode) : 0;
+};
 
 } // namespace WebCore

trunk/WebCore/page/SpatialNavigation.h

@@ -23 +23 @@
 
 #include "FocusDirection.h"
+#include "HTMLFrameOwnerElement.h"
 #include "IntRect.h"
 #include "Node.h"
@@ -117 +118 @@
     bool isNull() const { return !visibleNode; }
     bool inScrollableContainer() const { return visibleNode && enclosingScrollableBox; }
+    bool isFrameOwnerElement() const { return visibleNode && visibleNode->isFrameOwnerElement(); }
     Document* document() const { return visibleNode ? visibleNode->document() : 0; }
 
@@ -146 +148 @@
 IntRect virtualRectForDirection(FocusDirection, const IntRect& startingRect, int width = 0);
 IntRect virtualRectForAreaElementAndDirection(FocusDirection, HTMLAreaElement*);
+HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate&);
+
 } // namspace WebCore