Changeset 21649 in webkit

Timestamp:

May 22, 2007 4:21:21 PM (17 years ago)

Author:

adele

Message:

LayoutTests:

Reviewed by Darin.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=13796
Crash in [NSInputContext currentInputContext] when you click on this map

• fast/frames/frame-display-none-focus-expected.txt: Added.
• fast/frames/frame-display-none-focus.html: Added.
• fast/frames/resources/iframe-focus.html: Added.

WebCore:

Reviewed by Darin.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13796
Crash in [NSInputContext currentInputContext] when you click on this map

This is another case of <rdar://problem/5171145> Safari crashed closing tab in NSInputContext updateInputContexts

Test: fast/frames/frame-display-none-focus.html

• WebCore.xcodeproj/project.pbxproj: Added ChromeMac.mm
• page/Chrome.h:
• page/mac/ChromeMac.mm: Added. (WebCore::Chrome::focusNSView): Moved code from Widget::setFocus so it can be used whenever we need to make a view the first responder.
• page/mac/EventHandlerMac.mm: (WebCore::EventHandler::focusDocumentView): Calls focusNSView.
• platform/mac/WidgetMac.mm: (WebCore::Widget::setFocus): Calls focusNSView.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/frame-display-none-focus-expected.txt (added)
• LayoutTests/fast/frames/frame-display-none-focus.html (added)
• LayoutTests/fast/frames/resources/iframe-focus.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/page/Chrome.h (modified) (2 diffs)
• WebCore/page/mac/ChromeMac.mm (added)
• WebCore/page/mac/EventHandlerMac.mm (modified) (1 diff)
• WebCore/platform/mac/WidgetMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-22  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Test for http://bugs.webkit.org/show_bug.cgi?id=13796
+        Crash in [NSInputContext currentInputContext] when you click on this map
+
+        * fast/frames/frame-display-none-focus-expected.txt: Added.
+        * fast/frames/frame-display-none-focus.html: Added.
+        * fast/frames/resources/iframe-focus.html: Added.
+
 2007-05-22  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-22  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13796
+        Crash in [NSInputContext currentInputContext] when you click on this map
+
+        This is another case of <rdar://problem/5171145> Safari crashed closing tab in NSInputContext updateInputContexts
+
+        Test: fast/frames/frame-display-none-focus.html
+
+        * WebCore.xcodeproj/project.pbxproj: Added ChromeMac.mm
+        * page/Chrome.h:
+        * page/mac/ChromeMac.mm: Added.
+        (WebCore::Chrome::focusNSView): Moved code from Widget::setFocus so it can be used whenever we need to make a view the first responder.
+        * page/mac/EventHandlerMac.mm: (WebCore::EventHandler::focusDocumentView): Calls focusNSView.
+        * platform/mac/WidgetMac.mm: (WebCore::Widget::setFocus): Calls focusNSView.
+
 2007-05-22  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2282 +2282 @@
                 AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AB7170880B3118080017123E /* SearchPopupMenu.h */; };
                 AB7170A00B31193B0017123E /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */; };
+                ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */; };
                 ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */; };
                 ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB5419D0ACDDFE4002820EB /* RenderListBox.h */; };
@@ -5390 +5391 @@
                 AB7170880B3118080017123E /* SearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SearchPopupMenu.h; sourceTree = "<group>"; };
                 AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchPopupMenuMac.mm; sourceTree = "<group>"; };
+                ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ChromeMac.mm; sourceTree = "<group>"; };
                 ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderListBox.cpp; sourceTree = "<group>"; };
                 ABB5419D0ACDDFE4002820EB /* RenderListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderListBox.h; sourceTree = "<group>"; };
@@ -8089 +8091 @@
                         isa = PBXGroup;
                         children = (
+                                ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */,
                                 93C09A7E0B064EEF005ABD4D /* EventHandlerMac.mm */,
                                 A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */,
@@ -12734 +12737 @@
                                 BC4918C80BFEA050009D6316 /* JSHTMLIFrameElement.cpp in Sources */,
                                 BC491B780C023EFD009D6316 /* JSHTMLMarqueeElement.cpp in Sources */,
+                                ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/page/Chrome.h

@@ -25 +25 @@
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
+
+#if PLATFORM(MAC)
+#ifndef __OBJC__
+class NSView;
+#endif
+#endif
 
 namespace WebCore {
@@ -98 +104 @@
         void updateBackingStore();
 
+#if PLATFORM(MAC)
+        void focusNSView(NSView*);
+#endif
     private:
         Page* m_page;

trunk/WebCore/page/mac/EventHandlerMac.mm

@@ -151 +151 @@
 void EventHandler::focusDocumentView()
 {
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    if (FrameView* frameView = m_frame->view()) {
-        if (NSView *documentView = frameView->getDocumentView()) {
-            if ([m_frame->bridge() firstResponder] != documentView)
-                [m_frame->bridge() makeFirstResponder:documentView];
-        }
-    }
-    END_BLOCK_OBJC_EXCEPTIONS;
-    if (Page* page = m_frame->page())
-        page->focusController()->setFocusedFrame(m_frame);
+    Page* page = m_frame->page();
+    if (!page)
+        return;
+
+    if (FrameView* frameView = m_frame->view())
+        if (NSView *documentView = frameView->getDocumentView())
+            page->chrome()->focusNSView(documentView);
+    
+    page->focusController()->setFocusedFrame(m_frame);
 }
 

trunk/WebCore/platform/mac/WidgetMac.mm

@@ -33 +33 @@
 #import "Frame.h"
 #import "GraphicsContext.h"
+#import "Page.h"
 #import "PlatformMouseEvent.h"
 #import "WebCoreFrameBridge.h"
@@ -128 +129 @@
  
     NSView *view = [getView() _webcore_effectiveFirstResponder];
-    WebCoreFrameBridge *bridge = frame->bridge();
-    id firstResponder = [bridge firstResponder];
-    if (firstResponder && firstResponder == view)
-        return;
-
-    if (![view window] || ![view superview] || ![view acceptsFirstResponder])
-        return;
-
-    NSResponder *oldFirstResponder = [bridge firstResponder];
-
-    [bridge makeFirstResponder:view];
-
-    // Setting focus can actually cause a style change which might
-    // remove the view from its superview while it's being made
-    // first responder. This confuses AppKit so we must restore
-    // the old first responder.
-    if (![view superview])
-        [bridge makeFirstResponder:oldFirstResponder];
-
+    if (Page* page = frame->page())
+        page->chrome()->focusNSView(view);
+    
     END_BLOCK_OBJC_EXCEPTIONS;
 }