webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 2 deletions

diff --git a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
index a34f19dc5..ef6c79130 100644
--- a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
+++ b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
@@ -57,7 +57,7 @@ NPObjectProxy::NPObjectProxy()
 
 NPObjectProxy::~NPObjectProxy()
 {
-    ASSERT(isMainThread());
+    ASSERT(RunLoop::isMain());
 
     if (!m_npRemoteObjectMap)
         return;
@@ -303,7 +303,9 @@ void NPObjectProxy::NP_Deallocate(NPObject* npObject)
     // that is known to be misused during plugin teardown, and to not be concerned about change in behavior if this
     // occured at any other time.
     if (!isMainThread()) {
-        RunLoop::main()->dispatch(bind(&NPObjectProxy::NP_Deallocate, npObject));
+        RunLoop::main().dispatch([npObject] {
+            NP_Deallocate(npObject);
+        });
         return;
     }