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

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: rebase 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 // Scrolls the area so that the given rect, given in the document's content coordinates, such that it's 95 // Scrolls the area so that the given rect, given in the document's content coordinates, such that it's
96 // visible in the area. Returns the new location of the input rect relative once again to the document. 96 // visible in the area. Returns the new location of the input rect relative once again to the document.
97 // Note, in the case of a Document container, such as FrameView, the output will always be the input rect 97 // Note, in the case of a Document container, such as FrameView, the output will always be the input rect
98 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing 98 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing
99 // element. 99 // element.
100 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY, ScrollType = ProgrammaticSc roll); 100 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY, ScrollType = ProgrammaticSc roll);
101 101
102 static bool scrollBehaviorFromString(const String&, ScrollBehavior&); 102 static bool scrollBehaviorFromString(const String&, ScrollBehavior&);
103 103
104 bool inLiveResize() const { return m_inLiveResize; }
105 void willStartLiveResize();
106 void willEndLiveResize();
107
108 void contentAreaWillPaint() const; 104 void contentAreaWillPaint() const;
109 void mouseEnteredContentArea() const; 105 void mouseEnteredContentArea() const;
110 void mouseExitedContentArea() const; 106 void mouseExitedContentArea() const;
111 void mouseMovedInContentArea() const; 107 void mouseMovedInContentArea() const;
112 void mouseEnteredScrollbar(Scrollbar&) const; 108 void mouseEnteredScrollbar(Scrollbar&) const;
113 void mouseExitedScrollbar(Scrollbar&) const; 109 void mouseExitedScrollbar(Scrollbar&) const;
114 void contentAreaDidShow() const; 110 void contentAreaDidShow() const;
115 void contentAreaDidHide() const; 111 void contentAreaDidHide() const;
116 112
117 void finishCurrentScrollAnimations() const; 113 void finishCurrentScrollAnimations() const;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0; 316 virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0;
321 317
322 virtual int lineStep(ScrollbarOrientation) const; 318 virtual int lineStep(ScrollbarOrientation) const;
323 virtual int pageStep(ScrollbarOrientation) const; 319 virtual int pageStep(ScrollbarOrientation) const;
324 virtual int documentStep(ScrollbarOrientation) const; 320 virtual int documentStep(ScrollbarOrientation) const;
325 virtual float pixelStep(ScrollbarOrientation) const; 321 virtual float pixelStep(ScrollbarOrientation) const;
326 322
327 mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator; 323 mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;
328 mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollA nimator; 324 mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollA nimator;
329 325
330 unsigned m_inLiveResize : 1;
331
332 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle 326 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
333 327
334 unsigned m_scrollOriginChanged : 1; 328 unsigned m_scrollOriginChanged : 1;
335 329
336 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1; 330 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1;
337 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1; 331 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1;
338 unsigned m_scrollCornerNeedsPaintInvalidation : 1; 332 unsigned m_scrollCornerNeedsPaintInvalidation : 1;
339 333
340 // There are 8 possible combinations of writing mode and direction. Scroll o rigin will be non-zero in the x or y axis 334 // There are 8 possible combinations of writing mode and direction. Scroll o rigin will be non-zero in the x or y axis
341 // if there is any reversed direction or writing-mode. The combinations are: 335 // if there is any reversed direction or writing-mode. The combinations are:
342 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set 336 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set
343 // horizontal-tb / ltr NO NO 337 // horizontal-tb / ltr NO NO
344 // horizontal-tb / rtl YES NO 338 // horizontal-tb / rtl YES NO
345 // horizontal-bt / ltr NO YES 339 // horizontal-bt / ltr NO YES
346 // horizontal-bt / rtl YES YES 340 // horizontal-bt / rtl YES YES
347 // vertical-lr / ltr NO NO 341 // vertical-lr / ltr NO NO
348 // vertical-lr / rtl NO YES 342 // vertical-lr / rtl NO YES
349 // vertical-rl / ltr YES NO 343 // vertical-rl / ltr YES NO
350 // vertical-rl / rtl YES YES 344 // vertical-rl / rtl YES YES
351 IntPoint m_scrollOrigin; 345 IntPoint m_scrollOrigin;
352 }; 346 };
353 347
354 } // namespace blink 348 } // namespace blink
355 349
356 #endif // ScrollableArea_h 350 #endif // ScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698