diff options
Diffstat (limited to 'WebKit/mac/Plugins/Hosted/ProxyInstance.h')
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h index f84c685..138a316 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Apple Inc. All Rights Reserved. + * Copyright (C) 2009, 2010 Apple Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,15 +28,22 @@ #ifndef ProxyInstance_h #define ProxyInstance_h +<<<<<<< HEAD #include <WebCore/Bridge.h> #include <WebCore/runtime_root.h> #include <wtf/OwnPtr.h> #include "WebKitPluginHostTypes.h" +======= +#import "NetscapePluginInstanceProxy.h" +#import "WebKitPluginHostTypes.h" +#import <WebCore/Bridge.h> +#import <WebCore/runtime_root.h> +#import <wtf/OwnPtr.h> +>>>>>>> webkit.org at r54127 namespace WebKit { class ProxyClass; -class NetscapePluginInstanceProxy; class ProxyInstance : public JSC::Bindings::Instance { public: @@ -80,6 +87,17 @@ private: JSC::JSValue invoke(JSC::ExecState*, InvokeType, uint64_t identifier, const JSC::ArgList& args); + template <typename T> + std::auto_ptr<T> waitForReply(uint32_t requestID) const { + std::auto_ptr<T> reply = m_instanceProxy->waitForReply<T>(requestID); + + // If the instance proxy was invalidated, just return a null reply. + if (!m_instanceProxy) + return std::auto_ptr<T>(); + + return reply; + } + NetscapePluginInstanceProxy* m_instanceProxy; uint32_t m_objectID; JSC::Bindings::FieldMap m_fields; |