From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/PluginProcess/PluginControllerProxy.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/PluginProcess/PluginControllerProxy.cpp') diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp index cef3d40a4..74751b2a2 100644 --- a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp +++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp @@ -143,7 +143,8 @@ void PluginControllerProxy::destroy() { ASSERT(m_plugin); - if (m_pluginDestructionProtectCount) { + // FIXME: Consider removing m_pluginDestructionProtectCount and always use inSendSync here. + if (m_pluginDestructionProtectCount || m_connection->connection()->inSendSync()) { // We have plug-in code on the stack so we can't destroy it right now. // Destroy it later. m_pluginDestroyTimer.startOneShot(0); @@ -545,6 +546,11 @@ void PluginControllerProxy::paintEntirePlugin() paint(); } +void PluginControllerProxy::supportsSnapshotting(bool& isSupported) +{ + isSupported = m_plugin->supportsSnapshotting(); +} + void PluginControllerProxy::snapshot(ShareableBitmap::Handle& backingStoreHandle) { ASSERT(m_plugin); -- cgit v1.2.1