Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: Source/core/frame/DOMWindowProperty.h

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef DOMWindowProperty_h 26 #ifndef DOMWindowProperty_h
27 #define DOMWindowProperty_h 27 #define DOMWindowProperty_h
28 28
29 #include "platform/heap/Handle.h" 29 #include "platform/heap/Handle.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class LocalDOMWindow; 33 class DOMWindow;
34 class LocalFrame; 34 class LocalFrame;
35 class Frame;
35 36
36 class DOMWindowProperty : public WillBeGarbageCollectedMixin { 37 class DOMWindowProperty : public WillBeGarbageCollectedMixin {
37 public: 38 public:
38 explicit DOMWindowProperty(LocalFrame*); 39 explicit DOMWindowProperty(Frame*);
39 40
40 virtual void willDestroyGlobalObjectInFrame(); 41 virtual void willDestroyGlobalObjectInFrame();
41 virtual void willDetachGlobalObjectFromFrame(); 42 virtual void willDetachGlobalObjectFromFrame();
42 43
43 LocalFrame* frame() const { return m_frame; } 44 LocalFrame* localFrame() const;
45 Frame* frame() const { return m_frame; }
44 46
45 virtual void trace(Visitor*); 47 virtual void trace(Visitor*);
46 48
47 protected: 49 protected:
48 #if !ENABLE(OILPAN) 50 #if !ENABLE(OILPAN)
49 virtual ~DOMWindowProperty(); 51 virtual ~DOMWindowProperty();
50 #endif 52 #endif
51 53
52 RawPtrWillBeWeakMember<LocalFrame> m_frame; 54 RawPtrWillBeWeakMember<Frame> m_frame;
53 55
54 #if !ENABLE(OILPAN) 56 #if !ENABLE(OILPAN)
55 private: 57 private:
56 LocalDOMWindow* m_associatedDOMWindow; 58 DOMWindow* m_associatedDOMWindow;
57 #endif 59 #endif
58 }; 60 };
59 61
60 } // namespace blink 62 } // namespace blink
61 63
62 #endif 64 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698