From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 16:25:10 +0100 Subject: Merge WebKit at r76408: Initial merge by git. Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53 --- WebKitLibraries/ChangeLog | 10 ++++++++++ WebKitLibraries/WebKitSystemInterface.h | 2 +- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1661560 -> 1662544 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1404468 -> 1405092 bytes 4 files changed, 11 insertions(+), 1 deletion(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index ca243f4..7b91aba 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,13 @@ +2011-01-18 Anders Carlsson + + Reviewed by Darin Adler. + + Add WKPopupContextMenu. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + 2011-01-17 Adam Roben Make it possible to both set and clear a wkCACFContext's D3D device diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index edbfd4e..d232229 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -120,7 +120,7 @@ void WKDrawBezeledTextFieldCell(NSRect, BOOL enabled); void WKDrawTextFieldCellFocusRing(NSTextFieldCell*, NSRect); void WKDrawBezeledTextArea(NSRect, BOOL enabled); void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); - +void WKPopupContextMenu(NSMenu *menu, NSPoint screenLocation); void WKSendUserChangeNotifications(void); #ifndef __LP64__ BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index c562459..dd0d652 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index e0b7445..d2e5a5f 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ -- cgit v1.1