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

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: Make m_visualViewport a WeakMember Created 4 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
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 29 matching lines...) Expand all
40 #include "wtf/Noncopyable.h" 40 #include "wtf/Noncopyable.h"
41 #include "wtf/OwnPtr.h" 41 #include "wtf/OwnPtr.h"
42 #include "wtf/PassOwnPtr.h" 42 #include "wtf/PassOwnPtr.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class ChromeClient; 46 class ChromeClient;
47 class ConsoleMessageStorage; 47 class ConsoleMessageStorage;
48 class Deprecation; 48 class Deprecation;
49 class EventHandlerRegistry; 49 class EventHandlerRegistry;
50 class OverscrollController;
50 class Page; 51 class Page;
51 class PageScaleConstraintsSet; 52 class PageScaleConstraintsSet;
52 class Settings; 53 class Settings;
53 class UseCounter; 54 class UseCounter;
54 class Visitor; 55 class Visitor;
55 56
56 // FrameHost is the set of global data shared between multiple frames 57 // FrameHost is the set of global data shared between multiple frames
57 // and is provided by the embedder to each frame when created. 58 // and is provided by the embedder to each frame when created.
58 // FrameHost currently corresponds to the Page object in core/page 59 // FrameHost currently corresponds to the Page object in core/page
59 // however the concept of a Page is moving up out of Blink. 60 // however the concept of a Page is moving up out of Blink.
(...skipping 14 matching lines...) Expand all
74 ChromeClient& chromeClient() const; 75 ChromeClient& chromeClient() const;
75 UseCounter& useCounter() const; 76 UseCounter& useCounter() const;
76 Deprecation& deprecation() const; 77 Deprecation& deprecation() const;
77 78
78 // Corresponds to pixel density of the device where this Page is 79 // Corresponds to pixel density of the device where this Page is
79 // being displayed. In multi-monitor setups this can vary between pages. 80 // being displayed. In multi-monitor setups this can vary between pages.
80 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead. 81 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead.
81 float deviceScaleFactor() const; 82 float deviceScaleFactor() const;
82 83
83 TopControls& topControls() const; 84 TopControls& topControls() const;
85 OverscrollController& overscrollController() const;
84 VisualViewport& visualViewport() const; 86 VisualViewport& visualViewport() const;
85 PageScaleConstraintsSet& pageScaleConstraintsSet() const; 87 PageScaleConstraintsSet& pageScaleConstraintsSet() const;
86 EventHandlerRegistry& eventHandlerRegistry() const; 88 EventHandlerRegistry& eventHandlerRegistry() const;
87 89
88 const AtomicString& overrideEncoding() const { return m_overrideEncoding; } 90 const AtomicString& overrideEncoding() const { return m_overrideEncoding; }
89 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding = encoding; } 91 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding = encoding; }
90 92
91 ConsoleMessageStorage& consoleMessageStorage() const; 93 ConsoleMessageStorage& consoleMessageStorage() const;
92 94
93 DECLARE_TRACE(); 95 DECLARE_TRACE();
(...skipping 10 matching lines...) Expand all
104 void setDefaultPageScaleLimits(float minScale, float maxScale); 106 void setDefaultPageScaleLimits(float minScale, float maxScale);
105 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints); 107 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints);
106 108
107 private: 109 private:
108 explicit FrameHost(Page&); 110 explicit FrameHost(Page&);
109 111
110 Member<Page> m_page; 112 Member<Page> m_page;
111 const Member<TopControls> m_topControls; 113 const Member<TopControls> m_topControls;
112 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 114 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
113 const Member<VisualViewport> m_visualViewport; 115 const Member<VisualViewport> m_visualViewport;
116 const Member<OverscrollController> m_overscrollController;
114 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 117 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
115 const Member<ConsoleMessageStorage> m_consoleMessageStorage; 118 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
116 119
117 AtomicString m_overrideEncoding; 120 AtomicString m_overrideEncoding;
118 int m_subframeCount; 121 int m_subframeCount;
119 }; 122 };
120 123
121 } // namespace blink 124 } // namespace blink
122 125
123 #endif // FrameHost_h 126 #endif // FrameHost_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698