| OLD | NEW |
| 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 28 matching lines...) Expand all Loading... |
| 39 explicit DOMWindowProperty(LocalFrame*); | 39 explicit DOMWindowProperty(LocalFrame*); |
| 40 | 40 |
| 41 virtual void willDestroyGlobalObjectInFrame(); | 41 virtual void willDestroyGlobalObjectInFrame(); |
| 42 virtual void willDetachGlobalObjectFromFrame(); | 42 virtual void willDetachGlobalObjectFromFrame(); |
| 43 | 43 |
| 44 LocalFrame* frame() const { return m_frame; } | 44 LocalFrame* frame() const { return m_frame; } |
| 45 | 45 |
| 46 DECLARE_VIRTUAL_TRACE(); | 46 DECLARE_VIRTUAL_TRACE(); |
| 47 | 47 |
| 48 protected: | 48 protected: |
| 49 // TODO(Oilpan): when ~DOMWindowProperty is removed, check classes that deri
ve |
| 50 // from it. Several will then be able to derive from GarbageCollected<> inst
ead. |
| 49 #if !ENABLE(OILPAN) | 51 #if !ENABLE(OILPAN) |
| 50 virtual ~DOMWindowProperty(); | 52 virtual ~DOMWindowProperty(); |
| 51 #endif | 53 #endif |
| 52 | 54 |
| 53 RawPtrWillBeMember<LocalFrame> m_frame; | 55 RawPtrWillBeMember<LocalFrame> m_frame; |
| 54 | 56 |
| 55 #if !ENABLE(OILPAN) | 57 #if !ENABLE(OILPAN) |
| 56 private: | 58 private: |
| 57 LocalDOMWindow* m_associatedDOMWindow; | 59 LocalDOMWindow* m_associatedDOMWindow; |
| 58 #endif | 60 #endif |
| 59 }; | 61 }; |
| 60 | 62 |
| 61 } // namespace blink | 63 } // namespace blink |
| 62 | 64 |
| 63 #endif | 65 #endif |
| OLD | NEW |