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

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

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (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) 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 class IntSize; 63 class IntSize;
64 class InstrumentingAgents; 64 class InstrumentingAgents;
65 class LocalDOMWindow; 65 class LocalDOMWindow;
66 class NavigationScheduler; 66 class NavigationScheduler;
67 class Node; 67 class Node;
68 class NodeTraversal; 68 class NodeTraversal;
69 class Range; 69 class Range;
70 class LayoutView; 70 class LayoutView;
71 class TreeScope; 71 class TreeScope;
72 class ScriptController; 72 class ScriptController;
73 class ServiceRegistry;
73 class SpellChecker; 74 class SpellChecker;
74 class TreeScope; 75 class TreeScope;
75 class WebFrameHostScheduler; 76 class WebFrameHostScheduler;
76 class WebFrameScheduler; 77 class WebFrameScheduler;
77 template <typename Strategy> class PositionWithAffinityTemplate; 78 template <typename Strategy> class PositionWithAffinityTemplate;
78 79
79 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame>, public DisplayItemClient { 80 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame>, public DisplayItemClient {
80 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); 81 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
81 public: 82 public:
82 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHo st*, FrameOwner*); 83 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHo st*, FrameOwner*, ServiceRegistry*);
83 84
84 void init(); 85 void init();
85 void setView(PassRefPtrWillBeRawPtr<FrameView>); 86 void setView(PassRefPtrWillBeRawPtr<FrameView>);
86 void createView(const IntSize&, const Color&, bool, 87 void createView(const IntSize&, const Color&, bool,
87 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 88 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
88 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 89 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
89 90
90 // Frame overrides: 91 // Frame overrides:
91 ~LocalFrame() override; 92 ~LocalFrame() override;
92 DECLARE_VIRTUAL_TRACE(); 93 DECLARE_VIRTUAL_TRACE();
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 bool shouldThrottleRendering() const; 181 bool shouldThrottleRendering() const;
181 182
182 // Returns the frame scheduler, creating one if needed. 183 // Returns the frame scheduler, creating one if needed.
183 WebFrameScheduler* frameScheduler(); 184 WebFrameScheduler* frameScheduler();
184 void scheduleVisualUpdateUnlessThrottled(); 185 void scheduleVisualUpdateUnlessThrottled();
185 186
186 void updateSecurityOrigin(SecurityOrigin*); 187 void updateSecurityOrigin(SecurityOrigin*);
187 188
188 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 189 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
189 190
191 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; }
192
190 private: 193 private:
191 friend class FrameNavigationDisabler; 194 friend class FrameNavigationDisabler;
192 195
193 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 196 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*);
194 197
195 bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) cons t; 198 bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) cons t;
196 199
197 // Internal Frame helper overrides: 200 // Internal Frame helper overrides:
198 WindowProxyManager* getWindowProxyManager() const override; 201 WindowProxyManager* getWindowProxyManager() const override;
199 202
200 String localLayerTreeAsText(unsigned flags) const; 203 String localLayerTreeAsText(unsigned flags) const;
201 204
202 void enableNavigation() { --m_navigationDisableCount; } 205 void enableNavigation() { --m_navigationDisableCount; }
203 void disableNavigation() { ++m_navigationDisableCount; } 206 void disableNavigation() { ++m_navigationDisableCount; }
(...skipping 16 matching lines...) Expand all
220 OwnPtr<WebFrameScheduler> m_frameScheduler; 223 OwnPtr<WebFrameScheduler> m_frameScheduler;
221 224
222 int m_navigationDisableCount; 225 int m_navigationDisableCount;
223 226
224 float m_pageZoomFactor; 227 float m_pageZoomFactor;
225 float m_textZoomFactor; 228 float m_textZoomFactor;
226 229
227 bool m_inViewSourceMode; 230 bool m_inViewSourceMode;
228 231
229 RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents; 232 RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
233
234 ServiceRegistry* const m_serviceRegistry;
230 }; 235 };
231 236
232 inline void LocalFrame::init() 237 inline void LocalFrame::init()
233 { 238 {
234 m_loader.init(); 239 m_loader.init();
235 } 240 }
236 241
237 inline LocalDOMWindow* LocalFrame::localDOMWindow() const 242 inline LocalDOMWindow* LocalFrame::localDOMWindow() const
238 { 243 {
239 return m_domWindow.get(); 244 return m_domWindow.get();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 explicit FrameNavigationDisabler(LocalFrame&); 317 explicit FrameNavigationDisabler(LocalFrame&);
313 ~FrameNavigationDisabler(); 318 ~FrameNavigationDisabler();
314 319
315 private: 320 private:
316 RawPtrWillBeMember<LocalFrame> m_frame; 321 RawPtrWillBeMember<LocalFrame> m_frame;
317 }; 322 };
318 323
319 } // namespace blink 324 } // namespace blink
320 325
321 #endif // LocalFrame_h 326 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698