Changeset 54082 in webkit

Timestamp:

Jan 29, 2010 3:39:41 PM (14 years ago)

Author:

victorw@chromium.org

Message:

 

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/change-frame-focus-expected.txt (added)
• LayoutTests/fast/events/change-frame-focus.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (4 diffs)
• WebCore/page/FocusController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-29  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by darin@apple.com.
+
+        Fix the issue that both main frome and iframe are
+        focused if window.onblur calls window.focus.
+        https://bugs.webkit.org/show_bug.cgi?id=31692
+
+        The problem is caused by the focused frame in FocusController
+        is messed up if window.onblur calls window.focus:
+        When user clicks iframe to switch focus from main frame to iframe,
+        FocusController::setFocusedFrame fires onblur event, which calls
+        window.focus and then calls setFocusedFrame again to switch back.
+        This messes up the old focused frame and new focused frame and
+        leaves the FocusController confused. As a result, controlls
+        in both main frame and iframe look like get focused.
+
+        To fix it, add a flag to FocusController and do no switch the focused
+        frame when FocusController is in the middle of changing the focused frame. 
+
+        * fast/events/change-frame-focus-expected.txt: Added.
+        * fast/events/change-frame-focus.html: Added.
+
 2010-01-28  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by darin@apple.com.
+
+        Fix the issue that both main frome and iframe are
+        focused if window.onblur calls window.focus.
+        https://bugs.webkit.org/show_bug.cgi?id=31692
+
+        The problem is caused by the focused frame in FocusController
+        is messed up if window.onblur calls window.focus:
+        When user clicks iframe to switch focus from main frame to iframe,
+        FocusController::setFocusedFrame fires onblur event, which calls
+        window.focus and then calls setFocusedFrame again to switch back.
+        This messes up the old focused frame and new focused frame and
+        leaves the FocusController confused. As a result, controlls
+        in both main frame and iframe look like get focused.
+
+        To fix it, add a flag to FocusController and do no switch the focused
+        frame when FocusController is in the middle of changing the focused frame. 
+
+        Test: fast/events/change-frame-focus.html
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::FocusController):
+        (WebCore::FocusController::setFocusedFrame):
+        * page/FocusController.h:
+        (WebCore::FocusController::focusedFrame):
+        (WebCore::FocusController::isActive):
+        (WebCore::FocusController::isFocused):
+
 2010-01-29  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -39 +39 @@
 #include "ExceptionCode.h"
 #include "Frame.h"
+#include "FrameTree.h"
 #include "FrameView.h"
-#include "FrameTree.h"
 #include "HTMLFrameOwnerElement.h"
 #include "HTMLNames.h"
@@ -73 +73 @@
     , m_isActive(false)
     , m_isFocused(false)
+    , m_isChangingFocusedFrame(false)
 {
 }
@@ -78 +79 @@
 void FocusController::setFocusedFrame(PassRefPtr<Frame> frame)
 {
-    if (m_focusedFrame == frame)
-        return;
+    if (m_focusedFrame == frame || m_isChangingFocusedFrame)
+        return;
+
+    m_isChangingFocusedFrame = true;
 
     RefPtr<Frame> oldFrame = m_focusedFrame;
@@ -96 +99 @@
         newFrame->document()->dispatchWindowEvent(Event::create(eventNames().focusEvent, false, false));
     }
+
+    m_isChangingFocusedFrame = false;
 }
 

trunk/WebCore/page/FocusController.h

@@ -34 +34 @@
 namespace WebCore {
 
-    class Frame;
-    class KeyboardEvent;
-    class Node;
-    class Page;
+class Frame;
+class KeyboardEvent;
+class Node;
+class Page;
 
-    class FocusController : public Noncopyable {
-    public:
-        FocusController(Page*);
+class FocusController : public Noncopyable {
+public:
+    FocusController(Page*);
 
-        void setFocusedFrame(PassRefPtr<Frame>);
-        Frame* focusedFrame() const { return m_focusedFrame.get(); }
-        Frame* focusedOrMainFrame();
+    void setFocusedFrame(PassRefPtr<Frame>);
+    Frame* focusedFrame() const { return m_focusedFrame.get(); }
+    Frame* focusedOrMainFrame();
 
-        bool setInitialFocus(FocusDirection, KeyboardEvent*);
-        bool advanceFocus(FocusDirection, KeyboardEvent*, bool initialFocus = false);
+    bool setInitialFocus(FocusDirection, KeyboardEvent*);
+    bool advanceFocus(FocusDirection, KeyboardEvent*, bool initialFocus = false);
         
-        bool setFocusedNode(Node*, PassRefPtr<Frame>);
+    bool setFocusedNode(Node*, PassRefPtr<Frame>);
 
-        void setActive(bool);
-        bool isActive() const { return m_isActive; }
+    void setActive(bool);
+    bool isActive() const { return m_isActive; }
 
-        void setFocused(bool);
-        bool isFocused() const { return m_isFocused; }
+    void setFocused(bool);
+    bool isFocused() const { return m_isFocused; }
 
-    private:
-        Page* m_page;
-        RefPtr<Frame> m_focusedFrame;
-        bool m_isActive;
-        bool m_isFocused;
-    };
+private:
+    Page* m_page;
+    RefPtr<Frame> m_focusedFrame;
+    bool m_isActive;
+    bool m_isFocused;
+    bool m_isChangingFocusedFrame;
+};
 
 } // namespace WebCore