diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit2/PluginProcess/PluginControllerProxy.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginControllerProxy.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginControllerProxy.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp index ab60f941c..2ad41daa5 100644 --- a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp +++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp @@ -43,6 +43,7 @@ #include <WebCore/GraphicsContext.h> #include <WebCore/IdentifierRep.h> #include <WebCore/NotImplemented.h> +#include <wtf/TemporaryChange.h> #include <wtf/text/WTFString.h> #if PLATFORM(MAC) @@ -66,6 +67,7 @@ PluginControllerProxy::PluginControllerProxy(WebProcessConnection* connection, c #if USE(ACCELERATED_COMPOSITING) , m_isAcceleratedCompositingEnabled(creationParameters.isAcceleratedCompositingEnabled) #endif + , m_isInitializing(false) , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint) , m_pluginDestructionProtectCount(0) , m_pluginDestroyTimer(RunLoop::main(), this, &PluginControllerProxy::destroy) @@ -91,9 +93,22 @@ PluginControllerProxy::~PluginControllerProxy() releaseNPObject(m_pluginElementNPObject); } +void PluginControllerProxy::setInitializationReply(PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> reply) +{ + ASSERT(!m_initializationReply); + m_initializationReply = reply; +} + +PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> PluginControllerProxy::takeInitializationReply() +{ + return m_initializationReply.release(); +} + bool PluginControllerProxy::initialize(const PluginCreationParameters& creationParameters) { ASSERT(!m_plugin); + + TemporaryChange<bool> initializing(m_isInitializing, true); m_plugin = NetscapePlugin::create(PluginProcess::shared().netscapePluginModule()); if (!m_plugin) { |