[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
kov at webkit.org
kov at webkit.org
Tue Jan 5 23:56:28 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 625b2394aae99423fa7caabf62f7b85416c24a3d
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 20 15:45:20 2009 +0000
Reviewed by Xan Lopez.
Hopefully fix the assertion we are hitting by not forcing updating
the state of scrollbars when setting the adjustments. This was
leading to a premature layout.
fast/dom/open-and-close-by-DOM.html
fast/dom/Window/closure-access-after-navigation-window.html
fast/harness/use-page-cache.html
* platform/gtk/ScrollViewGtk.cpp:
(WebCore::ScrollView::setGtkAdjustments):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dd71faf..d8c2687 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-20 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ Hopefully fix the assertion we are hitting by not forcing updating
+ the state of scrollbars when setting the adjustments. This was
+ leading to a premature layout.
+
+ fast/dom/open-and-close-by-DOM.html
+ fast/dom/Window/closure-access-after-navigation-window.html
+ fast/harness/use-page-cache.html
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::ScrollView::setGtkAdjustments):
+
2009-12-20 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/gtk/ScrollViewGtk.cpp b/WebCore/platform/gtk/ScrollViewGtk.cpp
index a1ed8c3..a7e7e15 100644
--- a/WebCore/platform/gtk/ScrollViewGtk.cpp
+++ b/WebCore/platform/gtk/ScrollViewGtk.cpp
@@ -101,7 +101,6 @@ void ScrollView::setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj)
/* reconsider having a scrollbar */
setHasVerticalScrollbar(false);
setHasHorizontalScrollbar(false);
- updateScrollbars(m_scrollOffset);
}
void ScrollView::platformAddChild(Widget* child)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list