Title: [94820] trunk/Source/WebCore
- Revision
- 94820
- Author
- a...@apple.com
- Date
- 2011-09-08 16:35:09 -0700 (Thu, 08 Sep 2011)
Log Message
REGRESSION (r66874): Missing RefPtr in ScriptController
https://bugs.webkit.org/show_bug.cgi?id=67748
Reviewed by Adam Barth.
* bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::executeScript):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94819 => 94820)
--- trunk/Source/WebCore/ChangeLog 2011-09-08 23:30:53 UTC (rev 94819)
+++ trunk/Source/WebCore/ChangeLog 2011-09-08 23:35:09 UTC (rev 94820)
@@ -1,3 +1,12 @@
+2011-09-08 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r66874): Missing RefPtr in ScriptController
+ https://bugs.webkit.org/show_bug.cgi?id=67748
+
+ Reviewed by Adam Barth.
+
+ * bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::executeScript):
+
2011-09-08 Adam Barth <aba...@webkit.org>
Second attempt to fix Chromium build.
Modified: trunk/Source/WebCore/bindings/ScriptControllerBase.cpp (94819 => 94820)
--- trunk/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-08 23:30:53 UTC (rev 94819)
+++ trunk/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-08 23:35:09 UTC (rev 94820)
@@ -67,6 +67,8 @@
bool wasInExecuteScript = m_inExecuteScript;
m_inExecuteScript = true;
+ RefPtr<Frame> protect(m_frame); // Script execution can destroy the frame, and thus the ScriptController.
+
ScriptValue result = evaluate(sourceCode);
if (!wasInExecuteScript) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
