Navigation Menu

Skip to content

Commit

Permalink
update to cef r286
Browse files Browse the repository at this point in the history
  • Loading branch information
ataranto committed Sep 13, 2011
1 parent a626419 commit 1e38df4
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 9 deletions.
6 changes: 3 additions & 3 deletions CefSharp/BrowserSettings.h
Expand Up @@ -212,10 +212,10 @@ namespace CefSharp
void set(bool value) { _browserSettings->webgl_disabled = value; }
}

property bool AcceleratedCompositingDisabled
property bool AcceleratedCompositingEnabled
{
bool get() { return _browserSettings->accelerated_compositing_disabled; }
void set(bool value) { _browserSettings->accelerated_compositing_disabled = value; }
bool get() { return _browserSettings->accelerated_compositing_enabled; }
void set(bool value) { _browserSettings->accelerated_compositing_enabled = value; }
}

property bool AcceleratedLayersDisabled
Expand Down
4 changes: 2 additions & 2 deletions CefSharp/CefSharp.h
Expand Up @@ -49,15 +49,15 @@ namespace CefSharp
{
String^ get()
{
return "trunk r283";
return "trunk r286";
}
}

static property String^ ChromiumVersion
{
String^ get()
{
return "trunk r91424";
return "trunk r100584";
}
}

Expand Down
12 changes: 10 additions & 2 deletions include/internal/cef_types.h
Expand Up @@ -135,6 +135,12 @@ typedef struct _cef_settings_t
// logged.
///
cef_log_severity_t log_severity;

///
// The graphics implementation that CEF will use for rendering GPU accelerated
// content like WebGL, accelerated layers and 3D CSS.
///
cef_graphics_implementation_t graphics_implementation;
} cef_settings_t;

///
Expand Down Expand Up @@ -321,9 +327,11 @@ typedef struct _cef_browser_settings_t
bool webgl_disabled;

///
// Set to true (1) to disable accelerated compositing.
// Set to true (1) to enable accelerated compositing. This is turned off by
// default because the current in-process GPU implementation does not
// support it correctly.
///
bool accelerated_compositing_disabled;
bool accelerated_compositing_enabled;

///
// Set to true (1) to disable accelerated layers. This affects features like
Expand Down
11 changes: 11 additions & 0 deletions include/internal/cef_types_win.h
Expand Up @@ -43,6 +43,17 @@ extern "C" {
#define cef_window_handle_t HWND
#define cef_cursor_handle_t HCURSOR

///
// Supported graphics implementations.
///
enum cef_graphics_implementation_t
{
ANGLE_IN_PROCESS = 0,
ANGLE_IN_PROCESS_COMMAND_BUFFER,
DESKTOP_IN_PROCESS,
DESKTOP_IN_PROCESS_COMMAND_BUFFER,
};

///
// Class representing window information.
///
Expand Down
5 changes: 3 additions & 2 deletions include/internal/cef_types_wrappers.h
Expand Up @@ -280,6 +280,7 @@ struct CefSettingsTraits {
cef_string_set(src->log_file.str, src->log_file.length, &target->log_file,
copy);
target->log_severity = src->log_severity;
target->graphics_implementation = src->graphics_implementation;
}
};

Expand Down Expand Up @@ -374,8 +375,8 @@ struct CefBrowserSettingsTraits {
target->databases_disabled = src->databases_disabled;
target->application_cache_disabled = src->application_cache_disabled;
target->webgl_disabled = src->webgl_disabled;
target->accelerated_compositing_disabled =
src->accelerated_compositing_disabled;
target->accelerated_compositing_enabled =
src->accelerated_compositing_enabled;
target->accelerated_layers_disabled = src->accelerated_layers_disabled;
target->accelerated_video_disabled = src->accelerated_video_disabled;
target->accelerated_2d_canvas_disabled =
Expand Down
Binary file modified libs/Debug/libcef.lib
Binary file not shown.
Binary file modified libs/Debug/libcef_dll_wrapper.lib
Binary file not shown.
Binary file modified libs/Release/libcef.lib
Binary file not shown.
Binary file modified libs/Release/libcef_dll_wrapper.lib
Binary file not shown.

0 comments on commit 1e38df4

Please sign in to comment.