Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: WebCore/platform/gtk/ScrollbarGtk.cpp

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebCore/platform/ScrollbarClient.cpp ('k') | WebCore/platform/qt/ScrollbarQt.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2009 Holger Hans Peter Freyther zecke@selfish.org 2 * Copyright (C) 2007, 2009 Holger Hans Peter Freyther zecke@selfish.org
3 * Copyright (C) 2010 Gustavo Noronha Silva <gns@gnome.org> 3 * Copyright (C) 2010 Gustavo Noronha Silva <gns@gnome.org>
4 * Copyright (C) 2010 Collabora Ltd. 4 * Copyright (C) 2010 Collabora Ltd.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 182 }
183 183
184 void ScrollbarGtk::setFrameRect(const IntRect& rect) 184 void ScrollbarGtk::setFrameRect(const IntRect& rect)
185 { 185 {
186 Widget::setFrameRect(rect); 186 Widget::setFrameRect(rect);
187 frameRectsChanged(); 187 frameRectsChanged();
188 } 188 }
189 189
190 void ScrollbarGtk::gtkValueChanged(GtkAdjustment*, ScrollbarGtk* that) 190 void ScrollbarGtk::gtkValueChanged(GtkAdjustment*, ScrollbarGtk* that)
191 { 191 {
192 that->setValue(static_cast<int>(gtk_adjustment_get_value(that->m_adjustment) )); 192 that->setValue(static_cast<int>(gtk_adjustment_get_value(that->m_adjustment) ), NotFromScrollAnimator);
193 } 193 }
194 194
195 void ScrollbarGtk::setEnabled(bool shouldEnable) 195 void ScrollbarGtk::setEnabled(bool shouldEnable)
196 { 196 {
197 if (enabled() == shouldEnable) 197 if (enabled() == shouldEnable)
198 return; 198 return;
199 199
200 Scrollbar::setEnabled(shouldEnable); 200 Scrollbar::setEnabled(shouldEnable);
201 if (platformWidget()) 201 if (platformWidget())
202 gtk_widget_set_sensitive(platformWidget(), shouldEnable); 202 gtk_widget_set_sensitive(platformWidget(), shouldEnable);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 */ 244 */
245 #ifdef GTK_API_VERSION_2 245 #ifdef GTK_API_VERSION_2
246 if (!gdk_region_empty(event->expose.region)) 246 if (!gdk_region_empty(event->expose.region))
247 #else 247 #else
248 if (!cairo_region_is_empty(event->expose.region)) 248 if (!cairo_region_is_empty(event->expose.region))
249 #endif 249 #endif
250 gtk_widget_send_expose(widget, event); 250 gtk_widget_send_expose(widget, event);
251 251
252 gdk_event_free(event); 252 gdk_event_free(event);
253 } 253 }
OLDNEW
« no previous file with comments | « WebCore/platform/ScrollbarClient.cpp ('k') | WebCore/platform/qt/ScrollbarQt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698