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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2035653006: [DevTools] Move Console to v8 inspector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved api a bit Created 4 years, 5 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/fetch/ResourceFetcher.h" 43 #include "core/fetch/ResourceFetcher.h"
44 #include "core/frame/EventHandlerRegistry.h" 44 #include "core/frame/EventHandlerRegistry.h"
45 #include "core/frame/FrameConsole.h" 45 #include "core/frame/FrameConsole.h"
46 #include "core/frame/FrameHost.h" 46 #include "core/frame/FrameHost.h"
47 #include "core/frame/FrameView.h" 47 #include "core/frame/FrameView.h"
48 #include "core/frame/LocalDOMWindow.h" 48 #include "core/frame/LocalDOMWindow.h"
49 #include "core/frame/Settings.h" 49 #include "core/frame/Settings.h"
50 #include "core/html/HTMLFrameElementBase.h" 50 #include "core/html/HTMLFrameElementBase.h"
51 #include "core/html/HTMLPlugInElement.h" 51 #include "core/html/HTMLPlugInElement.h"
52 #include "core/input/EventHandler.h" 52 #include "core/input/EventHandler.h"
53 #include "core/inspector/ConsoleMessageStorage.h"
54 #include "core/inspector/InspectorInstrumentation.h" 53 #include "core/inspector/InspectorInstrumentation.h"
55 #include "core/layout/HitTestResult.h" 54 #include "core/layout/HitTestResult.h"
56 #include "core/layout/LayoutView.h" 55 #include "core/layout/LayoutView.h"
57 #include "core/layout/api/LayoutViewItem.h" 56 #include "core/layout/api/LayoutViewItem.h"
58 #include "core/layout/compositing/PaintLayerCompositor.h" 57 #include "core/layout/compositing/PaintLayerCompositor.h"
59 #include "core/loader/FrameLoadRequest.h" 58 #include "core/loader/FrameLoadRequest.h"
60 #include "core/loader/FrameLoaderClient.h" 59 #include "core/loader/FrameLoaderClient.h"
61 #include "core/loader/NavigationScheduler.h" 60 #include "core/loader/NavigationScheduler.h"
62 #include "core/page/ChromeClient.h" 61 #include "core/page/ChromeClient.h"
63 #include "core/page/FocusController.h" 62 #include "core/page/FocusController.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 // - LocalFrameLifecycleObserver::willDetachFrameHost() will have 470 // - LocalFrameLifecycleObserver::willDetachFrameHost() will have
472 // signalled the Inspector frameWindowDiscarded() notifications. 471 // signalled the Inspector frameWindowDiscarded() notifications.
473 // We assume that all LocalFrames are detached, where that notification 472 // We assume that all LocalFrames are detached, where that notification
474 // will have been done. 473 // will have been done.
475 // 474 //
476 // - Calling LocalDOMWindow::reset() is not needed (called from 475 // - Calling LocalDOMWindow::reset() is not needed (called from
477 // Frame::setDOMWindow().) The Member references it clears will now 476 // Frame::setDOMWindow().) The Member references it clears will now
478 // die with the window. And the registered DOMWindowProperty instances th at don't, 477 // die with the window. And the registered DOMWindowProperty instances th at don't,
479 // only keep a weak reference to this frame, so there's no need to be 478 // only keep a weak reference to this frame, so there's no need to be
480 // explicitly notified that this frame is going away. 479 // explicitly notified that this frame is going away.
481 if (m_domWindow && host())
482 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get());
483 if (domWindow) 480 if (domWindow)
484 script().clearWindowProxy(); 481 script().clearWindowProxy();
485 482
486 if (m_domWindow) 483 if (m_domWindow)
487 m_domWindow->reset(); 484 m_domWindow->reset();
488 m_domWindow = domWindow; 485 m_domWindow = domWindow;
489 } 486 }
490 487
491 Document* LocalFrame::document() const 488 Document* LocalFrame::document() const
492 { 489 {
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 m_frame->client()->frameBlameContext()->Enter(); 866 m_frame->client()->frameBlameContext()->Enter();
870 } 867 }
871 868
872 ScopedFrameBlamer::~ScopedFrameBlamer() 869 ScopedFrameBlamer::~ScopedFrameBlamer()
873 { 870 {
874 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 871 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
875 m_frame->client()->frameBlameContext()->Leave(); 872 m_frame->client()->frameBlameContext()->Leave();
876 } 873 }
877 874
878 } // namespace blink 875 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698