Changeset 95940 in webkit

Timestamp:

Sep 26, 2011 5:06:02 AM (13 years ago)

Author:

kov@webkit.org

Message:

REGRESSION: Empathy crashes when switching theme
​https://bugs.webkit.org/show_bug.cgi?id=68600

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2011-09-26
Reviewed by Martin Robinson.

• webkit/webkitwebview.cpp:

(webkit_web_view_set_scroll_adjustments): use the existing
set{Horizontal,Vertical}Adjustment functions, so the code is not
duplicated
(webkit_web_view_dispose): unset the adjustments during dispose,
to avoid late adjustment change notifications hitting the
adjustment watcher

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (4 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-09-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
+        REGRESSION: Empathy crashes when switching theme
+        https://bugs.webkit.org/show_bug.cgi?id=68600
+
+        Reviewed by Martin Robinson.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_set_scroll_adjustments): use the existing
+        set{Horizontal,Vertical}Adjustment functions, so the code is not
+        duplicated
+        (webkit_web_view_dispose): unset the adjustments during dispose,
+        to avoid late adjustment change notifications hitting the
+        adjustment watcher
+
 2011-09-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -428 +428 @@
 }
 
-#ifndef GTK_API_VERSION_2
 static void setHorizontalAdjustment(WebKitWebView* webView, GtkAdjustment* adjustment)
 {
@@ -445 +444 @@
 }
 
+#ifndef GTK_API_VERSION_2
 static GtkAdjustment* getHorizontalAdjustment(WebKitWebView* webView)
 {
@@ -1040 +1040 @@
 static void webkit_web_view_set_scroll_adjustments(WebKitWebView* webView, GtkAdjustment* horizontalAdjustment, GtkAdjustment* verticalAdjustment)
 {
-    // This may be called after the page has been destroyed, in which case we do nothing.
-    Page* page = core(webView);
-    if (!page)
-        return;
-
-    WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
-    client->adjustmentWatcher()->setHorizontalAdjustment(horizontalAdjustment);
-    client->adjustmentWatcher()->setVerticalAdjustment(verticalAdjustment);
+    setHorizontalAdjustment(webView, horizontalAdjustment);
+    setVerticalAdjustment(webView, verticalAdjustment);
 }
 #endif
@@ -1307 +1301 @@
 
     priv->disposing = TRUE;
+
+    // Make sure GtkAdjustmentWatcher won't be reacting to adjustment changes after the
+    // WebView is destroyed.
+    setHorizontalAdjustment(webView, 0);
+    setVerticalAdjustment(webView, 0);
 
     // These smart pointers are cleared manually, because some cleanup operations are