Chromium Code Reviews| Index: third_party/WebKit/public/web/WebLocalFrame.h |
| diff --git a/third_party/WebKit/public/web/WebLocalFrame.h b/third_party/WebKit/public/web/WebLocalFrame.h |
| index 2d0eeb2537b49bddb0045f679802a91c31a45fa1..744522935944f65718cfdf1f4a5be94f77040872 100644 |
| --- a/third_party/WebKit/public/web/WebLocalFrame.h |
| +++ b/third_party/WebKit/public/web/WebLocalFrame.h |
| @@ -13,6 +13,7 @@ namespace blink { |
| enum class WebAppBannerPromptReply; |
| enum class WebSandboxFlags; |
| enum class WebTreeScopeType; |
| +class ServiceRegistry; |
| class WebAutofillClient; |
| class WebContentSettingsClient; |
| class WebDevToolsAgent; |
| @@ -31,14 +32,14 @@ class WebLocalFrame : public WebFrame { |
| public: |
| // Creates a WebFrame. Delete this WebFrame by calling WebFrame::close(). |
| // It is valid to pass a null client pointer. |
| - BLINK_EXPORT static WebLocalFrame* create(WebTreeScopeType, WebFrameClient*, WebFrame* opener = nullptr); |
| + BLINK_EXPORT static WebLocalFrame* create(WebTreeScopeType, WebFrameClient*, WebFrame* opener = nullptr, ServiceRegistry* = nullptr); |
|
dcheng
2016/03/29 04:51:56
Hmm. Would it make more sense to have a WebFrameCl
esprehn
2016/03/29 05:26:20
In general I want WebFrameClient to die, it's a go
Sam McNally
2016/03/30 00:20:53
Done.
|
| // Used to create a provisional local frame in prepration for replacing a |
| // remote frame if the load commits. The returned frame is only partially |
| // attached to the frame tree: it has the same parent as its potential |
| // replacee but is invisible to the rest of the frames in the frame tree. |
| // If the load commits, call swap() to fully attach this frame. |
| - BLINK_EXPORT static WebLocalFrame* createProvisional(WebFrameClient*, WebRemoteFrame*, WebSandboxFlags, const WebFrameOwnerProperties&); |
| + BLINK_EXPORT static WebLocalFrame* createProvisional(WebFrameClient*, WebRemoteFrame*, WebSandboxFlags, const WebFrameOwnerProperties&, ServiceRegistry* = nullptr); |
| // Returns the WebFrame associated with the current V8 context. This |
| // function can return 0 if the context is associated with a Document that |