Changeset 95673 in webkit

Timestamp:

Sep 21, 2011 3:20:04 PM (13 years ago)

Author:

andersca@apple.com

Message:

Remove Widget::beforeMouseDown and Widget::afterMouseDown
​https://bugs.webkit.org/show_bug.cgi?id=68570

Reviewed by Sam Weinig.

These two member functions were originally added to avoid crashes due to removing NSViews while they were
being tracked by AppKit. Since they were added, we've moved away from NSViews for form controls, and the bugs in
AppKit that lead to crashes have been fixed.

• page/mac/EventHandlerMac.mm:

(WebCore::EventHandler::passMouseDownEventToWidget):

• platform/Widget.h:
• platform/mac/WidgetMac.mm:

(WebCore::Widget::Widget):
(WebCore::Widget::removeFromSuperview):

• rendering/RenderWidget.cpp:

Change widgetHierarchyUpdateSuspendCount to be an unsigned integer instead of a size_t.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (1 diff)
• platform/Widget.h (modified) (1 diff)
• platform/mac/WidgetMac.mm (modified) (3 diffs)
• rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-21  Anders Carlsson  <andersca@apple.com>
+
+        Remove Widget::beforeMouseDown and Widget::afterMouseDown
+        https://bugs.webkit.org/show_bug.cgi?id=68570
+
+        Reviewed by Sam Weinig.
+
+        These two member functions were originally added to avoid crashes due to removing NSViews while they were
+        being tracked by AppKit. Since they were added, we've moved away from NSViews for form controls, and the bugs in
+        AppKit that lead to crashes have been fixed.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::passMouseDownEventToWidget):
+        * platform/Widget.h:
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::Widget):
+        (WebCore::Widget::removeFromSuperview):
+
+        * rendering/RenderWidget.cpp:
+        Change widgetHierarchyUpdateSuspendCount to be an unsigned integer instead of a size_t.
+
 2011-09-21  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -237 +237 @@
     ASSERT(!m_sendingEventToSubview);
     m_sendingEventToSubview = true;
-    NSView *outerView = widget->getOuterView();
-    widget->beforeMouseDown(outerView, widget.get());
+
     [view mouseDown:currentNSEvent()];
-    widget->afterMouseDown(outerView, widget.get());
-    m_sendingEventToSubview = false;
     
     if (!wasDeferringLoading)

trunk/Source/WebCore/platform/Widget.h

@@ -210 +210 @@
     NSView* getOuterView() const;
 
-    static void beforeMouseDown(NSView*, Widget*);
-    static void afterMouseDown(NSView*, Widget*);
-
     void removeFromSuperview();
 #endif

trunk/Source/WebCore/platform/mac/WidgetMac.mm

@@ -67 +67 @@
     }
 
-    bool mustStayInWindow;
-    bool removeFromSuperviewSoon;
     NSRect previousVisibleRect;
 };
@@ -92 +90 @@
 {
     init(view);
-    m_data->mustStayInWindow = false;
-    m_data->removeFromSuperviewSoon = false;
 }
 
@@ -325 +321 @@
 void Widget::removeFromSuperview()
 {
-    if (m_data->mustStayInWindow)
-        m_data->removeFromSuperviewSoon = true;
-    else {
-        m_data->removeFromSuperviewSoon = false;
-        BEGIN_BLOCK_OBJC_EXCEPTIONS;
-        safeRemoveFromSuperview(getOuterView());
-        END_BLOCK_OBJC_EXCEPTIONS;
-    }
-}
-
-void Widget::beforeMouseDown(NSView *unusedView, Widget* widget)
-{
-    if (widget) {
-        ASSERT_UNUSED(unusedView, unusedView == widget->getOuterView());
-        ASSERT(!widget->m_data->mustStayInWindow);
-        widget->m_data->mustStayInWindow = true;
-    }
-}
-
-void Widget::afterMouseDown(NSView *view, Widget* widget)
-{
-    if (!widget) {
-        BEGIN_BLOCK_OBJC_EXCEPTIONS;
-        safeRemoveFromSuperview(view);
-        END_BLOCK_OBJC_EXCEPTIONS;
-    } else {
-        ASSERT(widget->m_data->mustStayInWindow);
-        widget->m_data->mustStayInWindow = false;
-        if (widget->m_data->removeFromSuperviewSoon)
-            widget->removeFromSuperview();
-    }
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    safeRemoveFromSuperview(getOuterView());
+    END_BLOCK_OBJC_EXCEPTIONS;
 }
 

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -48 +48 @@
 }
 
-static size_t widgetHierarchyUpdateSuspendCount;
+static unsigned widgetHierarchyUpdateSuspendCount;
 
 typedef HashMap<RefPtr<Widget>, FrameView*> WidgetToParentMap;