Changeset 84793 in webkit

Timestamp:

Apr 25, 2011 1:00:50 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-04-25 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Crash in WebCore::FrameView::notifyPageThatContentAreaWillPaint()
​https://bugs.webkit.org/show_bug.cgi?id=59311

• platform/gtk/MainFrameScrollbarGtk.cpp: (MainFrameScrollbarGtk::attachAdjustment): Before connecting an adjustment to a scrollbar disconnect any lingering signal handlers. This prevents an adjustment from controlling the active ScrollView and some zombie ScrollView.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/MainFrameScrollbarGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Crash in WebCore::FrameView::notifyPageThatContentAreaWillPaint()
+        https://bugs.webkit.org/show_bug.cgi?id=59311
+
+        * platform/gtk/MainFrameScrollbarGtk.cpp:
+        (MainFrameScrollbarGtk::attachAdjustment): Before connecting an adjustment to a scrollbar
+        disconnect any lingering signal handlers. This prevents an adjustment from controlling the
+        active ScrollView and some zombie ScrollView.
+
 2011-04-25  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/platform/gtk/MainFrameScrollbarGtk.cpp

@@ -70 +70 @@
         return;
 
+    // In some cases this adjustment may still be attached to a living MainFrameScrollbar.
+    // If that's the case we want to force a disconnection now, before we modify the values.
+    g_signal_handlers_disconnect_matched(m_adjustment.get(), G_SIGNAL_MATCH_FUNC, 0, 0, 0,
+                                         reinterpret_cast<void*>(MainFrameScrollbarGtk::gtkValueChanged), 0);
+
     updateThumbProportion();
     updateThumbPosition();