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

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

Issue 1749383002: Eliminate uncalled will___LiveResize and inLiveResize from RenderViewImpl through WebWidget down to… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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) 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 // Scrolls the area so that the given rect, given in the document's content coordinates, such that it's 94 // Scrolls the area so that the given rect, given in the document's content coordinates, such that it's
95 // visible in the area. Returns the new location of the input rect relative once again to the document. 95 // visible in the area. Returns the new location of the input rect relative once again to the document.
96 // Note, in the case of a Document container, such as FrameView, the output will always be the input rect 96 // Note, in the case of a Document container, such as FrameView, the output will always be the input rect
97 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing 97 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing
98 // element. 98 // element.
99 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY, ScrollType = ProgrammaticSc roll); 99 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY, ScrollType = ProgrammaticSc roll);
100 100
101 static bool scrollBehaviorFromString(const String&, ScrollBehavior&); 101 static bool scrollBehaviorFromString(const String&, ScrollBehavior&);
102 102
103 bool inLiveResize() const { return m_inLiveResize; }
104 void willStartLiveResize();
105 void willEndLiveResize();
106
107 void contentAreaWillPaint() const; 103 void contentAreaWillPaint() const;
108 void mouseEnteredContentArea() const; 104 void mouseEnteredContentArea() const;
109 void mouseExitedContentArea() const; 105 void mouseExitedContentArea() const;
110 void mouseMovedInContentArea() const; 106 void mouseMovedInContentArea() const;
111 void mouseEnteredScrollbar(Scrollbar&) const; 107 void mouseEnteredScrollbar(Scrollbar&) const;
112 void mouseExitedScrollbar(Scrollbar&) const; 108 void mouseExitedScrollbar(Scrollbar&) const;
113 void contentAreaDidShow() const; 109 void contentAreaDidShow() const;
114 void contentAreaDidHide() const; 110 void contentAreaDidHide() const;
115 111
116 void finishCurrentScrollAnimations() const; 112 void finishCurrentScrollAnimations() const;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 327 }
332 328
333 virtual int lineStep(ScrollbarOrientation) const; 329 virtual int lineStep(ScrollbarOrientation) const;
334 virtual int pageStep(ScrollbarOrientation) const; 330 virtual int pageStep(ScrollbarOrientation) const;
335 virtual int documentStep(ScrollbarOrientation) const; 331 virtual int documentStep(ScrollbarOrientation) const;
336 virtual float pixelStep(ScrollbarOrientation) const; 332 virtual float pixelStep(ScrollbarOrientation) const;
337 333
338 mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator; 334 mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;
339 mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollA nimator; 335 mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollA nimator;
340 336
341 unsigned m_inLiveResize : 1;
342
343 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle 337 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
344 338
345 unsigned m_scrollOriginChanged : 1; 339 unsigned m_scrollOriginChanged : 1;
346 340
347 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1; 341 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1;
348 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1; 342 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1;
349 unsigned m_scrollCornerNeedsPaintInvalidation : 1; 343 unsigned m_scrollCornerNeedsPaintInvalidation : 1;
350 344
351 // There are 8 possible combinations of writing mode and direction. Scroll o rigin will be non-zero in the x or y axis 345 // There are 8 possible combinations of writing mode and direction. Scroll o rigin will be non-zero in the x or y axis
352 // if there is any reversed direction or writing-mode. The combinations are: 346 // if there is any reversed direction or writing-mode. The combinations are:
353 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set 347 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set
354 // horizontal-tb / ltr NO NO 348 // horizontal-tb / ltr NO NO
355 // horizontal-tb / rtl YES NO 349 // horizontal-tb / rtl YES NO
356 // horizontal-bt / ltr NO YES 350 // horizontal-bt / ltr NO YES
357 // horizontal-bt / rtl YES YES 351 // horizontal-bt / rtl YES YES
358 // vertical-lr / ltr NO NO 352 // vertical-lr / ltr NO NO
359 // vertical-lr / rtl NO YES 353 // vertical-lr / rtl NO YES
360 // vertical-rl / ltr YES NO 354 // vertical-rl / ltr YES NO
361 // vertical-rl / rtl YES YES 355 // vertical-rl / rtl YES YES
362 IntPoint m_scrollOrigin; 356 IntPoint m_scrollOrigin;
363 }; 357 };
364 358
365 } // namespace blink 359 } // namespace blink
366 360
367 #endif // ScrollableArea_h 361 #endif // ScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698