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

Side by Side Diff: Source/WebKit/chromium/src/WebScrollbarImpl.cpp

Issue 6392001: Merge 76455 - 2011-01-22 John Abd-El-Malek <jam@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 11 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 | « Source/WebKit/chromium/src/WebScrollbarImpl.h ('k') | no next file » | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 304
305 void WebScrollbarImpl::getTickmarks(Vector<WebCore::IntRect>& tickmarks) const 305 void WebScrollbarImpl::getTickmarks(Vector<WebCore::IntRect>& tickmarks) const
306 { 306 {
307 WebVector<WebRect> ticks; 307 WebVector<WebRect> ticks;
308 m_client->getTickmarks(const_cast<WebScrollbarImpl*>(this), &ticks); 308 m_client->getTickmarks(const_cast<WebScrollbarImpl*>(this), &ticks);
309 tickmarks.resize(ticks.size()); 309 tickmarks.resize(ticks.size());
310 for (size_t i = 0; i < ticks.size(); ++i) 310 for (size_t i = 0; i < ticks.size(); ++i)
311 tickmarks[i] = ticks[i]; 311 tickmarks[i] = ticks[i];
312 } 312 }
313 313
314 Scrollbar* WebScrollbarImpl::horizontalScrollbar() const
315 {
316 return m_scrollbar->orientation() == HorizontalScrollbar ? m_scrollbar.get() : 0;
317 }
318
319 Scrollbar* WebScrollbarImpl::verticalScrollbar() const
320 {
321 return m_scrollbar->orientation() == VerticalScrollbar ? m_scrollbar.get() : 0;
322 }
323
314 } // namespace WebKit 324 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebScrollbarImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698