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

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

Issue 1850703002: Revert "Adapt and reland old position sticky implementation from https://codereview.chromium.org/34… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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) 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 WebDisplayMode displayMode() { return m_displayMode; } 194 WebDisplayMode displayMode() { return m_displayMode; }
195 void setDisplayMode(WebDisplayMode); 195 void setDisplayMode(WebDisplayMode);
196 196
197 // Fixed-position objects. 197 // Fixed-position objects.
198 typedef HashSet<LayoutObject*> ViewportConstrainedObjectSet; 198 typedef HashSet<LayoutObject*> ViewportConstrainedObjectSet;
199 void addViewportConstrainedObject(LayoutObject*); 199 void addViewportConstrainedObject(LayoutObject*);
200 void removeViewportConstrainedObject(LayoutObject*); 200 void removeViewportConstrainedObject(LayoutObject*);
201 const ViewportConstrainedObjectSet* viewportConstrainedObjects() const { ret urn m_viewportConstrainedObjects.get(); } 201 const ViewportConstrainedObjectSet* viewportConstrainedObjects() const { ret urn m_viewportConstrainedObjects.get(); }
202 bool hasViewportConstrainedObjects() const { return m_viewportConstrainedObj ects && m_viewportConstrainedObjects->size() > 0; } 202 bool hasViewportConstrainedObjects() const { return m_viewportConstrainedObj ects && m_viewportConstrainedObjects->size() > 0; }
203 203
204 // Sticky objects.
205 void addStickyPositionObject() { ++m_stickyPositionObjectCount; }
206 void removeStickyPositionObject() { --m_stickyPositionObjectCount; }
207 bool hasStickyPositionObjects() const { return m_stickyPositionObjectCount; }
208
209 // Objects with background-attachment:fixed. 204 // Objects with background-attachment:fixed.
210 void addBackgroundAttachmentFixedObject(LayoutObject*); 205 void addBackgroundAttachmentFixedObject(LayoutObject*);
211 void removeBackgroundAttachmentFixedObject(LayoutObject*); 206 void removeBackgroundAttachmentFixedObject(LayoutObject*);
212 bool hasBackgroundAttachmentFixedObjects() const { return m_backgroundAttach mentFixedObjects.size(); } 207 bool hasBackgroundAttachmentFixedObjects() const { return m_backgroundAttach mentFixedObjects.size(); }
213 void invalidateBackgroundAttachmentFixedObjects(); 208 void invalidateBackgroundAttachmentFixedObjects();
214 209
215 void handleLoadCompleted(); 210 void handleLoadCompleted();
216 211
217 void updateDocumentAnnotatedRegions() const; 212 void updateDocumentAnnotatedRegions() const;
218 213
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 819
825 RefPtrWillBeMember<Node> m_fragmentAnchor; 820 RefPtrWillBeMember<Node> m_fragmentAnchor;
826 821
827 // layoutObject to hold our custom scroll corner. 822 // layoutObject to hold our custom scroll corner.
828 LayoutScrollbarPart* m_scrollCorner; 823 LayoutScrollbarPart* m_scrollCorner;
829 824
830 OwnPtrWillBeMember<ScrollableAreaSet> m_scrollableAreas; 825 OwnPtrWillBeMember<ScrollableAreaSet> m_scrollableAreas;
831 OwnPtrWillBeMember<ScrollableAreaSet> m_animatingScrollableAreas; 826 OwnPtrWillBeMember<ScrollableAreaSet> m_animatingScrollableAreas;
832 OwnPtr<ResizerAreaSet> m_resizerAreas; 827 OwnPtr<ResizerAreaSet> m_resizerAreas;
833 OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects; 828 OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects;
834 unsigned m_stickyPositionObjectCount;
835 ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects; 829 ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects;
836 OwnPtrWillBeMember<FrameViewAutoSizeInfo> m_autoSizeInfo; 830 OwnPtrWillBeMember<FrameViewAutoSizeInfo> m_autoSizeInfo;
837 831
838 IntSize m_inputEventsOffsetForEmulation; 832 IntSize m_inputEventsOffsetForEmulation;
839 float m_inputEventsScaleFactorForEmulation; 833 float m_inputEventsScaleFactorForEmulation;
840 834
841 IntSize m_layoutSize; 835 IntSize m_layoutSize;
842 bool m_layoutSizeFixedToFrameSize; 836 bool m_layoutSizeFixedToFrameSize;
843 837
844 Timer<FrameView> m_didScrollTimer; 838 Timer<FrameView> m_didScrollTimer;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 928 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
935 setIsVisuallyNonEmpty(); 929 setIsVisuallyNonEmpty();
936 } 930 }
937 931
938 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 932 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
939 DEFINE_TYPE_CASTS(FrameView, ScrollableArea, scrollableArea, scrollableArea->isF rameView(), scrollableArea.isFrameView()); 933 DEFINE_TYPE_CASTS(FrameView, ScrollableArea, scrollableArea, scrollableArea->isF rameView(), scrollableArea.isFrameView());
940 934
941 } // namespace blink 935 } // namespace blink
942 936
943 #endif // FrameView_h 937 #endif // FrameView_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698