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

Side by Side Diff: Source/core/inspector/InspectorInspectorAgent.cpp

Issue 307943002: Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added agents() Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * Copyright (C) 2011 Google Inc. All rights reserved. 4 * Copyright (C) 2011 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 : InspectorBaseAgent<InspectorInspectorAgent>("Inspector") 56 : InspectorBaseAgent<InspectorInspectorAgent>("Inspector")
57 , m_inspectedPage(page) 57 , m_inspectedPage(page)
58 , m_frontend(0) 58 , m_frontend(0)
59 , m_injectedScriptManager(injectedScriptManager) 59 , m_injectedScriptManager(injectedScriptManager)
60 { 60 {
61 ASSERT_ARG(page, page); 61 ASSERT_ARG(page, page);
62 } 62 }
63 63
64 InspectorInspectorAgent::~InspectorInspectorAgent() 64 InspectorInspectorAgent::~InspectorInspectorAgent()
65 { 65 {
66 #if !ENABLE(OILPAN)
66 m_instrumentingAgents->setInspectorInspectorAgent(0); 67 m_instrumentingAgents->setInspectorInspectorAgent(0);
Mads Ager (chromium) 2014/06/11 06:20:48 The lifetime is not completely clear to me here. m
keishi 2014/06/11 14:10:53 I've confirmed that InstrumentingAgents does not o
68 #endif
69 }
70
71 void InspectorInspectorAgent::trace(Visitor* visitor)
72 {
73 visitor->trace(m_inspectedPage);
74 InspectorBaseAgent::trace(visitor);
67 } 75 }
68 76
69 void InspectorInspectorAgent::didClearDocumentOfWindowObject(LocalFrame* frame) 77 void InspectorInspectorAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
70 { 78 {
71 if (m_injectedScriptForOrigin.isEmpty()) 79 if (m_injectedScriptForOrigin.isEmpty())
72 return; 80 return;
73 81
74 String origin = frame->document()->securityOrigin()->toRawString(); 82 String origin = frame->document()->securityOrigin()->toRawString();
75 String script = m_injectedScriptForOrigin.get(origin); 83 String script = m_injectedScriptForOrigin.get(origin);
76 if (script.isEmpty()) 84 if (script.isEmpty())
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 m_frontend->inspector()->inspect(objectToInspect, hints); 160 m_frontend->inspector()->inspect(objectToInspect, hints);
153 m_pendingInspectData.first = nullptr; 161 m_pendingInspectData.first = nullptr;
154 m_pendingInspectData.second = nullptr; 162 m_pendingInspectData.second = nullptr;
155 return; 163 return;
156 } 164 }
157 m_pendingInspectData.first = objectToInspect; 165 m_pendingInspectData.first = objectToInspect;
158 m_pendingInspectData.second = hints; 166 m_pendingInspectData.second = hints;
159 } 167 }
160 168
161 } // namespace WebCore 169 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698