Title: [172086] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172086
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:41:11 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r172006. <rdar://problem/17856494>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172085 => 172086)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:39:21 UTC (rev 172085)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:41:11 UTC (rev 172086)
@@ -1,5 +1,21 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r172006
+
+ 2014-08-04 Joseph Pecoraro <pecor...@apple.com>
+
+ Always clear ConsoleClient when Page/WindowShell is destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=135569
+
+ Reviewed by Mark Lam.
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::~ScriptController):
+ Whenever a window shell goes away, clear the console client.
+ We did this in clearWindowShell but not before destroying.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171973
2014-08-02 Jeremy Jones <jere...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptController.cpp (172085 => 172086)
--- branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptController.cpp 2014-08-05 21:39:21 UTC (rev 172085)
+++ branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptController.cpp 2014-08-05 21:41:11 UTC (rev 172086)
@@ -94,8 +94,11 @@
// It's likely that destroying m_windowShells will create a lot of garbage.
if (!m_windowShells.isEmpty()) {
- while (!m_windowShells.isEmpty())
- destroyWindowShell(*m_windowShells.begin()->key);
+ while (!m_windowShells.isEmpty()) {
+ ShellMap::iterator iter = m_windowShells.begin();
+ iter->value->window()->setConsoleClient(nullptr);
+ destroyWindowShell(*iter->key);
+ }
gcController().garbageCollectSoon();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
