| OLD | NEW |
| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 InspectorInspectorAgent::~InspectorInspectorAgent() | 64 InspectorInspectorAgent::~InspectorInspectorAgent() |
| 65 { | 65 { |
| 66 #if !ENABLE(OILPAN) | 66 #if !ENABLE(OILPAN) |
| 67 m_instrumentingAgents->setInspectorInspectorAgent(0); | 67 m_instrumentingAgents->setInspectorInspectorAgent(0); |
| 68 #endif | 68 #endif |
| 69 } | 69 } |
| 70 | 70 |
| 71 void InspectorInspectorAgent::trace(Visitor* visitor) | 71 void InspectorInspectorAgent::trace(Visitor* visitor) |
| 72 { | 72 { |
| 73 visitor->trace(m_inspectedPage); | 73 visitor->trace(m_inspectedPage); |
| 74 visitor->trace(m_injectedScriptManager); |
| 74 InspectorBaseAgent::trace(visitor); | 75 InspectorBaseAgent::trace(visitor); |
| 75 } | 76 } |
| 76 | 77 |
| 77 void InspectorInspectorAgent::didClearDocumentOfWindowObject(LocalFrame* frame) | 78 void InspectorInspectorAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
| 78 { | 79 { |
| 79 if (m_injectedScriptForOrigin.isEmpty()) | 80 if (m_injectedScriptForOrigin.isEmpty()) |
| 80 return; | 81 return; |
| 81 | 82 |
| 82 String origin = frame->document()->securityOrigin()->toRawString(); | 83 String origin = frame->document()->securityOrigin()->toRawString(); |
| 83 String script = m_injectedScriptForOrigin.get(origin); | 84 String script = m_injectedScriptForOrigin.get(origin); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 m_frontend->inspector()->inspect(objectToInspect, hints); | 161 m_frontend->inspector()->inspect(objectToInspect, hints); |
| 161 m_pendingInspectData.first = nullptr; | 162 m_pendingInspectData.first = nullptr; |
| 162 m_pendingInspectData.second = nullptr; | 163 m_pendingInspectData.second = nullptr; |
| 163 return; | 164 return; |
| 164 } | 165 } |
| 165 m_pendingInspectData.first = objectToInspect; | 166 m_pendingInspectData.first = objectToInspect; |
| 166 m_pendingInspectData.second = hints; | 167 m_pendingInspectData.second = hints; |
| 167 } | 168 } |
| 168 | 169 |
| 169 } // namespace WebCore | 170 } // namespace WebCore |
| OLD | NEW |