bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix compile errors.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@645 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-23 20:33:32 +00:00
parent 801ff3ca43
commit 8d5bad43d3
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cef1/cef.gyp
View File

@@ -645,6 +645,7 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:appcache', '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
'<(DEPTH)/webkit/support/webkit_support.gyp:blob', '<(DEPTH)/webkit/support/webkit_support.gyp:blob',
'<(DEPTH)/webkit/support/webkit_support.gyp:database', '<(DEPTH)/webkit/support/webkit_support.gyp:database',
'<(DEPTH)/webkit/support/webkit_support.gyp:dom_storage',
'<(DEPTH)/webkit/support/webkit_support.gyp:fileapi', '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
'<(DEPTH)/webkit/support/webkit_support.gyp:glue', '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
'<(DEPTH)/webkit/support/webkit_support.gyp:quota', '<(DEPTH)/webkit/support/webkit_support.gyp:quota',

2
cef1/libcef/browser_webview_delegate_mac.mm
View File

@@ -349,7 +349,7 @@ WebRect BrowserWebViewDelegate::windowResizerRect() {
} }
void BrowserWebViewDelegate::startDragging( void BrowserWebViewDelegate::startDragging(
WebFrame* frame, WebKit::WebFrame* frame,
const WebDragData& data, const WebDragData& data,
WebDragOperationsMask mask, WebDragOperationsMask mask,
const WebImage& image, const WebImage& image,

7
cef1/libcef/cef_context.cc
View File

@@ -41,7 +41,14 @@ const int kNextBrowserIdReset = 1;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
FilePath GetDefaultPackPath() { FilePath GetDefaultPackPath() {
// Start out with the path to the running executable.
FilePath execPath;
PathService::Get(base::FILE_EXE, &execPath);
// Get the main bundle path.
FilePath bundlePath = base::mac::GetAppBundlePath(execPath); FilePath bundlePath = base::mac::GetAppBundlePath(execPath);
// Go into the Contents/Resources directory.
return bundlePath.Append(FILE_PATH_LITERAL("Contents")) return bundlePath.Append(FILE_PATH_LITERAL("Contents"))
.Append(FILE_PATH_LITERAL("Resources")); .Append(FILE_PATH_LITERAL("Resources"));
} }

7
cef1/libcef/web_drop_target_mac.mm
View File

@@ -243,8 +243,11 @@ using WebKit::WebView;
BOOL isDir = NO; BOOL isDir = NO;
BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:filename BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:filename
isDirectory:&isDir]; isDirectory:&isDir];
if (exists && !isDir) if (exists && !isDir) {
data->filenames.push_back(base::SysNSStringToUTF16(filename)); data->filenames.push_back(
WebDropData::FileInfo(base::SysNSStringToUTF16(filename),
string16()));
}
} }
} }
} }

1
cef1/tests/unittests/v8_unittest.cc
View File

@@ -21,7 +21,6 @@ const char* kV8TestUrl = "http://tests/V8Test.Test";
const char* kV8BindingTestUrl = "http://tests/V8Test.BindingTest"; const char* kV8BindingTestUrl = "http://tests/V8Test.BindingTest";
const char* kV8ContextParentTestUrl = "http://tests/V8Test.ContextParentTest"; const char* kV8ContextParentTestUrl = "http://tests/V8Test.ContextParentTest";
const char* kV8ContextChildTestUrl = "http://tests/V8Test.ContextChildTest"; const char* kV8ContextChildTestUrl = "http://tests/V8Test.ContextChildTest";
const char* kV8TestMsg = "V8Test.Test";
enum V8TestMode { enum V8TestMode {
V8TEST_NULL_CREATE = 0, V8TEST_NULL_CREATE = 0,