| Index: third_party/WebKit/Source/core/frame/LocalFrame.h
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| index 4e488c8ee9a5ec43c06d36b8f93532431eff1613..acd3fdaa6cad4a7263483fd7564920fde58f3f52 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| @@ -71,6 +71,7 @@ class Range;
|
| class LayoutView;
|
| class TreeScope;
|
| class ScriptController;
|
| +class ServiceRegistry;
|
| class SpellChecker;
|
| class TreeScope;
|
| class WebFrameHostScheduler;
|
| @@ -80,7 +81,7 @@ template <typename Strategy> class PositionWithAffinityTemplate;
|
| class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame>, public DisplayItemClient {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*, FrameOwner*);
|
| + static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*);
|
|
|
| void init();
|
| void setView(PassRefPtrWillBeRawPtr<FrameView>);
|
| @@ -189,10 +190,12 @@ public:
|
|
|
| bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
|
|
|
| + ServiceRegistry* serviceRegistry() { return m_serviceRegistry; }
|
| +
|
| private:
|
| friend class FrameNavigationDisabler;
|
|
|
| - LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
|
| + LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*);
|
|
|
| bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) const;
|
|
|
| @@ -229,6 +232,8 @@ private:
|
| bool m_inViewSourceMode;
|
|
|
| RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
|
| +
|
| + ServiceRegistry* const m_serviceRegistry;
|
| };
|
|
|
| inline void LocalFrame::init()
|
|
|