| Index: Source/core/frame/DOMWindowProperty.h
|
| diff --git a/Source/core/frame/DOMWindowProperty.h b/Source/core/frame/DOMWindowProperty.h
|
| index 38060a06842ecfc984f53a5cd47352721934bccc..cecd22c179edd9eae04b207199dd4906faba7fec 100644
|
| --- a/Source/core/frame/DOMWindowProperty.h
|
| +++ b/Source/core/frame/DOMWindowProperty.h
|
| @@ -30,17 +30,19 @@
|
|
|
| namespace blink {
|
|
|
| -class LocalDOMWindow;
|
| +class DOMWindow;
|
| class LocalFrame;
|
| +class Frame;
|
|
|
| class DOMWindowProperty : public WillBeGarbageCollectedMixin {
|
| public:
|
| - explicit DOMWindowProperty(LocalFrame*);
|
| + explicit DOMWindowProperty(Frame*);
|
|
|
| virtual void willDestroyGlobalObjectInFrame();
|
| virtual void willDetachGlobalObjectFromFrame();
|
|
|
| - LocalFrame* frame() const { return m_frame; }
|
| + LocalFrame* localFrame() const;
|
| + Frame* frame() const { return m_frame; }
|
|
|
| virtual void trace(Visitor*);
|
|
|
| @@ -49,11 +51,11 @@ protected:
|
| virtual ~DOMWindowProperty();
|
| #endif
|
|
|
| - RawPtrWillBeWeakMember<LocalFrame> m_frame;
|
| + RawPtrWillBeWeakMember<Frame> m_frame;
|
|
|
| #if !ENABLE(OILPAN)
|
| private:
|
| - LocalDOMWindow* m_associatedDOMWindow;
|
| + DOMWindow* m_associatedDOMWindow;
|
| #endif
|
| };
|
|
|
|
|