WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/gtk/ScrollViewGtk.cpp

Index: third_party/WebKit/WebCore/platform/gtk/ScrollViewGtk.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/gtk/ScrollViewGtk.cpp	(revision 9391)
+++ third_party/WebKit/WebCore/platform/gtk/ScrollViewGtk.cpp	(working copy)
@@ -154,7 +154,7 @@
         m_horizontalAdjustment->upper = contentsWidth();
         gtk_adjustment_changed(m_horizontalAdjustment);
 
-        if (m_scrollOffset.width() != scroll.width()) {
+        if (m_horizontalAdjustment->value != scroll.width()) {
             m_horizontalAdjustment->value = scroll.width();
             gtk_adjustment_value_changed(m_horizontalAdjustment);
         }
@@ -173,7 +173,7 @@
         m_verticalAdjustment->upper = contentsHeight();
         gtk_adjustment_changed(m_verticalAdjustment);
 
-        if (m_scrollOffset.height() != scroll.height()) {
+        if (m_verticalAdjustment->value != scroll.height()) {
             m_verticalAdjustment->value = scroll.height();
             gtk_adjustment_value_changed(m_verticalAdjustment);
         }