Ubuntu
webkit package

Merge lp:~ubuntu-branches/ubuntu/oneiric/webkit/oneiric-201109292316 into lp:ubuntu/oneiric/webkit

  1. Oneiric (11.10)
  2. oneiric-201109292316
  3. Merge into oneiric
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/webkit/oneiric-201109292316
Merge into: lp:ubuntu/oneiric/webkit
Diff against target: 47 lines (+41/-0) (has conflicts)
1 file modified
debian/patches/10_cherrypick_r95940.patch (+41/-0)
Conflict adding file debian/patches/10_cherrypick_r95940.patch.  Moved existing file to debian/patches/10_cherrypick_r95940.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/webkit/oneiric-201109292316
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+77623@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/webkit reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/webkit/oneiric-201109292316. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

42. By Adam Conrad

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/10_cherrypick_r95940.patch'
2--- debian/patches/10_cherrypick_r95940.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/10_cherrypick_r95940.patch 2011-09-29 23:21:28 +0000
4@@ -0,0 +1,41 @@
5+Index: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
6+===================================================================
7+--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 95271)
8++++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 95940)
9+@@ -428,5 +428,4 @@
10+ }
11+
12+-#ifndef GTK_API_VERSION_2
13+ static void setHorizontalAdjustment(WebKitWebView* webView, GtkAdjustment* adjustment)
14+ {
15+@@ -445,4 +444,5 @@
16+ }
17+
18++#ifndef GTK_API_VERSION_2
19+ static GtkAdjustment* getHorizontalAdjustment(WebKitWebView* webView)
20+ {
21+@@ -1040,12 +1040,6 @@
22+ static void webkit_web_view_set_scroll_adjustments(WebKitWebView* webView, GtkAdjustment* horizontalAdjustment, GtkAdjustment* verticalAdjustment)
23+ {
24+- // This may be called after the page has been destroyed, in which case we do nothing.
25+- Page* page = core(webView);
26+- if (!page)
27+- return;
28+-
29+- WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
30+- client->adjustmentWatcher()->setHorizontalAdjustment(horizontalAdjustment);
31+- client->adjustmentWatcher()->setVerticalAdjustment(verticalAdjustment);
32++ setHorizontalAdjustment(webView, horizontalAdjustment);
33++ setVerticalAdjustment(webView, verticalAdjustment);
34+ }
35+ #endif
36+@@ -1307,4 +1301,9 @@
37+
38+ priv->disposing = TRUE;
39++
40++ // Make sure GtkAdjustmentWatcher won't be reacting to adjustment changes after the
41++ // WebView is destroyed.
42++ setHorizontalAdjustment(webView, 0);
43++ setVerticalAdjustment(webView, 0);
44+
45+ // These smart pointers are cleared manually, because some cleanup operations are
46
47=== renamed file 'debian/patches/10_cherrypick_r95940.patch' => 'debian/patches/10_cherrypick_r95940.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: