Title: [95420] branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp
- Revision
- 95420
- Author
- infe...@chromium.org
- Date
- 2011-09-19 09:35:44 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94820 - REGRESSION (r66874): Missing RefPtr in ScriptController
BUG=95669
Review URL: http://codereview.chromium.org/7946004
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp (95419 => 95420)
--- branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-19 16:33:47 UTC (rev 95419)
+++ branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-19 16:35:44 UTC (rev 95420)
@@ -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
