| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 if (injectedScript.isEmpty()) | 121 if (injectedScript.isEmpty()) |
| 122 *errorString = "Execution context with given id not found."; | 122 *errorString = "Execution context with given id not found."; |
| 123 return injectedScript; | 123 return injectedScript; |
| 124 } | 124 } |
| 125 | 125 |
| 126 void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message) | 126 void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message) |
| 127 { | 127 { |
| 128 m_overlay->setPausedInDebuggerMessage(message); | 128 m_overlay->setPausedInDebuggerMessage(message); |
| 129 } | 129 } |
| 130 | 130 |
| 131 void PageDebuggerAgent::didClearWindowObjectInMainWorld(LocalFrame* frame) | 131 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
| 132 { | 132 { |
| 133 if (frame != m_pageAgent->mainFrame()) | 133 if (frame != m_pageAgent->mainFrame()) |
| 134 return; | 134 return; |
| 135 | 135 |
| 136 reset(); | 136 reset(); |
| 137 | 137 |
| 138 scriptDebugServer().setPreprocessorSource(String()); | 138 scriptDebugServer().setPreprocessorSource(String()); |
| 139 ASSERT(m_pageAgent); | 139 ASSERT(m_pageAgent); |
| 140 if (!m_pageAgent->scriptPreprocessorSource().isEmpty()) | 140 if (!m_pageAgent->scriptPreprocessorSource().isEmpty()) |
| 141 scriptDebugServer().setPreprocessorSource(m_pageAgent->scriptPreprocesso
rSource()); | 141 scriptDebugServer().setPreprocessorSource(m_pageAgent->scriptPreprocesso
rSource()); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 157 | 157 |
| 158 void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader) | 158 void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader) |
| 159 { | 159 { |
| 160 LocalFrame* mainFrame = frame->page()->mainFrame(); | 160 LocalFrame* mainFrame = frame->page()->mainFrame(); |
| 161 if (loader->frame() == mainFrame) | 161 if (loader->frame() == mainFrame) |
| 162 pageDidCommitLoad(); | 162 pageDidCommitLoad(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 } // namespace WebCore | 165 } // namespace WebCore |
| 166 | 166 |
| OLD | NEW |