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

Side by Side Diff: Source/core/frame/FrameView.h

Issue 1113973002: Remove FrameView::m_inProgrammaticScroll and related plumbing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 float visibleContentScaleFactor() const { return m_visibleContentScaleFactor ; } 161 float visibleContentScaleFactor() const { return m_visibleContentScaleFactor ; }
162 void setVisibleContentScaleFactor(float); 162 void setVisibleContentScaleFactor(float);
163 163
164 // Scale used to convert incoming input events. Usually the same as visibleC ontentScaleFactor(), unless specifically changed. 164 // Scale used to convert incoming input events. Usually the same as visibleC ontentScaleFactor(), unless specifically changed.
165 float inputEventsScaleFactor() const; 165 float inputEventsScaleFactor() const;
166 // Offset used to convert incoming input events while emulating device metic s. 166 // Offset used to convert incoming input events while emulating device metic s.
167 IntSize inputEventsOffsetForEmulation() const; 167 IntSize inputEventsOffsetForEmulation() const;
168 void setInputEventsTransformForEmulation(const IntSize&, float); 168 void setInputEventsTransformForEmulation(const IntSize&, float);
169 169
170 virtual void setScrollPosition(const DoublePoint&, ScrollBehavior = ScrollBe haviorInstant) override; 170 virtual void setScrollPosition(const DoublePoint&, ScrollBehavior = ScrollBe haviorInstant) override;
171 void setScrollPositionNonProgrammatically(const IntPoint&);
172 171
173 FloatSize elasticOverscroll() const { return m_elasticOverscroll; } 172 FloatSize elasticOverscroll() const { return m_elasticOverscroll; }
174 void setElasticOverscroll(const FloatSize&); 173 void setElasticOverscroll(const FloatSize&);
175 174
176 // This is different than visibleContentRect() in that it takes zooming into account. 175 // This is different than visibleContentRect() in that it takes zooming into account.
177 LayoutRect viewportConstrainedVisibleContentRect() const; 176 LayoutRect viewportConstrainedVisibleContentRect() const;
178 void viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool he ightChanged); 177 void viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool he ightChanged);
179 178
180 AtomicString mediaType() const; 179 AtomicString mediaType() const;
181 void setMediaType(const AtomicString&); 180 void setMediaType(const AtomicString&);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 typedef HashSet<LayoutBox*> ResizerAreaSet; 311 typedef HashSet<LayoutBox*> ResizerAreaSet;
313 void addResizerArea(LayoutBox&); 312 void addResizerArea(LayoutBox&);
314 void removeResizerArea(LayoutBox&); 313 void removeResizerArea(LayoutBox&);
315 const ResizerAreaSet* resizerAreas() const { return m_resizerAreas.get(); } 314 const ResizerAreaSet* resizerAreas() const { return m_resizerAreas.get(); }
316 315
317 // This function exists for ports that need to handle wheel events manually. 316 // This function exists for ports that need to handle wheel events manually.
318 // On Mac WebKit1 the underlying NSScrollView just does the scrolling, but o n most other platforms 317 // On Mac WebKit1 the underlying NSScrollView just does the scrolling, but o n most other platforms
319 // we need this function in order to do the scroll ourselves. 318 // we need this function in order to do the scroll ourselves.
320 ScrollResult wheelEvent(const PlatformWheelEvent&); 319 ScrollResult wheelEvent(const PlatformWheelEvent&);
321 320
322 bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
323 void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScro ll = programmaticScroll; }
324
325 virtual bool shouldUseIntegerScrollOffset() const override; 321 virtual bool shouldUseIntegerScrollOffset() const override;
326 322
327 virtual bool isActive() const override; 323 virtual bool isActive() const override;
328 324
329 IntSize scrollOffsetForViewportConstrainedObjects() const; 325 IntSize scrollOffsetForViewportConstrainedObjects() const;
330 326
331 // Override scrollbar notifications to update the AXObject cache. 327 // Override scrollbar notifications to update the AXObject cache.
332 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) override; 328 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) override;
333 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) override; 329 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) override;
334 330
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 764
769 AtomicString m_mediaType; 765 AtomicString m_mediaType;
770 AtomicString m_mediaTypeWhenNotPrinting; 766 AtomicString m_mediaTypeWhenNotPrinting;
771 767
772 bool m_overflowStatusDirty; 768 bool m_overflowStatusDirty;
773 bool m_horizontalOverflow; 769 bool m_horizontalOverflow;
774 bool m_verticalOverflow; 770 bool m_verticalOverflow;
775 LayoutObject* m_viewportLayoutObject; 771 LayoutObject* m_viewportLayoutObject;
776 772
777 bool m_wasScrolledByUser; 773 bool m_wasScrolledByUser;
778 bool m_inProgrammaticScroll;
779 bool m_safeToPropagateScrollToParent; 774 bool m_safeToPropagateScrollToParent;
780 775
781 double m_lastPaintTime; 776 double m_lastPaintTime;
782 777
783 bool m_isTrackingPaintInvalidations; // Used for testing. 778 bool m_isTrackingPaintInvalidations; // Used for testing.
784 779
785 // In frame coordinates. 780 // In frame coordinates.
786 Vector<IntRect> m_trackedPaintInvalidationRects; 781 Vector<IntRect> m_trackedPaintInvalidationRects;
787 782
788 RefPtrWillBeMember<Node> m_nodeToDraw; 783 RefPtrWillBeMember<Node> m_nodeToDraw;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 static const unsigned visualPixelThreshold = 32 * 32; 871 static const unsigned visualPixelThreshold = 32 * 32;
877 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 872 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
878 setIsVisuallyNonEmpty(); 873 setIsVisuallyNonEmpty();
879 } 874 }
880 875
881 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 876 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
882 877
883 } // namespace blink 878 } // namespace blink
884 879
885 #endif // FrameView_h 880 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698