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

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

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 void windowResizerRectChanged(); 236 void windowResizerRectChanged();
237 237
238 virtual void setParent(ScrollView*); // Overridden to update the overlapping scrollbar count. 238 virtual void setParent(ScrollView*); // Overridden to update the overlapping scrollbar count.
239 239
240 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes). 240 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes).
241 virtual void frameRectsChanged(); 241 virtual void frameRectsChanged();
242 242
243 // Widget override to update our scrollbars and notify our contents of the r esize. 243 // Widget override to update our scrollbars and notify our contents of the r esize.
244 virtual void setFrameRect(const IntRect&); 244 virtual void setFrameRect(const IntRect&);
245 245
246 // Widget override to notify our contents of a cliprect change.
247 virtual void clipRectChanged() OVERRIDE;
248
246 // For platforms that need to hit test scrollbars from within the engine's e vent handlers (like Win32). 249 // For platforms that need to hit test scrollbars from within the engine's e vent handlers (like Win32).
247 Scrollbar* scrollbarAtPoint(const IntPoint& windowPoint); 250 Scrollbar* scrollbarAtPoint(const IntPoint& windowPoint);
248 251
249 IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) cons t 252 IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) cons t
250 { 253 {
251 IntPoint newPoint = point; 254 IntPoint newPoint = point;
252 if (!isScrollViewScrollbar(child)) 255 if (!isScrollViewScrollbar(child))
253 newPoint = point - scrollOffset(); 256 newPoint = point - scrollOffset();
254 newPoint.moveBy(child->location()); 257 newPoint.moveBy(child->location());
255 return newPoint; 258 return newPoint;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 private: 411 private:
409 class ScrollViewPrivate; 412 class ScrollViewPrivate;
410 ScrollViewPrivate* m_data; 413 ScrollViewPrivate* m_data;
411 #endif 414 #endif
412 415
413 }; // class ScrollView 416 }; // class ScrollView
414 417
415 } // namespace WebCore 418 } // namespace WebCore
416 419
417 #endif // ScrollView_h 420 #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