Update to Chromium revision 167921.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@907 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-11-16 02:58:25 +00:00
parent 79f3683beb
commit dbca88a741
16 changed files with 140 additions and 287 deletions

View File

@ -130,7 +130,8 @@ enum cef_log_severity_t {
///
// Initialization settings. Specify NULL or 0 to get the recommended default
// values.
// values. Many of these and other settings can also configured using command-
// line flags.
///
typedef struct _cef_settings_t {
///
@ -284,7 +285,8 @@ typedef struct _cef_settings_t {
///
// Browser initialization settings. Specify NULL or 0 to get the recommended
// default values. The consequences of using custom values may not be well
// tested.
// tested. Many of these and other settings can also configured using command-
// line flags.
///
typedef struct _cef_browser_settings_t {
///
@ -479,16 +481,6 @@ typedef struct _cef_browser_settings_t {
///
bool accelerated_2d_canvas_disabled;
///
// Set to true (1) to enable accelerated painting.
///
bool accelerated_painting_enabled;
///
// Set to true (1) to enable accelerated filters.
///
bool accelerated_filters_enabled;
///
// Set to true (1) to disable accelerated plugins.
///
@ -498,11 +490,6 @@ typedef struct _cef_browser_settings_t {
// Set to true (1) to disable developer tools (WebKit inspector).
///
bool developer_tools_disabled;
///
// Set to true (1) to enable fullscreen mode.
///
bool fullscreen_enabled;
} cef_browser_settings_t;
///

View File

@ -398,11 +398,8 @@ struct CefBrowserSettingsTraits {
target->accelerated_video_disabled = src->accelerated_video_disabled;
target->accelerated_2d_canvas_disabled =
src->accelerated_2d_canvas_disabled;
target->accelerated_painting_enabled = src->accelerated_painting_enabled;
target->accelerated_filters_enabled = src->accelerated_filters_enabled;
target->accelerated_plugins_disabled = src->accelerated_plugins_disabled;
target->developer_tools_disabled = src->developer_tools_disabled;
target->fullscreen_enabled = src->fullscreen_enabled;
}
};
@ -503,8 +500,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
}
// Return the delta between this object and |other| in milliseconds.
int64 Delta(const CefTime& other) {
int64 delta = 0;
long long Delta(const CefTime& other) {
long long delta = 0;
cef_time_delta(this, &other, &delta);
return delta;
}