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

Side by Side Diff: Source/core/frame/DOMWindow.cpp

Issue 115293005: Add a layer of indirection between Frame and Page (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Make GCC happy Created 7 years 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
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 { 534 {
535 return frame() ? frame()->page() : 0; 535 return frame() ? frame()->page() : 0;
536 } 536 }
537 537
538 void DOMWindow::frameDestroyed() 538 void DOMWindow::frameDestroyed()
539 { 539 {
540 FrameDestructionObserver::frameDestroyed(); 540 FrameDestructionObserver::frameDestroyed();
541 reset(); 541 reset();
542 } 542 }
543 543
544 void DOMWindow::willDetachPage() 544 void DOMWindow::willDetachFrameHost()
545 { 545 {
546 InspectorInstrumentation::frameWindowDiscarded(m_frame, this); 546 InspectorInstrumentation::frameWindowDiscarded(m_frame, this);
547 } 547 }
548 548
549 void DOMWindow::willDestroyDocumentInFrame() 549 void DOMWindow::willDestroyDocumentInFrame()
550 { 550 {
551 // It is necessary to copy m_properties to a separate vector because the DOM WindowProperties may 551 // It is necessary to copy m_properties to a separate vector because the DOM WindowProperties may
552 // unregister themselves from the DOMWindow as a result of the call to willD estroyGlobalObjectInFrame. 552 // unregister themselves from the DOMWindow as a result of the call to willD estroyGlobalObjectInFrame.
553 Vector<DOMWindowProperty*> properties; 553 Vector<DOMWindowProperty*> properties;
554 copyToVector(m_properties, properties); 554 copyToVector(m_properties, properties);
(...skipping 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1877 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier()); 1877 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier());
1878 } 1878 }
1879 1879
1880 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() 1880 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier()
1881 { 1881 {
1882 return DOMWindowLifecycleNotifier::create(this); 1882 return DOMWindowLifecycleNotifier::create(this);
1883 } 1883 }
1884 1884
1885 1885
1886 } // namespace WebCore 1886 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698