diff options
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp index ad8b01208..ef6c79130 100644 --- a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp +++ b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "NPObjectProxy.h" -#if ENABLE(PLUGIN_PROCESS) +#if ENABLE(NETSCAPE_PLUGIN_API) #include "ArgumentCoders.h" #include "Connection.h" @@ -35,10 +35,8 @@ #include "NPRemoteObjectMap.h" #include "NPRuntimeUtilities.h" #include "NPVariantData.h" -#include <WebCore/RunLoop.h> #include <wtf/MainThread.h> - -using namespace WebCore; +#include <wtf/RunLoop.h> namespace WebKit { @@ -59,7 +57,7 @@ NPObjectProxy::NPObjectProxy() NPObjectProxy::~NPObjectProxy() { - ASSERT(isMainThread()); + ASSERT(RunLoop::isMain()); if (!m_npRemoteObjectMap) return; @@ -305,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; } @@ -360,4 +360,4 @@ bool NPObjectProxy::NP_Construct(NPObject* npObject, const NPVariant* arguments, } // namespace WebKit -#endif // ENABLE(PLUGIN_PROCESS) +#endif // ENABLE(NETSCAPE_PLUGIN_API) |