diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /WebKitLibraries | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 10 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 2 | ||||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 1661560 -> 1662544 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a | bin | 1404468 -> 1405092 bytes |
4 files changed, 11 insertions, 1 deletions
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 <andersca@apple.com> + + Reviewed by Darin Adler. + + Add WKPopupContextMenu. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + 2011-01-17 Adam Roben <aroben@apple.com> 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 Binary files differindex c562459..dd0d652 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a Binary files differindex e0b7445..d2e5a5f 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a |