Merge lp:~dobey/ubuntu/oneiric/webkit/scroll-crasher-fix into lp:ubuntu/oneiric/webkit

[dobey]

[Adam Conrad (adconrad)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-09 15:43:11 +0000
+++ debian/changelog	2011-09-29 19:02:19 +0000
@@ -1,3 +1,10 @@
+webkit (1.4.3-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/10_cherrypick_r95940.patch:
+    - Avoid crashing on scrollbar unparent/reparent (LP: #851044)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 29 Sep 2011 14:54:29 -0400
+
 webkit (1.4.3-0ubuntu2) oneiric; urgency=low
 
   * debian/rules: armel library has a ton of extra uninteresting

=== added file 'debian/patches/10_cherrypick_r95940.patch'
--- debian/patches/10_cherrypick_r95940.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10_cherrypick_r95940.patch	2011-09-29 19:02:19 +0000
@@ -0,0 +1,41 @@
+Index: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
+===================================================================
+--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	(revision 95271)
++++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	(revision 95940)
+@@ -428,5 +428,4 @@
+ }
+ 
+-#ifndef GTK_API_VERSION_2
+ static void setHorizontalAdjustment(WebKitWebView* webView, GtkAdjustment* adjustment)
+ {
+@@ -445,4 +444,5 @@
+ }
+ 
++#ifndef GTK_API_VERSION_2
+ static GtkAdjustment* getHorizontalAdjustment(WebKitWebView* webView)
+ {
+@@ -1040,12 +1040,6 @@
+ 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,4 +1301,9 @@
+ 
+     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

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-11 17:25:15 +0000
+++ debian/patches/series	2011-09-29 19:02:19 +0000
@@ -1,1 +1,2 @@
 03_g_const_return.patch
+10_cherrypick_r95940.patch