OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999-2001 Lars Knoll <knoll@kde.org> | 3 * 1999-2001 Lars Knoll <knoll@kde.org> |
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> | 4 * 1999-2001 Antti Koivisto <koivisto@kde.org> |
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> | 5 * 2000-2001 Simon Hausmann <hausmann@kde.org> |
6 * 2000-2001 Dirk Mueller <mueller@kde.org> | 6 * 2000-2001 Dirk Mueller <mueller@kde.org> |
7 * 2000 Stefan Schimanski <1Stein@gmx.de> | 7 * 2000 Stefan Schimanski <1Stein@gmx.de> |
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 class InstrumentingAgents; | 64 class InstrumentingAgents; |
65 class LayoutViewItem; | 65 class LayoutViewItem; |
66 class LocalDOMWindow; | 66 class LocalDOMWindow; |
67 class NavigationScheduler; | 67 class NavigationScheduler; |
68 class Node; | 68 class Node; |
69 class NodeTraversal; | 69 class NodeTraversal; |
70 class Range; | 70 class Range; |
71 class LayoutView; | 71 class LayoutView; |
72 class TreeScope; | 72 class TreeScope; |
73 class ScriptController; | 73 class ScriptController; |
74 class ServiceRegistry; | |
74 class SpellChecker; | 75 class SpellChecker; |
75 class TreeScope; | 76 class TreeScope; |
76 class WebFrameHostScheduler; | 77 class WebFrameHostScheduler; |
77 class WebFrameScheduler; | 78 class WebFrameScheduler; |
78 template <typename Strategy> class PositionWithAffinityTemplate; | 79 template <typename Strategy> class PositionWithAffinityTemplate; |
79 | 80 |
80 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public Supplementable<LocalFrame>, public DisplayItemClient { | 81 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public Supplementable<LocalFrame>, public DisplayItemClient { |
81 USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); | 82 USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); |
82 public: | 83 public: |
83 static LocalFrame* create(FrameLoaderClient*, FrameHost*, FrameOwner*); | 84 static LocalFrame* create(FrameLoaderClient*, FrameHost*, FrameOwner*, Servi ceRegistry*); |
esprehn
2016/04/05 23:49:14
You could use a default argument = nullptr to avoi
Sam McNally
2016/04/06 01:32:53
Done.
| |
84 | 85 |
85 void init(); | 86 void init(); |
86 void setView(FrameView*); | 87 void setView(FrameView*); |
87 void createView(const IntSize&, const Color&, bool, | 88 void createView(const IntSize&, const Color&, bool, |
88 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, | 89 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, |
89 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); | 90 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); |
90 | 91 |
91 // Frame overrides: | 92 // Frame overrides: |
92 ~LocalFrame() override; | 93 ~LocalFrame() override; |
93 DECLARE_VIRTUAL_TRACE(); | 94 DECLARE_VIRTUAL_TRACE(); |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
182 bool shouldThrottleRendering() const; | 183 bool shouldThrottleRendering() const; |
183 | 184 |
184 // Returns the frame scheduler, creating one if needed. | 185 // Returns the frame scheduler, creating one if needed. |
185 WebFrameScheduler* frameScheduler(); | 186 WebFrameScheduler* frameScheduler(); |
186 void scheduleVisualUpdateUnlessThrottled(); | 187 void scheduleVisualUpdateUnlessThrottled(); |
187 | 188 |
188 void updateSecurityOrigin(SecurityOrigin*); | 189 void updateSecurityOrigin(SecurityOrigin*); |
189 | 190 |
190 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } | 191 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } |
191 | 192 |
193 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; } | |
194 | |
192 private: | 195 private: |
193 friend class FrameNavigationDisabler; | 196 friend class FrameNavigationDisabler; |
194 | 197 |
195 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); | 198 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*); |
196 | 199 |
197 bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) cons t; | 200 bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) cons t; |
198 | 201 |
199 // Internal Frame helper overrides: | 202 // Internal Frame helper overrides: |
200 WindowProxyManager* getWindowProxyManager() const override; | 203 WindowProxyManager* getWindowProxyManager() const override; |
201 | 204 |
202 String localLayerTreeAsText(unsigned flags) const; | 205 String localLayerTreeAsText(unsigned flags) const; |
203 | 206 |
204 void enableNavigation() { --m_navigationDisableCount; } | 207 void enableNavigation() { --m_navigationDisableCount; } |
205 void disableNavigation() { ++m_navigationDisableCount; } | 208 void disableNavigation() { ++m_navigationDisableCount; } |
(...skipping 16 matching lines...) Expand all Loading... | |
222 OwnPtr<WebFrameScheduler> m_frameScheduler; | 225 OwnPtr<WebFrameScheduler> m_frameScheduler; |
223 | 226 |
224 int m_navigationDisableCount; | 227 int m_navigationDisableCount; |
225 | 228 |
226 float m_pageZoomFactor; | 229 float m_pageZoomFactor; |
227 float m_textZoomFactor; | 230 float m_textZoomFactor; |
228 | 231 |
229 bool m_inViewSourceMode; | 232 bool m_inViewSourceMode; |
230 | 233 |
231 Member<InstrumentingAgents> m_instrumentingAgents; | 234 Member<InstrumentingAgents> m_instrumentingAgents; |
235 | |
236 ServiceRegistry* const m_serviceRegistry; | |
232 }; | 237 }; |
233 | 238 |
234 inline void LocalFrame::init() | 239 inline void LocalFrame::init() |
235 { | 240 { |
236 m_loader.init(); | 241 m_loader.init(); |
237 } | 242 } |
238 | 243 |
239 inline LocalDOMWindow* LocalFrame::localDOMWindow() const | 244 inline LocalDOMWindow* LocalFrame::localDOMWindow() const |
240 { | 245 { |
241 return m_domWindow.get(); | 246 return m_domWindow.get(); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 explicit FrameNavigationDisabler(LocalFrame&); | 319 explicit FrameNavigationDisabler(LocalFrame&); |
315 ~FrameNavigationDisabler(); | 320 ~FrameNavigationDisabler(); |
316 | 321 |
317 private: | 322 private: |
318 Member<LocalFrame> m_frame; | 323 Member<LocalFrame> m_frame; |
319 }; | 324 }; |
320 | 325 |
321 } // namespace blink | 326 } // namespace blink |
322 | 327 |
323 #endif // LocalFrame_h | 328 #endif // LocalFrame_h |
OLD | NEW |