diff options
Diffstat (limited to 'WebCore/bindings/objc')
-rw-r--r-- | WebCore/bindings/objc/DOM.mm | 1 | ||||
-rw-r--r-- | WebCore/bindings/objc/DOMEvents.mm | 3 | ||||
-rw-r--r-- | WebCore/bindings/objc/DOMInternal.mm | 4 | ||||
-rw-r--r-- | WebCore/bindings/objc/DOMSVG.h | 1 | ||||
-rw-r--r-- | WebCore/bindings/objc/WebScriptObject.mm | 4 |
5 files changed, 9 insertions, 4 deletions
diff --git a/WebCore/bindings/objc/DOM.mm b/WebCore/bindings/objc/DOM.mm index 63a3b2a..907961f 100644 --- a/WebCore/bindings/objc/DOM.mm +++ b/WebCore/bindings/objc/DOM.mm @@ -176,6 +176,7 @@ static void createElementClassMap() addElementClass(SVGNames::feImageTag, [DOMSVGFEImageElement class]); addElementClass(SVGNames::feMergeTag, [DOMSVGFEMergeElement class]); addElementClass(SVGNames::feMergeNodeTag, [DOMSVGFEMergeNodeElement class]); + addElementClass(SVGNames::feMorphologyTag, [DOMSVGFEMorphologyElement class]); addElementClass(SVGNames::feOffsetTag, [DOMSVGFEOffsetElement class]); addElementClass(SVGNames::fePointLightTag, [DOMSVGFEPointLightElement class]); addElementClass(SVGNames::feSpecularLightingTag, [DOMSVGFESpecularLightingElement class]); diff --git a/WebCore/bindings/objc/DOMEvents.mm b/WebCore/bindings/objc/DOMEvents.mm index c901e12..26dfe7b 100644 --- a/WebCore/bindings/objc/DOMEvents.mm +++ b/WebCore/bindings/objc/DOMEvents.mm @@ -28,6 +28,7 @@ #import "config.h" #import "DOMEventInternal.h" +#import "DOMBeforeLoadEvent.h" #import "DOMKeyboardEvent.h" #import "DOMMessageEvent.h" #import "DOMMouseEvent.h" @@ -67,5 +68,7 @@ Class kitClass(WebCore::Event* impl) return [DOMMessageEvent class]; if (impl->isProgressEvent()) return [DOMProgressEvent class]; + if (impl->isBeforeLoadEvent()) + return [DOMBeforeLoadEvent class]; return [DOMEvent class]; } diff --git a/WebCore/bindings/objc/DOMInternal.mm b/WebCore/bindings/objc/DOMInternal.mm index 993a3ad..590d653 100644 --- a/WebCore/bindings/objc/DOMInternal.mm +++ b/WebCore/bindings/objc/DOMInternal.mm @@ -112,8 +112,8 @@ void removeDOMWrapper(DOMObjectInternal* impl) if (!frame) return; - // The global object which should own this node. - WebCore::JSDOMGlobalObject* globalObject = frame->script()->globalObject(); + // The global object which should own this node - FIXME: does this need to be isolated-world aware? + WebCore::JSDOMGlobalObject* globalObject = frame->script()->globalObject(WebCore::mainThreadNormalWorld()); JSC::ExecState *exec = globalObject->globalExec(); // Get (or create) a cached JS object for the DOM node. diff --git a/WebCore/bindings/objc/DOMSVG.h b/WebCore/bindings/objc/DOMSVG.h index cb74544..c59532f 100644 --- a/WebCore/bindings/objc/DOMSVG.h +++ b/WebCore/bindings/objc/DOMSVG.h @@ -75,6 +75,7 @@ #import <WebCore/DOMSVGFEImageElement.h> #import <WebCore/DOMSVGFEMergeElement.h> #import <WebCore/DOMSVGFEMergeNodeElement.h> +#import <WebCore/DOMSVGFEMorphologyElement.h> #import <WebCore/DOMSVGFEOffsetElement.h> #import <WebCore/DOMSVGFEPointLightElement.h> #import <WebCore/DOMSVGFESpecularLightingElement.h> diff --git a/WebCore/bindings/objc/WebScriptObject.mm b/WebCore/bindings/objc/WebScriptObject.mm index 1086204..6d86001 100644 --- a/WebCore/bindings/objc/WebScriptObject.mm +++ b/WebCore/bindings/objc/WebScriptObject.mm @@ -299,7 +299,7 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root return nil; [self _rootObject]->globalObject()->globalData()->timeoutChecker.start(); - JSValue result = call(exec, function, callType, callData, [self _imp], argList); + JSValue result = callInWorld(exec, function, callType, callData, [self _imp], argList, pluginWorld()); [self _rootObject]->globalObject()->globalData()->timeoutChecker.stop(); if (exec->hadException()) { @@ -328,7 +328,7 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root JSLock lock(SilenceAssertionsOnly); [self _rootObject]->globalObject()->globalData()->timeoutChecker.start(); - Completion completion = JSC::evaluate([self _rootObject]->globalObject()->globalExec(), [self _rootObject]->globalObject()->globalScopeChain(), makeSource(String(script))); + Completion completion = evaluateInWorld([self _rootObject]->globalObject()->globalExec(), [self _rootObject]->globalObject()->globalScopeChain(), makeSource(String(script)), JSC::JSValue(), pluginWorld()); [self _rootObject]->globalObject()->globalData()->timeoutChecker.stop(); ComplType type = completion.complType(); |