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

Side by Side Diff: Source/platform/scroll/ScrollableArea.h

Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 m_verticalBarDamage.unite(rect); 252 m_verticalBarDamage.unite(rect);
253 } 253 }
254 254
255 void resetScrollbarDamage() 255 void resetScrollbarDamage()
256 { 256 {
257 m_verticalBarDamage = IntRect(); 257 m_verticalBarDamage = IntRect();
258 m_horizontalBarDamage = IntRect(); 258 m_horizontalBarDamage = IntRect();
259 } 259 }
260 260
261 virtual GraphicsLayer* layerForContainer() const; 261 virtual GraphicsLayer* layerForContainer() const;
262 virtual GraphicsLayer* layerForScrollbarContainer() const { return layerForC ontainer(); }
263 virtual GraphicsLayer* layerForScrolling() const { return 0; } 262 virtual GraphicsLayer* layerForScrolling() const { return 0; }
264 virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; } 263 virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; }
265 virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; } 264 virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; }
266 virtual GraphicsLayer* layerForScrollCorner() const { return 0; } 265 virtual GraphicsLayer* layerForScrollCorner() const { return 0; }
267 bool hasLayerForHorizontalScrollbar() const; 266 bool hasLayerForHorizontalScrollbar() const;
268 bool hasLayerForVerticalScrollbar() const; 267 bool hasLayerForVerticalScrollbar() const;
269 bool hasLayerForScrollCorner() const; 268 bool hasLayerForScrollCorner() const;
270 269
271 void layerForScrollingDidChange(WebCompositorAnimationTimeline*); 270 void layerForScrollingDidChange(WebCompositorAnimationTimeline*);
272 271
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 // vertical-lr / ltr NO NO 365 // vertical-lr / ltr NO NO
367 // vertical-lr / rtl NO YES 366 // vertical-lr / rtl NO YES
368 // vertical-rl / ltr YES NO 367 // vertical-rl / ltr YES NO
369 // vertical-rl / rtl YES YES 368 // vertical-rl / rtl YES YES
370 IntPoint m_scrollOrigin; 369 IntPoint m_scrollOrigin;
371 }; 370 };
372 371
373 } // namespace blink 372 } // namespace blink
374 373
375 #endif // ScrollableArea_h 374 #endif // ScrollableArea_h
OLDNEW
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp ('k') | Source/platform/scroll/ScrollbarThemeAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698