| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 } | 537 } |
| 538 | 538 |
| 539 Page* LocalDOMWindow::page() | 539 Page* LocalDOMWindow::page() |
| 540 { | 540 { |
| 541 return frame() ? frame()->page() : 0; | 541 return frame() ? frame()->page() : 0; |
| 542 } | 542 } |
| 543 | 543 |
| 544 void LocalDOMWindow::frameDestroyed() | 544 void LocalDOMWindow::frameDestroyed() |
| 545 { | 545 { |
| 546 FrameDestructionObserver::frameDestroyed(); | 546 FrameDestructionObserver::frameDestroyed(); |
| 547 reset(); | 547 willDestroyDocumentInFrame(); |
| 548 m_properties.clear(); |
| 548 } | 549 } |
| 549 | 550 |
| 550 void LocalDOMWindow::willDetachFrameHost() | 551 void LocalDOMWindow::willDetachFrameHost() |
| 551 { | 552 { |
| 552 m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this); | 553 m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this); |
| 553 m_frame->console().messageStorage()->frameWindowDiscarded(this); | 554 m_frame->console().messageStorage()->frameWindowDiscarded(this); |
| 554 InspectorInstrumentation::frameWindowDiscarded(m_frame, this); | 555 InspectorInstrumentation::frameWindowDiscarded(m_frame, this); |
| 555 } | 556 } |
| 556 | 557 |
| 557 void LocalDOMWindow::willDestroyDocumentInFrame() | 558 void LocalDOMWindow::willDestroyDocumentInFrame() |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1920 LifecycleContext<LocalDOMWindow>::trace(visitor); | 1921 LifecycleContext<LocalDOMWindow>::trace(visitor); |
| 1921 } | 1922 } |
| 1922 | 1923 |
| 1923 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte
xt, v8::Isolate* isolate) | 1924 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte
xt, v8::Isolate* isolate) |
| 1924 { | 1925 { |
| 1925 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8]. | 1926 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8]. |
| 1926 return v8::Handle<v8::Object>(); | 1927 return v8::Handle<v8::Object>(); |
| 1927 } | 1928 } |
| 1928 | 1929 |
| 1929 } // namespace blink | 1930 } // namespace blink |
| OLD | NEW |