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

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

Issue 1915783002: Move overscroll logic out of EventHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made ChromeClient a traced Member<> 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "wtf/OwnPtr.h" 38 #include "wtf/OwnPtr.h"
39 #include "wtf/PassOwnPtr.h" 39 #include "wtf/PassOwnPtr.h"
40 #include "wtf/text/AtomicString.h" 40 #include "wtf/text/AtomicString.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class ChromeClient; 44 class ChromeClient;
45 class ConsoleMessageStorage; 45 class ConsoleMessageStorage;
46 class Deprecation; 46 class Deprecation;
47 class EventHandlerRegistry; 47 class EventHandlerRegistry;
48 class OverscrollController;
48 class Page; 49 class Page;
49 struct PageScaleConstraints; 50 struct PageScaleConstraints;
50 class PageScaleConstraintsSet; 51 class PageScaleConstraintsSet;
51 class Settings; 52 class Settings;
52 class TopControls; 53 class TopControls;
53 class UseCounter; 54 class UseCounter;
54 class Visitor; 55 class Visitor;
55 class VisualViewport; 56 class VisualViewport;
56 57
57 // FrameHost is the set of global data shared between multiple frames 58 // FrameHost is the set of global data shared between multiple frames
(...skipping 17 matching lines...) Expand all
75 ChromeClient& chromeClient() const; 76 ChromeClient& chromeClient() const;
76 UseCounter& useCounter() const; 77 UseCounter& useCounter() const;
77 Deprecation& deprecation() const; 78 Deprecation& deprecation() const;
78 79
79 // Corresponds to pixel density of the device where this Page is 80 // Corresponds to pixel density of the device where this Page is
80 // being displayed. In multi-monitor setups this can vary between pages. 81 // being displayed. In multi-monitor setups this can vary between pages.
81 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead. 82 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead.
82 float deviceScaleFactor() const; 83 float deviceScaleFactor() const;
83 84
84 TopControls& topControls() const; 85 TopControls& topControls() const;
86 OverscrollController& overscrollController() const;
85 VisualViewport& visualViewport() const; 87 VisualViewport& visualViewport() const;
86 PageScaleConstraintsSet& pageScaleConstraintsSet() const; 88 PageScaleConstraintsSet& pageScaleConstraintsSet() const;
87 EventHandlerRegistry& eventHandlerRegistry() const; 89 EventHandlerRegistry& eventHandlerRegistry() const;
88 90
89 const AtomicString& overrideEncoding() const { return m_overrideEncoding; } 91 const AtomicString& overrideEncoding() const { return m_overrideEncoding; }
90 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding = encoding; } 92 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding = encoding; }
91 93
92 ConsoleMessageStorage& consoleMessageStorage() const; 94 ConsoleMessageStorage& consoleMessageStorage() const;
93 95
94 DECLARE_TRACE(); 96 DECLARE_TRACE();
(...skipping 10 matching lines...) Expand all
105 void setDefaultPageScaleLimits(float minScale, float maxScale); 107 void setDefaultPageScaleLimits(float minScale, float maxScale);
106 void setUserAgentPageScaleConstraints(const PageScaleConstraints& newConstra ints); 108 void setUserAgentPageScaleConstraints(const PageScaleConstraints& newConstra ints);
107 109
108 private: 110 private:
109 explicit FrameHost(Page&); 111 explicit FrameHost(Page&);
110 112
111 Member<Page> m_page; 113 Member<Page> m_page;
112 const Member<TopControls> m_topControls; 114 const Member<TopControls> m_topControls;
113 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 115 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
114 const Member<VisualViewport> m_visualViewport; 116 const Member<VisualViewport> m_visualViewport;
117 const Member<OverscrollController> m_overscrollController;
115 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 118 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
116 const Member<ConsoleMessageStorage> m_consoleMessageStorage; 119 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
117 120
118 AtomicString m_overrideEncoding; 121 AtomicString m_overrideEncoding;
119 int m_subframeCount; 122 int m_subframeCount;
120 }; 123 };
121 124
122 } // namespace blink 125 } // namespace blink
123 126
124 #endif // FrameHost_h 127 #endif // FrameHost_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698