Attachment 113965 Details for Bug 70289 – Patch in progress.

[patch] Patch in progress.

patchInProgress.diff (text/plain), 3.77 KB, created by Sam Weinig on 2011-11-07 17:28:28 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Weinig

Created: 2011-11-07 17:28:28 PST

Size: 3.77 KB

patch

obsolete

>Index: Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
>===================================================================
>--- Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp	(revision 99451)
>+++ Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp	(working copy)
>@@ -31,6 +31,7 @@
> #include "ExceptionCode.h"
> #include "Frame.h"
> #include "JSDOMWindowCustom.h"
>+#include "JSMainThreadExecState.h"
> #include "SecurityOrigin.h"
> #include <runtime/JSLock.h>
> 
>@@ -89,7 +90,7 @@ String JSCustomXPathNSResolver::lookupNa
>     args.append(jsString(exec, prefix));
> 
>     m_globalObject->globalData().timeoutChecker.start();
>-    JSValue retval = JSC::call(exec, function, callType, callData, m_customResolver, args);
>+    JSValue retval = JSMainThreadExecState::call(exec, function, callType, callData, m_customResolver, args);
>     m_globalObject->globalData().timeoutChecker.stop();
> 
>     String result;
>Index: Source/WebCore/bindings/js/JSErrorHandler.cpp
>===================================================================
>--- Source/WebCore/bindings/js/JSErrorHandler.cpp	(revision 99451)
>+++ Source/WebCore/bindings/js/JSErrorHandler.cpp	(working copy)
>@@ -36,6 +36,7 @@
> #include "Event.h"
> #include "EventNames.h"
> #include "JSEvent.h"
>+#include "JSMainThreadExecState.h"
> #include <runtime/JSLock.h>
> 
> using namespace JSC;
>@@ -94,7 +95,11 @@ void JSErrorHandler::handleEvent(ScriptE
>         JSValue thisValue = globalObject->methodTable()->toThisObject(globalObject, exec);
> 
>         globalData.timeoutChecker.start();
>-        JSValue returnValue = JSC::call(exec, jsFunction, callType, callData, thisValue, args);
>+
>+        JSValue returnValue = scriptExecutionContext->isDocument()
>+            ? JSMainThreadExecState::call(exec, jsFunction, callType, callData, thisValue, args)
>+            : JSC::call(exec, jsFunction, callType, callData, thisValue, args);
>+
>         globalData.timeoutChecker.stop();
> 
>         globalObject->setCurrentEvent(savedEvent);
>Index: Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
>===================================================================
>--- Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp	(revision 99451)
>+++ Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp	(working copy)
>@@ -38,6 +38,7 @@
> #include "JSDOMWindowCustom.h"
> #include "JSDOMWindowShell.h"
> #include "JSHTMLCollection.h"
>+#include "JSMainThreadExecState.h"
> #include "SegmentedString.h"
> #include "DocumentParser.h"
> #include <runtime/Error.h>
>@@ -114,7 +115,7 @@ JSValue JSHTMLDocument::open(ExecState* 
>                 CallType callType = ::getCallData(function, callData);
>                 if (callType == CallTypeNone)
>                     return throwTypeError(exec);
>-                return JSC::call(exec, function, callType, callData, wrapper, ArgList(exec));
>+                return JSMainThreadExecState::call(exec, function, callType, callData, wrapper, ArgList(exec));
>             }
>         }
>         return jsUndefined();
>Index: Source/WebCore/bindings/js/JSNodeFilterCondition.cpp
>===================================================================
>--- Source/WebCore/bindings/js/JSNodeFilterCondition.cpp	(revision 99451)
>+++ Source/WebCore/bindings/js/JSNodeFilterCondition.cpp	(working copy)
>@@ -20,6 +20,7 @@
> #include "config.h"
> #include "JSNodeFilterCondition.h"
> 
>+#include "JSMainThreadExecState.h"
> #include "JSNode.h"
> #include "JSNodeFilter.h"
> #include "NodeFilter.h"
>@@ -72,7 +73,7 @@ short JSNodeFilterCondition::acceptNode(
>     if (exec->hadException())
>         return NodeFilter::FILTER_REJECT;
> 
>-    JSValue result = JSC::call(exec, function, callType, callData, m_filter.get(), args);
>+    JSValue result = JSMainThreadExecState::call(exec, function, callType, callData, m_filter.get(), args);
>     if (exec->hadException())
>         return NodeFilter::FILTER_REJECT;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 70289: 113965 | 123864