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

Side by Side Diff: Source/WebCore/platform/ScrollView.h

Issue 12475008: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Holger Hans Peter Freyther 3 * Copyright (C) 2009 Holger Hans Peter Freyther
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 void windowResizerRectChanged(); 229 void windowResizerRectChanged();
230 230
231 virtual void setParent(ScrollView*); // Overridden to update the overlapping scrollbar count. 231 virtual void setParent(ScrollView*); // Overridden to update the overlapping scrollbar count.
232 232
233 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes). 233 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes).
234 virtual void frameRectsChanged(); 234 virtual void frameRectsChanged();
235 235
236 // Widget override to update our scrollbars and notify our contents of the r esize. 236 // Widget override to update our scrollbars and notify our contents of the r esize.
237 virtual void setFrameRect(const IntRect&); 237 virtual void setFrameRect(const IntRect&);
238 238
239 // Widget override to notify our contents of a cliprect change.
240 virtual void clipRectChanged() OVERRIDE;
241
239 // For platforms that need to hit test scrollbars from within the engine's e vent handlers (like Win32). 242 // For platforms that need to hit test scrollbars from within the engine's e vent handlers (like Win32).
240 Scrollbar* scrollbarAtPoint(const IntPoint& windowPoint); 243 Scrollbar* scrollbarAtPoint(const IntPoint& windowPoint);
241 244
242 IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) cons t 245 IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) cons t
243 { 246 {
244 IntPoint newPoint = point; 247 IntPoint newPoint = point;
245 if (!isScrollViewScrollbar(child)) 248 if (!isScrollViewScrollbar(child))
246 newPoint = point - scrollOffset(); 249 newPoint = point - scrollOffset();
247 newPoint.moveBy(child->location()); 250 newPoint.moveBy(child->location());
248 return newPoint; 251 return newPoint;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 private: 404 private:
402 class ScrollViewPrivate; 405 class ScrollViewPrivate;
403 ScrollViewPrivate* m_data; 406 ScrollViewPrivate* m_data;
404 #endif 407 #endif
405 408
406 }; // class ScrollView 409 }; // class ScrollView
407 410
408 } // namespace WebCore 411 } // namespace WebCore
409 412
410 #endif // ScrollView_h 413 #endif // ScrollView_h
OLDNEW
« no previous file with comments | « LayoutTests/plugins/resources/plugin-clip-subframe-iframe.html ('k') | Source/WebCore/platform/ScrollView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698