diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Netscape/mac')
-rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm | 22 | ||||
-rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm | 7 |
2 files changed, 18 insertions, 11 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm index d57e8d1..46671b8 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm @@ -23,13 +23,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "NetscapePlugin.h" +#import "config.h" +#import "NetscapePlugin.h" -#include "PluginController.h" -#include "WebEvent.h" -#include <WebCore/GraphicsContext.h> -#include <Carbon/Carbon.h> -#include <WebKitSystemInterface.h> +#import "PluginController.h" +#import "WebEvent.h" +#import <WebCore/GraphicsContext.h> +#import <Carbon/Carbon.h> +#import <WebKitSystemInterface.h> using namespace WebCore; @@ -171,6 +172,11 @@ NPError NetscapePlugin::popUpContextMenu(NPMenu* npMenu) return NPERR_NO_ERROR; } +mach_port_t NetscapePlugin::compositingRenderServerPort() +{ + return m_pluginController->compositingRenderServerPort(); +} + #ifndef NP_NO_CARBON typedef HashMap<WindowRef, NetscapePlugin*> WindowMap; @@ -779,8 +785,8 @@ static Rect computeFakeWindowBoundsRect(const WebCore::IntRect& windowFrameInScr // Carbon global coordinates has the origin set at the top left corner of the main viewing screen, so we want to flip the y coordinate. CGFloat maxY = NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]); - int flippedWindowFrameYCoordinate = maxY - windowFrameInScreenCoordinates.bottom(); - int flippedViewFrameYCoordinate = windowFrameInScreenCoordinates.height() - viewFrameInWindowCoordinates.bottom(); + int flippedWindowFrameYCoordinate = maxY - windowFrameInScreenCoordinates.maxY(); + int flippedViewFrameYCoordinate = windowFrameInScreenCoordinates.height() - viewFrameInWindowCoordinates.maxY(); Rect bounds; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm index 6ecf7b9..d331506 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm @@ -23,11 +23,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if ENABLE(PLUGIN_PROCESS) +#import "config.h" +#import "PluginProxy.h" -#include "PluginProxy.h" +#if ENABLE(PLUGIN_PROCESS) -#include <WebKitSystemInterface.h> +#import <WebKitSystemInterface.h> namespace WebKit { |