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

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

Issue 146693005: Clarify when what notifications are send when a window object is cleared (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: updates Created 6 years, 7 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 m_instrumentingAgents->setInspectorInspectorAgent(0); 66 m_instrumentingAgents->setInspectorInspectorAgent(0);
67 } 67 }
68 68
69 void InspectorInspectorAgent::didClearWindowObjectInMainWorld(LocalFrame* frame) 69 void InspectorInspectorAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
70 { 70 {
71 if (m_injectedScriptForOrigin.isEmpty()) 71 if (m_injectedScriptForOrigin.isEmpty())
72 return; 72 return;
73 73
74 String origin = frame->document()->securityOrigin()->toRawString(); 74 String origin = frame->document()->securityOrigin()->toRawString();
75 String script = m_injectedScriptForOrigin.get(origin); 75 String script = m_injectedScriptForOrigin.get(origin);
76 if (script.isEmpty()) 76 if (script.isEmpty())
77 return; 77 return;
78 int injectedScriptId = m_injectedScriptManager->injectedScriptIdFor(ScriptSt ate::forMainWorld(frame)); 78 int injectedScriptId = m_injectedScriptManager->injectedScriptIdFor(ScriptSt ate::forMainWorld(frame));
79 StringBuilder scriptSource; 79 StringBuilder scriptSource;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 m_frontend->inspector()->inspect(objectToInspect, hints); 152 m_frontend->inspector()->inspect(objectToInspect, hints);
153 m_pendingInspectData.first = nullptr; 153 m_pendingInspectData.first = nullptr;
154 m_pendingInspectData.second = nullptr; 154 m_pendingInspectData.second = nullptr;
155 return; 155 return;
156 } 156 }
157 m_pendingInspectData.first = objectToInspect; 157 m_pendingInspectData.first = objectToInspect;
158 m_pendingInspectData.second = hints; 158 m_pendingInspectData.second = hints;
159 } 159 }
160 160
161 } // namespace WebCore 161 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698