| Index: third_party/WebKit/Source/core/frame/WebLocalFrameBase.h
|
| diff --git a/third_party/WebKit/Source/core/frame/WebLocalFrameBase.h b/third_party/WebKit/Source/core/frame/WebLocalFrameBase.h
|
| index 340ad4ff12ca97d6ee82bb5c7efc3d1d2ba72b44..e3c38dfc492a3fb4058a33f08e1d890fcc763b08 100644
|
| --- a/third_party/WebKit/Source/core/frame/WebLocalFrameBase.h
|
| +++ b/third_party/WebKit/Source/core/frame/WebLocalFrameBase.h
|
| @@ -10,9 +10,11 @@
|
|
|
| namespace blink {
|
|
|
| +class FrameOwner;
|
| class FrameView;
|
| class LocalFrame;
|
| class Node;
|
| +class Page;
|
| class WebFrameClient;
|
| class WebTextCheckClient;
|
| class WebViewBase;
|
| @@ -25,7 +27,8 @@ class WebViewBase;
|
| // cyclic dependencies in web/ and move classes from web/ into core/ or
|
| // modules.
|
| // TODO(slangley): Remove this class once WebLocalFrameImpl is in core/.
|
| -class WebLocalFrameBase : public WebLocalFrame {
|
| +class WebLocalFrameBase : public GarbageCollectedFinalized<WebLocalFrameBase>,
|
| + public WebLocalFrame {
|
| public:
|
| CORE_EXPORT static WebLocalFrameBase* FromFrame(LocalFrame*);
|
| CORE_EXPORT static WebLocalFrameBase* FromFrame(LocalFrame&);
|
| @@ -37,6 +40,11 @@ class WebLocalFrameBase : public WebLocalFrame {
|
| virtual void ClearContextMenuNode() = 0;
|
| virtual LocalFrame* GetFrame() const = 0;
|
| virtual FrameView* GetFrameView() const = 0;
|
| + virtual void InitializeCoreFrame(Page&,
|
| + FrameOwner*,
|
| + const AtomicString& name) = 0;
|
| +
|
| + DEFINE_INLINE_VIRTUAL_TRACE() {}
|
|
|
| protected:
|
| explicit WebLocalFrameBase(WebTreeScopeType scope) : WebLocalFrame(scope) {}
|
|
|