WebKit merge 40722:40785 (part 1)

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Computer, Inc. All rights reserved.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * Copyright (C) 2008 Collabora Ltd.
  *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 136 matching lines @@
 bool ScrollView::platformHandleHorizontalAdjustment(const IntSize& scroll)
 {
     if (m_horizontalAdjustment) {
         m_horizontalAdjustment->page_size = visibleWidth();
         m_horizontalAdjustment->step_increment = visibleWidth() / 10.0;
         m_horizontalAdjustment->page_increment = visibleWidth() * 0.9;
         m_horizontalAdjustment->lower = 0;
         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);
         }
         return true;
     }
     return false;
 }
 
 bool ScrollView::platformHandleVerticalAdjustment(const IntSize& scroll)
 {
     if (m_verticalAdjustment) {
         m_verticalAdjustment->page_size = visibleHeight();
         m_verticalAdjustment->step_increment = visibleHeight() / 10.0;
         m_verticalAdjustment->page_increment = visibleHeight() * 0.9;
         m_verticalAdjustment->lower = 0;
         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);
         }
         return true;
     } 
     return false;
 }
 
 bool ScrollView::platformHasHorizontalAdjustment() const
 {
     return m_horizontalAdjustment != 0;
 }
 
 bool ScrollView::platformHasVerticalAdjustment() const
 {
     return m_verticalAdjustment != 0;
 }
 
 }