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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 void PageRuntimeAgent::restore() | 86 void PageRuntimeAgent::restore() |
87 { | 87 { |
88 if (m_state->getBoolean(PageRuntimeAgentState::runtimeEnabled)) { | 88 if (m_state->getBoolean(PageRuntimeAgentState::runtimeEnabled)) { |
89 String error; | 89 String error; |
90 enable(&error); | 90 enable(&error); |
91 } | 91 } |
92 } | 92 } |
93 | 93 |
94 void PageRuntimeAgent::enable(ErrorString* errorString) | 94 void PageRuntimeAgent::enable(ErrorString* errorString) |
95 { | 95 { |
96 if (m_enabled) | 96 // We should still report as likely we have a freshly loaded client that |
97 return; | 97 // needs the list of execution contexts. |
| 98 // if (m_enabled) |
| 99 // return; |
98 | 100 |
99 InspectorRuntimeAgent::enable(errorString); | 101 InspectorRuntimeAgent::enable(errorString); |
100 m_state->setBoolean(PageRuntimeAgentState::runtimeEnabled, true); | 102 m_state->setBoolean(PageRuntimeAgentState::runtimeEnabled, true); |
101 // Only report existing contexts if the page did commit load, otherwise we m
ay | 103 // Only report existing contexts if the page did commit load, otherwise we m
ay |
102 // unintentionally initialize contexts in the frames which may trigger some
listeners | 104 // unintentionally initialize contexts in the frames which may trigger some
listeners |
103 // that are expected to be triggered only after the load is committed, see h
ttp://crbug.com/131623 | 105 // that are expected to be triggered only after the load is committed, see h
ttp://crbug.com/131623 |
104 if (m_mainWorldContextCreated) | 106 if (m_mainWorldContextCreated) |
105 reportExecutionContextCreation(); | 107 reportExecutionContextCreation(); |
106 } | 108 } |
107 | 109 |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 .setIsPageContext(isPageContext) | 208 .setIsPageContext(isPageContext) |
207 .setName(name) | 209 .setName(name) |
208 .setFrameId(frameId) | 210 .setFrameId(frameId) |
209 .setLanguage(scriptState->isJavaScript() ? "JavaScript" : "Dart") | 211 .setLanguage(scriptState->isJavaScript() ? "JavaScript" : "Dart") |
210 .setLibraryId(scriptState->libraryId()) | 212 .setLibraryId(scriptState->libraryId()) |
211 .release()); | 213 .release()); |
212 } | 214 } |
213 | 215 |
214 } // namespace WebCore | 216 } // namespace WebCore |
215 | 217 |
OLD | NEW |