From ae3aa314b17e0493534a2f5bfaba233f228bfc18 Mon Sep 17 00:00:00 2001 From: "weinig@apple.com" Date: Thu, 13 Mar 2008 07:11:26 +0000 Subject: [PATCH] Reviewed by Darin Adler. Fix Crash loading QT movies @ apple.com/ipodtouch/features.html with a PAC file (WebKitThreadingException) Make bridged RuntimeObjects get collected on the main thread only. This is necessary because clients of the bridged objects are unlikely to prepared for a collection on non-main thread, which can happen with a PAC file. * bridge/runtime_object.cpp: (RuntimeObjectImp::RuntimeObjectImp): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31026 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 14 ++++++++++++++ WebCore/bridge/runtime_object.cpp | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 389e936..a8b8999 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2008-03-12 Sam Weinig + + Reviewed by Darin Adler. + + Fix + Crash loading QT movies @ apple.com/ipodtouch/features.html with a PAC file (WebKitThreadingException) + + Make bridged RuntimeObjects get collected on the main thread only. This is necessary + because clients of the bridged objects are unlikely to prepared for a collection on + non-main thread, which can happen with a PAC file. + + * bridge/runtime_object.cpp: + (RuntimeObjectImp::RuntimeObjectImp): + 2008-03-12 Adam Roben Fix Bug 17815: Inspector's DOM tree should descend into subframes diff --git a/WebCore/bridge/runtime_object.cpp b/WebCore/bridge/runtime_object.cpp index 62f3989..248f12a 100644 --- a/WebCore/bridge/runtime_object.cpp +++ b/WebCore/bridge/runtime_object.cpp @@ -35,9 +35,10 @@ using namespace Bindings; const ClassInfo RuntimeObjectImp::info = { "RuntimeObject", 0, 0 }; RuntimeObjectImp::RuntimeObjectImp(PassRefPtr i) -: instance(i) + : instance(i) { instance->rootObject()->addRuntimeObject(this); + Collector::collectOnMainThreadOnly(this); } RuntimeObjectImp::~RuntimeObjectImp() -- 1.8.3.1