| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 LocalFrame* frame() const { return m_frame; } | 43 LocalFrame* frame() const { return m_frame; } |
| 44 | 44 |
| 45 virtual void trace(Visitor*); | 45 virtual void trace(Visitor*); |
| 46 | 46 |
| 47 protected: | 47 protected: |
| 48 #if !ENABLE(OILPAN) | 48 #if !ENABLE(OILPAN) |
| 49 virtual ~DOMWindowProperty(); | 49 virtual ~DOMWindowProperty(); |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 LocalFrame* m_frame; | 52 RawPtrWillBeWeakMember<LocalFrame> m_frame; |
| 53 RawPtrWillBeMember<LocalDOMWindow> m_associatedDOMWindow; | 53 |
| 54 #if !ENABLE(OILPAN) |
| 55 private: |
| 56 LocalDOMWindow* m_associatedDOMWindow; |
| 57 #endif |
| 54 }; | 58 }; |
| 55 | 59 |
| 56 } | 60 } // namespace blink |
| 57 | 61 |
| 58 #endif | 62 #endif |
| OLD | NEW |