From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 May 2011 16:23:25 +0100 Subject: Merge WebKit at r75993: Initial merge by git. Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 --- .../PluginProcess/mac/PluginControllerProxyMac.mm | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (limited to 'Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm') diff --git a/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm new file mode 100644 index 0000000..40d4f6d --- /dev/null +++ b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm @@ -0,0 +1,82 @@ +/* + * Copyright (C) 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 + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#if ENABLE(PLUGIN_PROCESS) + +#include "PluginControllerProxy.h" + +#include +#include "PluginProcess.h" +#include "WebKitSystemInterface.h" + +using namespace WebCore; + +namespace WebKit { + +void PluginControllerProxy::platformInitialize() +{ + CALayer * platformLayer = m_plugin->pluginLayer(); + if (!platformLayer) + return; + + ASSERT(!m_remoteLayerClient); + + m_remoteLayerClient = WKCARemoteLayerClientMakeWithServerPort(PluginProcess::shared().compositingRenderServerPort()); + ASSERT(m_remoteLayerClient); + + WKCARemoteLayerClientSetLayer(m_remoteLayerClient.get(), platformLayer); +} + +void PluginControllerProxy::platformDestroy() +{ + if (!m_remoteLayerClient) + return; + + WKCARemoteLayerClientInvalidate(m_remoteLayerClient.get()); + m_remoteLayerClient = nullptr; +} + +uint32_t PluginControllerProxy::remoteLayerClientID() const +{ + if (!m_remoteLayerClient) + return 0; + + return WKCARemoteLayerClientGetClientId(m_remoteLayerClient.get()); +} + +void PluginControllerProxy::platformGeometryDidChange(const IntRect& frameRect, const IntRect&) +{ + CALayer * pluginLayer = m_plugin->pluginLayer(); + + // We don't want to animate to the new size so we disable actions for this transaction. + [CATransaction begin]; + [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions]; + [pluginLayer setFrame:CGRectMake(0, 0, frameRect.width(), frameRect.height())]; + [CATransaction commit]; +} + +} // namespace WebKit + +#endif // ENABLE(PLUGIN_PROCESS) -- cgit v1.1