| Index: third_party/WebKit/Source/web/WebLocalFrameImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.h b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
|
| index a1368f5fbe41e419dc1921d4cf2bae2cdb839dfc..61ba372da875e7160f035dc6e78db8c7d576aa51 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
|
| @@ -52,6 +52,7 @@ class GeolocationClientProxy;
|
| class IntSize;
|
| class KURL;
|
| class Range;
|
| +class ServiceRegistry;
|
| class SharedWorkerRepositoryClientImpl;
|
| class TextFinder;
|
| class WebAutofillClient;
|
| @@ -261,8 +262,8 @@ public:
|
| void willBeDetached();
|
| void willDetachParent();
|
|
|
| - static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame* opener);
|
| - static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame*, WebSandboxFlags, const WebFrameOwnerProperties&);
|
| + static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame* opener, ServiceRegistry*);
|
| + static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame*, WebSandboxFlags, const WebFrameOwnerProperties&, ServiceRegistry*);
|
| ~WebLocalFrameImpl() override;
|
|
|
| PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*);
|
| @@ -351,8 +352,8 @@ public:
|
| private:
|
| friend class FrameLoaderClientImpl;
|
|
|
| - WebLocalFrameImpl(WebTreeScopeType, WebFrameClient*);
|
| - WebLocalFrameImpl(WebRemoteFrame*, WebFrameClient*);
|
| + WebLocalFrameImpl(WebTreeScopeType, WebFrameClient*, ServiceRegistry*);
|
| + WebLocalFrameImpl(WebRemoteFrame*, WebFrameClient*, ServiceRegistry*);
|
|
|
| // Inherited from WebFrame, but intentionally hidden: it never makes sense
|
| // to call these on a WebLocalFrameImpl.
|
| @@ -405,6 +406,8 @@ private:
|
|
|
| HashMap<AtomicString, OwnPtr<WebTestInterfaceFactory>> m_testInterfaces;
|
|
|
| + ServiceRegistry* const m_serviceRegistry;
|
| +
|
| #if ENABLE(OILPAN)
|
| // Oilpan: WebLocalFrameImpl must remain alive until close() is called.
|
| // Accomplish that by keeping a self-referential Persistent<>. It is
|
|
|