BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

CEF changes

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-17 21:16:21 -05:00
parent 5eecff152c
commit 736cbce819
5 changed files with 39 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -248,3 +248,4 @@ ModelManifest.xml
/3rd-party/CEF/chromium_git /3rd-party/CEF/chromium_git
/3rd-party/CEF/depot_tools /3rd-party/CEF/depot_tools
/3rd_party/CEF/chromium_git /3rd_party/CEF/chromium_git
/3rd_party/CEF/automate

1057
3rd_party/CEF/automate/automate-git.py vendored
View File

File diff suppressed because it is too large Load Diff

2
3rd_party/CEF/create_debug.cmd vendored
View File

@@ -10,7 +10,7 @@ set GN_DEFINES=is_win_fastlink=true
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/* set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build || goto :ERROR call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=2987 || goto :ERROR
popd popd
pushd chromium_git\chromium\src\cef pushd chromium_git\chromium\src\cef

2
3rd_party/CEF/create_release.cmd vendored
View File

@@ -9,7 +9,7 @@ set CEF_USE_GN=1
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/* set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build || goto :ERROR call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build --branch=2987 || goto :ERROR
popd popd
pushd chromium_git\chromium\src\cef pushd chromium_git\chromium\src\cef

38
src/siadrive/main.cpp
View File

@@ -17,7 +17,41 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
// Enable High-DPI support on Windows 7 or newer. // Enable High-DPI support on Windows 7 or newer.
CefEnableHighDPISupport(); CefEnableHighDPISupport();
CSiaDriveApp app; // Manage the life span of the sandbox information object. This is necessary
// for sandbox support on Windows. See cef_sandbox_win.h for complete details.
CefScopedSandboxInfo scopedSandbox;
void* sandboxInfo = scopedSandbox.sandboxInfo();
return 0; // Provide CEF with command-line arguments.
CefMainArgs mainArgs(hInstance);
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
// that share the same executable. This function checks the command-line and,
// if this is a sub-process, executes the appropriate logic.
int ret = CefExecuteProcess(mainArgs, NULL, sandboxInfo);
if (ret < 0)
{
// Specify CEF global settings here.
CefSettings settings;
// SimpleApp implements application-level callbacks for the browser process.
// It will create the first browser instance in OnContextInitialized() after
// CEF has initialized.
CefRefPtr<CSiaDriveApp> app(new CSiaDriveApp);
// Initialize CEF.
CefInitialize(mainArgs, settings, app.get(), sandboxInfo);
// Run the CEF message loop. This will block until CefQuitMessageLoop() is
// called.
CefRunMessageLoop();
// Shut down CEF.
CefShutdown();
// Clean exit
ret = 0;
}
return ret;
} }