Changeset 186010 in webkit

Timestamp:

Jun 26, 2015 3:14:44 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

ScriptMessageHandlerDelegate::didPostMessage() should reuse its JSContext instance.
​https://bugs.webkit.org/show_bug.cgi?id=146358

Reviewed by Anders Carlsson.

Currently, ScriptMessageHandlerDelegate::didPostMessage() creates a new JSContext each
time it is called. This JSContext is used only once to deserialized a JSON object
and then destroyed. We will change ScriptMessageHandlerDelegate to cache the JSContext
and reuse it in all subsequent calls to didPostMessage().

Also added a @autoreleasepool scope in didPostMessage() so that transient ObjC objects
will be release sooner.

• UIProcess/API/Cocoa/WKUserContentController.mm:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKUserContentController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-26  Mark Lam  <mark.lam@apple.com>
+
+        ScriptMessageHandlerDelegate::didPostMessage() should reuse its JSContext instance.
+        https://bugs.webkit.org/show_bug.cgi?id=146358
+
+        Reviewed by Anders Carlsson.
+
+        Currently, ScriptMessageHandlerDelegate::didPostMessage() creates a new JSContext each
+        time it is called.  This JSContext is used only once to deserialized a JSON object
+        and then destroyed.  We will change ScriptMessageHandlerDelegate to cache the JSContext
+        and reuse it in all subsequent calls to didPostMessage().
+
+        Also added a @autoreleasepool scope in didPostMessage() so that transient ObjC objects
+        will be release sooner.
+
+        * UIProcess/API/Cocoa/WKUserContentController.mm:
+
 2015-06-26  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm

@@ -41 +41 @@
 #import <JavaScriptCore/JSContext.h>
 #import <JavaScriptCore/JSValue.h>
+#import <WTF/MainThread.h>
 #import <WebCore/SerializedScriptValue.h>
 
@@ -88 +89 @@
     virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy& frame, const WebKit::SecurityOriginData& securityOriginData, WebCore::SerializedScriptValue& serializedScriptValue)
     {
-        RetainPtr<WKFrameInfo> frameInfo = wrapper(API::FrameInfo::create(frame, securityOriginData.securityOrigin()));
+        @autoreleasepool {
+            RetainPtr<WKFrameInfo> frameInfo = wrapper(API::FrameInfo::create(frame, securityOriginData.securityOrigin()));
 
-        RetainPtr<JSContext> context = adoptNS([[JSContext alloc] init]);
-        JSValueRef valueRef = serializedScriptValue.deserialize([context JSGlobalContextRef], 0);
-        JSValue *value = [JSValue valueWithJSValueRef:valueRef inContext:context.get()];
-        id body = [value toObject];
+            ASSERT(isUIThread());
+            static JSContext* context = [[JSContext alloc] init];
 
-        RetainPtr<WKScriptMessage> message = adoptNS([[WKScriptMessage alloc] _initWithBody:body webView:fromWebPageProxy(page) frameInfo:frameInfo.get() name:m_name.get()]);
-    
-        [m_handler userContentController:m_controller.get() didReceiveScriptMessage:message.get()];
+            JSValueRef valueRef = serializedScriptValue.deserialize([context JSGlobalContextRef], 0);
+            JSValue *value = [JSValue valueWithJSValueRef:valueRef inContext:context];
+            id body = value.toObject;
+
+            auto message = adoptNS([[WKScriptMessage alloc] _initWithBody:body webView:fromWebPageProxy(page) frameInfo:frameInfo.get() name:m_name.get()]);
+        
+            [m_handler userContentController:m_controller.get() didReceiveScriptMessage:message.get()];
+        }
     }