Revert WebKit 48257 on the 249 branch....

WebCore/page/FocusController.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 38 matching lines @@
 #include "RenderWidget.h"
 #include "SelectionController.h"
 #include "Settings.h"
 #include "Widget.h"
 #include <wtf/Platform.h>
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
-static inline void dispatchEventsOnWindowAndFocusedNode(Document* document, bool focused)
-{
-    // If we have a focused node we should dispatch blur on it before we blur the window.
-    // If we have a focused node we should dispatch focus on it after we focus the window.
-    // https://bugs.webkit.org/show_bug.cgi?id=27105
-    if (!focused && document->focusedNode())
-        document->focusedNode()->dispatchBlurEvent();
-    document->dispatchWindowEvent(Event::create(focused ? eventNames().focusEvent : eventNames().blurEvent, false, false));
-    if (focused && document->focusedNode())
-        document->focusedNode()->dispatchFocusEvent();
-}
-
 FocusController::FocusController(Page* page)
     : m_page(page)
     , m_isActive(false)
     , m_isFocused(false)
 {
 }
 
 void FocusController::setFocusedFrame(PassRefPtr<Frame> frame)
 {
     if (m_focusedFrame == frame)
@@ skipping 25 matching lines @@
 
 void FocusController::setFocused(bool focused)
 {
     if (isFocused() == focused)
         return;
     
     m_isFocused = focused;
     
     if (m_focusedFrame && m_focusedFrame->view()) {
         m_focusedFrame->selection()->setFocused(focused);
-        dispatchEventsOnWindowAndFocusedNode(m_focusedFrame->document(), focused);
+        m_focusedFrame->document()->dispatchWindowEvent(focused ? eventNames().focusEvent : eventNames().blurEvent, false, false);
     }
 }
 
 static Node* deepFocusableNode(FocusDirection direction, Node* node, KeyboardEvent* event)
 {
     // The node we found might be a HTMLFrameOwnerElement, so descend down the frame tree until we find either:
     // 1) a focusable node, or
     // 2) the deepest-nested HTMLFrameOwnerElement
     while (node && node->isFrameOwnerElement()) {
         HTMLFrameOwnerElement* owner = static_cast<HTMLFrameOwnerElement*>(node);
@@ skipping 222 matching lines @@
     if (FrameView* view = m_page->mainFrame()->view()) {
         if (!view->platformWidget()) {
             view->layoutIfNeededRecursive();
             view->updateControlTints();
         }
     }
 
     focusedOrMainFrame()->selection()->pageActivationChanged();
     
     if (m_focusedFrame && isFocused())
-        dispatchEventsOnWindowAndFocusedNode(m_focusedFrame->document(), active);
+        m_focusedFrame->document()->dispatchWindowEvent(active ? eventNames().focusEvent : eventNames().blurEvent, false, false);
 }
 
 } // namespace WebCore