Title: [186558] branches/safari-600.1.4.17-branch/Source/WebCore
- Revision
- 186558
- Author
- matthew_han...@apple.com
- Date
- 2015-07-08 18:03:48 -0700 (Wed, 08 Jul 2015)
Log Message
Merge r183838. rdar://problem/21716569
Modified Paths
Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186557 => 186558)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-09 01:03:43 UTC (rev 186557)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-09 01:03:48 UTC (rev 186558)
@@ -1,5 +1,23 @@
2015-07-08 Matthew Hanson <matthew_han...@apple.com>
+ Merge r183838. rdar://problem/21716569
+
+ 2015-05-05 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Crash under WebCore::domWindowFromExecState reloading page with inspector open
+ https://bugs.webkit.org/show_bug.cgi?id=144636
+
+ Reviewed by Mark Lam.
+
+ This ensures we create an InjectedScript for the execution context
+ (frame) preventing the global object / exec state from getting garbage
+ collected before we remove it from our map.
+
+ * inspector/PageRuntimeAgent.cpp:
+ (WebCore::PageRuntimeAgent::notifyContextCreated):
+
+2015-07-08 Matthew Hanson <matthew_han...@apple.com>
+
Merge r183436. rdar://problem/21716524
2015-04-27 Daniel Bates <daba...@apple.com>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp (186557 => 186558)
--- branches/safari-600.1.4.17-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-07-09 01:03:43 UTC (rev 186557)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-07-09 01:03:48 UTC (rev 186558)
@@ -174,8 +174,13 @@
void PageRuntimeAgent::notifyContextCreated(const String& frameId, JSC::ExecState* scriptState, SecurityOrigin* securityOrigin, bool isPageContext)
{
ASSERT(securityOrigin || isPageContext);
+
+ InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
+ if (result.hasNoValue())
+ return;
+
int executionContextId = injectedScriptManager()->injectedScriptIdFor(scriptState);
- String name = securityOrigin ? securityOrigin->toRawString() : "";
+ String name = securityOrigin ? securityOrigin->toRawString() : String();
m_frontendDispatcher->executionContextCreated(ExecutionContextDescription::create()
.setId(executionContextId)
.setIsPageContext(isPageContext)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
