| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. | 2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. | 
| 3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions | 6  * modification, are permitted provided that the following conditions | 
| 7  * are met: | 7  * are met: | 
| 8  * 1. Redistributions of source code must retain the above copyright | 8  * 1. Redistributions of source code must retain the above copyright | 
| 9  *    notice, this list of conditions and the following disclaimer. | 9  *    notice, this list of conditions and the following disclaimer. | 
| 10  * 2. Redistributions in binary form must reproduce the above copyright | 10  * 2. Redistributions in binary form must reproduce the above copyright | 
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 336 | 336 | 
| 337         Page* page(); | 337         Page* page(); | 
| 338 | 338 | 
| 339         virtual void frameDestroyed() OVERRIDE; | 339         virtual void frameDestroyed() OVERRIDE; | 
| 340         virtual void willDetachFrameHost() OVERRIDE; | 340         virtual void willDetachFrameHost() OVERRIDE; | 
| 341 | 341 | 
| 342         void clearDocument(); | 342         void clearDocument(); | 
| 343         void resetDOMWindowProperties(); | 343         void resetDOMWindowProperties(); | 
| 344         void willDestroyDocumentInFrame(); | 344         void willDestroyDocumentInFrame(); | 
| 345 | 345 | 
| 346         RefPtr<Document> m_document; | 346         // FIXME: Oilpan: the need for this internal method will fall | 
|  | 347         // away when EventTargets are no longer using refcounts and | 
|  | 348         // window properties are also on the heap. Inline the minimal | 
|  | 349         // do-not-broadcast handling then and remove the enum + | 
|  | 350         // removeAllEventListenersInternal(). | 
|  | 351         enum BroadcastListenerRemoval { | 
|  | 352             DoNotBroadcastListenerRemoval, | 
|  | 353             DoBroadcastListenerRemoval | 
|  | 354         }; | 
|  | 355 | 
|  | 356         void removeAllEventListenersInternal(BroadcastListenerRemoval); | 
|  | 357 | 
|  | 358         RefPtrWillBeMember<Document> m_document; | 
| 347 | 359 | 
| 348         bool m_shouldPrintWhenFinishedLoading; | 360         bool m_shouldPrintWhenFinishedLoading; | 
| 349 #if ASSERT_ENABLED | 361 #if ASSERT_ENABLED | 
| 350         bool m_hasBeenReset; | 362         bool m_hasBeenReset; | 
| 351 #endif | 363 #endif | 
| 352 | 364 | 
| 353         HashSet<DOMWindowProperty*> m_properties; | 365         HashSet<DOMWindowProperty*> m_properties; | 
| 354 | 366 | 
| 355         mutable RefPtrWillBeMember<Screen> m_screen; | 367         mutable RefPtrWillBeMember<Screen> m_screen; | 
| 356         mutable RefPtrWillBeMember<History> m_history; | 368         mutable RefPtrWillBeMember<History> m_history; | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 386     } | 398     } | 
| 387 | 399 | 
| 388     inline String DOMWindow::defaultStatus() const | 400     inline String DOMWindow::defaultStatus() const | 
| 389     { | 401     { | 
| 390         return m_defaultStatus; | 402         return m_defaultStatus; | 
| 391     } | 403     } | 
| 392 | 404 | 
| 393 } // namespace WebCore | 405 } // namespace WebCore | 
| 394 | 406 | 
| 395 #endif // DOMWindow_h | 407 #endif // DOMWindow_h | 
| OLD | NEW | 
|---|