diff options
Diffstat (limited to 'WebCore/bindings/js/ScheduledAction.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScheduledAction.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/bindings/js/ScheduledAction.cpp b/WebCore/bindings/js/ScheduledAction.cpp index be62bb8..8fc860b 100644 --- a/WebCore/bindings/js/ScheduledAction.cpp +++ b/WebCore/bindings/js/ScheduledAction.cpp @@ -24,7 +24,6 @@ #include "config.h" #include "ScheduledAction.h" -#include "CString.h" #include "DOMWindow.h" #include "Document.h" #include "Frame.h" @@ -55,7 +54,7 @@ PassOwnPtr<ScheduledAction> ScheduledAction::create(ExecState* exec, const ArgLi UString string = v.toString(exec); if (exec->hadException()) return 0; - return new ScheduledAction(string, isolatedWorld); + return new ScheduledAction(ustringToString(string), isolatedWorld); } ArgList argsTail; args.getSlice(2, argsTail); @@ -117,7 +116,7 @@ void ScheduledAction::execute(Document* document) return; RefPtr<Frame> frame = window->impl()->frame(); - if (!frame || !frame->script()->canExecuteScripts()) + if (!frame || !frame->script()->canExecuteScripts(AboutToExecuteScript)) return; frame->script()->setProcessingTimerCallback(true); |