From 8ee4da5e13c5ef6e3c7356e41e6caed633e3b92d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 2 Oct 2012 18:30:10 +0000 Subject: [PATCH] Merge revision 833 changes: - Mac: Fix errors in binary distribution. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@834 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/tests/cefclient/osrtest_mac.mm | 7 ++++--- cef1/tools/make_distrib.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cef1/tests/cefclient/osrtest_mac.mm b/cef1/tests/cefclient/osrtest_mac.mm index 4bbbb2090..45f36df6f 100644 --- a/cef1/tests/cefclient/osrtest_mac.mm +++ b/cef1/tests/cefclient/osrtest_mac.mm @@ -593,10 +593,11 @@ class ClientOSRHandler : public CefClient, - (NSPoint)getClickPointForEvent:(NSEvent*)event { NSPoint windowLocal = [event locationInWindow]; NSPoint contentLocal = [self convertPoint:windowLocal fromView:nil]; - int x = contentLocal.x; - int y = [self frame].size.height - contentLocal.y; // Flip y. - return {x,y}; + NSPoint point; + point.x = contentLocal.x; + point.y = [self frame].size.height - contentLocal.y; // Flip y. + return point; } - (void)getKeyInfo:(CefKeyInfo&)info forEvent:(NSEvent*)event { diff --git a/cef1/tools/make_distrib.py b/cef1/tools/make_distrib.py index 95f49a977..c2308099a 100644 --- a/cef1/tools/make_distrib.py +++ b/cef1/tools/make_distrib.py @@ -347,6 +347,8 @@ elif platform == 'macosx': # transfer cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_mac'], \ 'tests/cefclient/', cefclient_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['cefclient_bundle_resources_mac'], \ + 'tests/cefclient/', cefclient_dir, options.quiet) # transfer cefclient/mac files copy_dir(os.path.join(cef_dir, 'tests/cefclient/mac/'), os.path.join(output_dir, 'cefclient/mac/'), \