From 6ba16608c7dae2887b4ac42acfaaba364b632ea4 Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 15 Apr 2014 12:50:22 +0200 Subject: [PATCH 1/7] Improved BrowserSettings Added missing Browser Settings and replaced the Nullable with a human readable BrowserSettingsState like in the CEF3 --- CefSharp.Wpf/WebView.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CefSharp.Wpf/WebView.cs b/CefSharp.Wpf/WebView.cs index 9a0862ed32..1d337eab7b 100644 --- a/CefSharp.Wpf/WebView.cs +++ b/CefSharp.Wpf/WebView.cs @@ -277,7 +277,12 @@ public WebView() ReloadCommand = new DelegateCommand(Reload, () => CanReload); managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this); - managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings()); + + BrowserSettings settings = new CefSharp.BrowserSettings(); + settings.Plugins = BrowserSettingsState.ENABLED; + + //managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings()); + managedCefBrowserAdapter.CreateOffscreenBrowser(settings); disposables.Add(managedCefBrowserAdapter); From 912895f4d3fd2b4d3f956ff0d9a0e61948daa4df Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 15 Apr 2014 12:53:31 +0200 Subject: [PATCH 2/7] Removed unwanted changes from WebView and commited correct BrowserSettings.h --- CefSharp.Core/BrowserSettings.h | 284 +++++++++++++++----------------- CefSharp.Wpf/WebView.cs | 6 +- 2 files changed, 138 insertions(+), 152 deletions(-) diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h index 9755ec8072..dcb98e1883 100644 --- a/CefSharp.Core/BrowserSettings.h +++ b/CefSharp.Core/BrowserSettings.h @@ -9,41 +9,27 @@ using namespace CefSharp::Internals; namespace CefSharp { - Nullable CefStateToBoolean(cef_state_t state) +#pragma region enum BrowserSettingsState + + public enum class BrowserSettingsState { - if (state == STATE_DEFAULT) - { - return Nullable(); - } - else if (state == STATE_ENABLED) - { - return Nullable(true); - } - else if (state == STATE_DISABLED) - { - return Nullable(false); - } + DEFAULT = cef_state_t::STATE_DEFAULT, + ENABLED = cef_state_t::STATE_ENABLED, + DISABLED = cef_state_t::STATE_DISABLED + }; - return Nullable(); + BrowserSettingsState CefStateToSettingsState(cef_state_t state) + { + return (BrowserSettingsState)BrowserSettingsState::DEFAULT; } - cef_state_t CefStateFromBoolean(Nullable^ value) + cef_state_t CefStateFromSettingsState(BrowserSettingsState value) { - if (value == nullptr) - { - return STATE_DEFAULT; - } - else if (value->Value) - { - return STATE_ENABLED; - } - else // !value->Value - { - return STATE_DISABLED; - } + return (cef_state_t)value; + } + +#pragma endregion - return STATE_DEFAULT; - } public ref class BrowserSettings { @@ -122,10 +108,10 @@ namespace CefSharp void set(int value) { _browserSettings->minimum_logical_font_size = value; } } - property Nullable^ RemoteFontsDisabled + property BrowserSettingsState RemoteFonts { - Nullable^ get() { return CefStateToBoolean(_browserSettings->remote_fonts); } - void set(Nullable^ value) { _browserSettings->remote_fonts = CefStateFromBoolean(value); } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->remote_fonts); } + void set(BrowserSettingsState value) { _browserSettings->remote_fonts = CefStateFromSettingsState(value); } } property String^ DefaultEncoding @@ -134,217 +120,221 @@ namespace CefSharp void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->default_encoding, value); } } - // TODO: Convert the rest to use the CefStateToFoo syntax. - /* - property bool EncodingDetectorEnabled + /* TODO: Nothing similar found + property BrowserSettingsState EncodingDetectorEnabled { - bool get() { return _browserSettings->encoding_detector_enabled; } - void set(bool value) { _browserSettings->encoding_detector_enabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->encoding_detector _enabled); } + void set(BrowserSettingsState value) { _browserSettings->encoding_detector_enabled = CefStateFromSettingState(value); } + }*/ - property bool JavaScriptDisabled + property BrowserSettingsState JavaScript { - bool get() { return _browserSettings->javascript_disabled; } - void set(bool value) { _browserSettings->javascript_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript); } + void set(BrowserSettingsState value) { _browserSettings->javascript = CefStateFromSettingsState(value); } } - property bool JavaScriptOpenWindowsDisallowed + property BrowserSettingsState JavaScriptOpenWindows { - bool get() { return _browserSettings->javascript_open_windows_disallowed; } - void set(bool value) { _browserSettings->javascript_open_windows_disallowed = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_open_windows); } + void set(BrowserSettingsState value) { _browserSettings->javascript_open_windows = CefStateFromSettingsState(value); } } - property bool JavaScriptCloseWindowsDisallowed + property BrowserSettingsState JavaScriptCloseWindows { - bool get() { return _browserSettings->javascript_close_windows_disallowed; } - void set(bool value) { _browserSettings->javascript_close_windows_disallowed = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_close_windows); } + void set(BrowserSettingsState value) { _browserSettings->javascript_close_windows = CefStateFromSettingsState(value); } } - property bool JavaScriptAccessClipboardDisallowed + property BrowserSettingsState JavaScriptAccessClipboard { - bool get() { return _browserSettings->javascript_access_clipboard_disallowed; } - void set(bool value) { _browserSettings->javascript_access_clipboard_disallowed = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_access_clipboard); } + void set(BrowserSettingsState value) { _browserSettings->javascript_access_clipboard = CefStateFromSettingsState(value); } } - property bool DomPasteDisabled + property BrowserSettingsState JavascriptDomPaste { - bool get() { return _browserSettings->dom_paste_disabled; } - void set(bool value) { _browserSettings->dom_paste_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_dom_paste); } + void set(BrowserSettingsState value) { _browserSettings->javascript_dom_paste = CefStateFromSettingsState(value); } } - property bool CaretBrowsingEnabled + property BrowserSettingsState CaretBrowsing { - bool get() { return _browserSettings->caret_browsing_enabled; } - void set(bool value) { _browserSettings->caret_browsing_enabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->caret_browsing); } + void set(BrowserSettingsState value) { _browserSettings->caret_browsing = CefStateFromSettingsState(value); } } - property bool JavaDisabled + property BrowserSettingsState Java { - bool get() { return _browserSettings->java_disabled; } - void set(bool value) { _browserSettings->java_disabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->java); } + void set(BrowserSettingsState value) { _browserSettings->java = CefStateFromSettingsState(value); } + } - property bool PluginsDisabled + property BrowserSettingsState Plugins { - bool get() { return _browserSettings->plugins_disabled; } - void set(bool value) { _browserSettings->plugins_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->plugins); } + void set(BrowserSettingsState value) { _browserSettings->plugins = CefStateFromSettingsState(value); } } - property bool UniversalAccessFromFileUrlsAllowed + property BrowserSettingsState UniversalAccessFromFileUrls { - bool get() { return _browserSettings->universal_access_from_file_urls_allowed; } - void set(bool value) { _browserSettings->universal_access_from_file_urls_allowed = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->universal_access_from_file_urls); } + void set(BrowserSettingsState value) { _browserSettings->universal_access_from_file_urls = CefStateFromSettingsState(value); } } - property bool FileAccessFromFileUrlsAllowed + property BrowserSettingsState FileAccessFromFileUrls { - bool get() { return _browserSettings->file_access_from_file_urls_allowed; } - void set(bool value) { _browserSettings->file_access_from_file_urls_allowed = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->file_access_from_file_urls); } + void set(BrowserSettingsState value) { _browserSettings->file_access_from_file_urls = CefStateFromSettingsState(value); } } - property bool WebSecurityDisabled + property BrowserSettingsState WebSecurity { - bool get() { return _browserSettings->web_security_disabled; } - void set(bool value) { _browserSettings->web_security_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->web_security); } + void set(BrowserSettingsState value) { _browserSettings->web_security = CefStateFromSettingsState(value); } } - property bool XssAuditorEnabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState XssAuditor { - bool get() { return _browserSettings->xss_auditor_enabled; } - void set(bool value) { _browserSettings->xss_auditor_enabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->xss_auditor); } + void set(BrowserSettingsState value) { _browserSettings->xss_auditor = CefStateFromSettingsState(value); } + } */ - property bool ImageLoadDisabled + property BrowserSettingsState ImageLoading { - bool get() { return _browserSettings->image_load_disabled; } - void set(bool value) { _browserSettings->image_load_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->image_loading); } + void set(BrowserSettingsState value) { _browserSettings->image_loading = CefStateFromSettingsState(value); } } - property bool ShrinkStandaloneImagesToFit + property BrowserSettingsState ImageShrinkStandaloneToFit { - bool get() { return _browserSettings->shrink_standalone_images_to_fit; } - void set(bool value) { _browserSettings->shrink_standalone_images_to_fit = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->image_shrink_standalone_to_fit); } + void set(BrowserSettingsState value) { _browserSettings->image_shrink_standalone_to_fit= CefStateFromSettingsState(value); } } - property bool SiteSpecificQuirksDisabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState SiteSpecificQuirksDisabled { - bool get() { return _browserSettings->site_specific_quirks_disabled; } - void set(bool value) { _browserSettings->site_specific_quirks_disabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->site_specific_quirks); } + void set(BrowserSettingsState value) { _browserSettings->site_specific_quirks_disabled = CefStateFromSettingsState(value); } + } */ - property bool TextAreaResizeDisabled + property BrowserSettingsState TextAreaResize { - bool get() { return _browserSettings->text_area_resize_disabled; } - void set(bool value) { _browserSettings->text_area_resize_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->text_area_resize); } + void set(BrowserSettingsState value) { _browserSettings->text_area_resize = CefStateFromSettingsState(value); } } - property bool PageCacheDisabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState PageCacheDisabled { - bool get() { return _browserSettings->page_cache_disabled; } - void set(bool value) { _browserSettings->page_cache_disabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->page_cache; } + void set(BrowserSettingsState value) { _browserSettings->page_cache_disab = CefStateFromSettingsState(value); } + } */ - property bool TabToLinksDisabled + property BrowserSettingsState TabToLinks { - bool get() { return _browserSettings->tab_to_links_disabled; } - void set(bool value) { _browserSettings->tab_to_links_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->tab_to_links); } + void set(BrowserSettingsState value) { _browserSettings->tab_to_links = CefStateFromSettingsState(value); } } - property bool HyperlinkAuditingDisabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState HyperlinkAuditing { - bool get() { return _browserSettings->hyperlink_auditing_disabled; } - void set(bool value) { _browserSettings->hyperlink_auditing_disabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->hyperlink_auditing); } + void set(BrowserSettingsState value) { _browserSettings->hyperlink_auditing_disabled = CefStateFromSettingsState(value); } + } */ - property bool UserStyleSheetEnabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState UserStyleSheetEnabled { - bool get() { return _browserSettings->user_style_sheet_enabled; } - void set(bool value) { _browserSettings->user_style_sheet_enabled = value; } - } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->user_style_sheet_enabled; } + void set(BrowserSettingsState value) { _browserSettings->user_style_sheet_enabled = CefStateFromSettingsState(value); } + } */ property String^ UserStyleSheetLocation { - String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); } - void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); } + String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); } + void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); } } - property bool AuthorAndUserStylesDisabled + property BrowserSettingsState AuthorAndUserStyles { - bool get() { return _browserSettings->author_and_user_styles_disabled; } - void set(bool value) { _browserSettings->author_and_user_styles_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->author_and_user_styles); } + void set(BrowserSettingsState value) { _browserSettings->author_and_user_styles = CefStateFromSettingsState(value); } } - property bool LocalStorageDisabled + property BrowserSettingsState LocalStorage { - bool get() { return _browserSettings->local_storage_disabled; } - void set(bool value) { _browserSettings->local_storage_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->local_storage); } + void set(BrowserSettingsState value) { _browserSettings->local_storage = CefStateFromSettingsState(value); } } - property bool DatabasesDisabled + property BrowserSettingsState Databases { - bool get() { return _browserSettings->databases_disabled; } - void set(bool value) { _browserSettings->databases_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->databases); } + void set(BrowserSettingsState value) { _browserSettings->databases = CefStateFromSettingsState(value); } } - property bool ApplicationCacheDisabled + property BrowserSettingsState ApplicationCache { - bool get() { return _browserSettings->application_cache_disabled; } - void set(bool value) { _browserSettings->application_cache_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->application_cache); } + void set(BrowserSettingsState value) { _browserSettings->application_cache = CefStateFromSettingsState(value); } } - property bool WebGlDisabled + property BrowserSettingsState WebGl { - bool get() { return _browserSettings->webgl_disabled; } - void set(bool value) { _browserSettings->webgl_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->webgl); } + void set(BrowserSettingsState value) { _browserSettings->webgl = CefStateFromSettingsState(value); } } - property bool AcceleratedCompositingEnabled + property BrowserSettingsState AcceleratedCompositing { - bool get() { return _browserSettings->accelerated_compositing_enabled; } - void set(bool value) { _browserSettings->accelerated_compositing_enabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_compositing); } + void set(BrowserSettingsState value) { _browserSettings->accelerated_compositing = CefStateFromSettingsState(value); } } - property bool AcceleratedLayersDisabled + /* TODO: No corresponding CEF3 setting found + property BrowserSettingsState AcceleratedLayers { - bool get() { return _browserSettings->accelerated_layers_disabled; } - void set(bool value) { _browserSettings->accelerated_layers_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_layers); } + void set(BrowserSettingsState value) { _browserSettings->accelerated_layers = CefStateFromSettingsState(value); } } - property bool Accelerated2dCanvasDisabled + property BrowserSettingsState Accelerated2dCanvasDisabled { - bool get() { return _browserSettings->accelerated_2d_canvas_disabled; } - void set(bool value) { _browserSettings->accelerated_2d_canvas_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_2d_canvas_disabled; } + void set(BrowserSettingsState value) { _browserSettings->accelerated_2d_canvas_disabled = CefStateFromSettingsState(value); } } - property bool AcceleratedPaintingDisabled + property BrowserSettingsState AcceleratedPaintingDisabled { - bool get() { return _browserSettings->accelerated_painting_disabled; } - void set(bool value) { _browserSettings->accelerated_painting_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_painting_disabled; } + void set(BrowserSettingsState value) { _browserSettings->accelerated_painting_disabled = CefStateFromSettingsState(value); } } - property bool AcceleratedFiltersDisabled + property BrowserSettingsState AcceleratedFiltersDisabled { - bool get() { return _browserSettings->accelerated_filters_disabled; } - void set(bool value) { _browserSettings->accelerated_filters_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_filters_disabled; } + void set(BrowserSettingsState value) { _browserSettings->accelerated_filters_disabled = CefStateFromSettingsState(value); } } - property bool AcceleratedPluginsDisabled + property BrowserSettingsState AcceleratedPluginsDisabled { - bool get() { return _browserSettings->accelerated_plugins_disabled; } - void set(bool value) { _browserSettings->accelerated_plugins_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_plugins_disabled; } + void set(BrowserSettingsState value) { _browserSettings->accelerated_plugins_disabled = CefStateFromSettingsState(value); } } - property bool DeveloperToolsDisabled + property BrowserSettingsState DeveloperTools { - bool get() { return _browserSettings->developer_tools_disabled; } - void set(bool value) { _browserSettings->developer_tools_disabled = value; } + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->developer_tools); } + void set(BrowserSettingsState value) { _browserSettings->developer_tools_disabled = CefStateFromSettingsState(value); } } - property bool FullscreenEnabled + property BrowserSettingsState FullscreenEnabled { - bool get() { return _browserSettings->fullscreen_enabled; } - void set(bool value) { _browserSettings->fullscreen_enabled = value; } - } - */ + BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->fullscreen_enabled); } + void set(BrowserSettingsState value) { _browserSettings->fullscreen_enabled = CefStateFromSettingsState(value); } + } */ }; } \ No newline at end of file diff --git a/CefSharp.Wpf/WebView.cs b/CefSharp.Wpf/WebView.cs index 1d337eab7b..8a0f38e5ab 100644 --- a/CefSharp.Wpf/WebView.cs +++ b/CefSharp.Wpf/WebView.cs @@ -278,11 +278,7 @@ public WebView() managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this); - BrowserSettings settings = new CefSharp.BrowserSettings(); - settings.Plugins = BrowserSettingsState.ENABLED; - - //managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings()); - managedCefBrowserAdapter.CreateOffscreenBrowser(settings); + managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings()); disposables.Add(managedCefBrowserAdapter); From 0e05afb946bcec7b1a793a05a9661b8f94ecd5d2 Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 15 Apr 2014 12:55:35 +0200 Subject: [PATCH 3/7] Reverted all changes from WebView.cs --- CefSharp.Wpf/WebView.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/CefSharp.Wpf/WebView.cs b/CefSharp.Wpf/WebView.cs index 8a0f38e5ab..9a0862ed32 100644 --- a/CefSharp.Wpf/WebView.cs +++ b/CefSharp.Wpf/WebView.cs @@ -277,7 +277,6 @@ public WebView() ReloadCommand = new DelegateCommand(Reload, () => CanReload); managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this); - managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings()); disposables.Add(managedCefBrowserAdapter); From 65bb7304b1467e90a358941a60bbcdaa2217b0ba Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 15 Apr 2014 13:12:20 +0200 Subject: [PATCH 4/7] Removed Browsersetting which are not supported in CEF3 --- CefSharp.Core/BrowserSettings.h | 85 --------------------------------- 1 file changed, 85 deletions(-) diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h index dcb98e1883..93f79db506 100644 --- a/CefSharp.Core/BrowserSettings.h +++ b/CefSharp.Core/BrowserSettings.h @@ -120,13 +120,6 @@ namespace CefSharp void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->default_encoding, value); } } - /* TODO: Nothing similar found - property BrowserSettingsState EncodingDetectorEnabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->encoding_detector _enabled); } - void set(BrowserSettingsState value) { _browserSettings->encoding_detector_enabled = CefStateFromSettingState(value); } - }*/ - property BrowserSettingsState JavaScript { BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript); } @@ -193,13 +186,6 @@ namespace CefSharp void set(BrowserSettingsState value) { _browserSettings->web_security = CefStateFromSettingsState(value); } } - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState XssAuditor - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->xss_auditor); } - void set(BrowserSettingsState value) { _browserSettings->xss_auditor = CefStateFromSettingsState(value); } - } */ - property BrowserSettingsState ImageLoading { BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->image_loading); } @@ -212,46 +198,18 @@ namespace CefSharp void set(BrowserSettingsState value) { _browserSettings->image_shrink_standalone_to_fit= CefStateFromSettingsState(value); } } - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState SiteSpecificQuirksDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->site_specific_quirks); } - void set(BrowserSettingsState value) { _browserSettings->site_specific_quirks_disabled = CefStateFromSettingsState(value); } - } */ - property BrowserSettingsState TextAreaResize { BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->text_area_resize); } void set(BrowserSettingsState value) { _browserSettings->text_area_resize = CefStateFromSettingsState(value); } } - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState PageCacheDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->page_cache; } - void set(BrowserSettingsState value) { _browserSettings->page_cache_disab = CefStateFromSettingsState(value); } - } */ - property BrowserSettingsState TabToLinks { BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->tab_to_links); } void set(BrowserSettingsState value) { _browserSettings->tab_to_links = CefStateFromSettingsState(value); } } - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState HyperlinkAuditing - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->hyperlink_auditing); } - void set(BrowserSettingsState value) { _browserSettings->hyperlink_auditing_disabled = CefStateFromSettingsState(value); } - } */ - - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState UserStyleSheetEnabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->user_style_sheet_enabled; } - void set(BrowserSettingsState value) { _browserSettings->user_style_sheet_enabled = CefStateFromSettingsState(value); } - } */ - property String^ UserStyleSheetLocation { String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); } @@ -293,48 +251,5 @@ namespace CefSharp BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_compositing); } void set(BrowserSettingsState value) { _browserSettings->accelerated_compositing = CefStateFromSettingsState(value); } } - - /* TODO: No corresponding CEF3 setting found - property BrowserSettingsState AcceleratedLayers - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_layers); } - void set(BrowserSettingsState value) { _browserSettings->accelerated_layers = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState Accelerated2dCanvasDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_2d_canvas_disabled; } - void set(BrowserSettingsState value) { _browserSettings->accelerated_2d_canvas_disabled = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState AcceleratedPaintingDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_painting_disabled; } - void set(BrowserSettingsState value) { _browserSettings->accelerated_painting_disabled = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState AcceleratedFiltersDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_filters_disabled; } - void set(BrowserSettingsState value) { _browserSettings->accelerated_filters_disabled = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState AcceleratedPluginsDisabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_plugins_disabled; } - void set(BrowserSettingsState value) { _browserSettings->accelerated_plugins_disabled = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState DeveloperTools - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->developer_tools); } - void set(BrowserSettingsState value) { _browserSettings->developer_tools_disabled = CefStateFromSettingsState(value); } - } - - property BrowserSettingsState FullscreenEnabled - { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->fullscreen_enabled); } - void set(BrowserSettingsState value) { _browserSettings->fullscreen_enabled = CefStateFromSettingsState(value); } - } */ }; } \ No newline at end of file From e78aaf3773e5579f9dee6ccd96e663d43734162e Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Thu, 17 Apr 2014 09:35:02 +0200 Subject: [PATCH 5/7] Used Nullable again and changed names The used boolean setting names now match the command-line options. --- CefSharp.Core/BrowserSettings.h | 198 +++++++++++++++++++------------- 1 file changed, 118 insertions(+), 80 deletions(-) diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h index 93f79db506..cf3872c27a 100644 --- a/CefSharp.Core/BrowserSettings.h +++ b/CefSharp.Core/BrowserSettings.h @@ -9,27 +9,65 @@ using namespace CefSharp::Internals; namespace CefSharp { -#pragma region enum BrowserSettingsState - - public enum class BrowserSettingsState + Nullable CefStateToDisabledSetting(cef_state_t state) { - DEFAULT = cef_state_t::STATE_DEFAULT, - ENABLED = cef_state_t::STATE_ENABLED, - DISABLED = cef_state_t::STATE_DISABLED - }; - - BrowserSettingsState CefStateToSettingsState(cef_state_t state) - { - return (BrowserSettingsState)BrowserSettingsState::DEFAULT; + if (state == STATE_ENABLED) + { + return Nullable(false); + } + else if (state == STATE_DISABLED) + { + return Nullable(true); + } + return Nullable(); } - cef_state_t CefStateFromSettingsState(BrowserSettingsState value) + cef_state_t CefStateFromDisabledSetting(Nullable^ value) { - return (cef_state_t)value; + if (value == nullptr) + { + return STATE_DEFAULT; + } + else if (value->Value) + { + return STATE_DISABLED; + } + else // !value->Value + { + return STATE_ENABLED; + } + return STATE_DEFAULT; } -#pragma endregion + Nullable CefStateToEnabledSetting(cef_state_t state) + { + if (state == STATE_ENABLED) + { + return Nullable(true); + } + else if (state == STATE_DISABLED) + { + return Nullable(false); + } + return Nullable(); + } + cef_state_t CefStateFromEnabledSetting(Nullable^ value) + { + if (value == nullptr) + { + return STATE_DEFAULT; + } + else if (value->Value) + { + return STATE_ENABLED; + } + else // !value->Value + { + return STATE_DISABLED; + } + return STATE_DEFAULT; + } public ref class BrowserSettings { @@ -108,10 +146,10 @@ namespace CefSharp void set(int value) { _browserSettings->minimum_logical_font_size = value; } } - property BrowserSettingsState RemoteFonts + property Nullable^ RemoteFontsDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->remote_fonts); } - void set(BrowserSettingsState value) { _browserSettings->remote_fonts = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->remote_fonts); } + void set(Nullable^ value) { _browserSettings->remote_fonts = CefStateFromDisabledSetting(value); } } property String^ DefaultEncoding @@ -120,94 +158,94 @@ namespace CefSharp void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->default_encoding, value); } } - property BrowserSettingsState JavaScript + property Nullable^ JavaScriptDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript); } - void set(BrowserSettingsState value) { _browserSettings->javascript = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript); } + void set(Nullable^ value) { _browserSettings->javascript = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState JavaScriptOpenWindows + property Nullable^ JavaScriptOpenWindowsDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_open_windows); } - void set(BrowserSettingsState value) { _browserSettings->javascript_open_windows = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_open_windows); } + void set(Nullable^ value) { _browserSettings->javascript_open_windows = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState JavaScriptCloseWindows + property Nullable^ JavaScriptCloseWindowsDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_close_windows); } - void set(BrowserSettingsState value) { _browserSettings->javascript_close_windows = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_close_windows); } + void set(Nullable^ value) { _browserSettings->javascript_close_windows = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState JavaScriptAccessClipboard + property Nullable^ JavaScriptAccessClipboardDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_access_clipboard); } - void set(BrowserSettingsState value) { _browserSettings->javascript_access_clipboard = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_access_clipboard); } + void set(Nullable^ value) { _browserSettings->javascript_access_clipboard = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState JavascriptDomPaste + property Nullable^ JavascriptDomPasteDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->javascript_dom_paste); } - void set(BrowserSettingsState value) { _browserSettings->javascript_dom_paste = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_dom_paste); } + void set(Nullable^ value) { _browserSettings->javascript_dom_paste = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState CaretBrowsing + property Nullable^ CaretBrowsingEnabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->caret_browsing); } - void set(BrowserSettingsState value) { _browserSettings->caret_browsing = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToEnabledSetting(_browserSettings->caret_browsing); } + void set(Nullable^ value) { _browserSettings->caret_browsing = CefStateFromEnabledSetting(value); } } - property BrowserSettingsState Java + property Nullable^ JavaDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->java); } - void set(BrowserSettingsState value) { _browserSettings->java = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->java); } + void set(Nullable^ value) { _browserSettings->java = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState Plugins + property Nullable^ PluginsDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->plugins); } - void set(BrowserSettingsState value) { _browserSettings->plugins = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->plugins); } + void set(Nullable^ value) { _browserSettings->plugins = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState UniversalAccessFromFileUrls + property Nullable^ UniversalAccessFromFileUrlsAllowed { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->universal_access_from_file_urls); } - void set(BrowserSettingsState value) { _browserSettings->universal_access_from_file_urls = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToEnabledSetting(_browserSettings->universal_access_from_file_urls); } + void set(Nullable^ value) { _browserSettings->universal_access_from_file_urls = CefStateFromEnabledSetting(value); } } - property BrowserSettingsState FileAccessFromFileUrls + property Nullable^ FileAccessFromFileUrlsAllowed { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->file_access_from_file_urls); } - void set(BrowserSettingsState value) { _browserSettings->file_access_from_file_urls = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToEnabledSetting(_browserSettings->file_access_from_file_urls); } + void set(Nullable^ value) { _browserSettings->file_access_from_file_urls = CefStateFromEnabledSetting(value); } } - property BrowserSettingsState WebSecurity + property Nullable^ WebSecurityDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->web_security); } - void set(BrowserSettingsState value) { _browserSettings->web_security = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->web_security); } + void set(Nullable^ value) { _browserSettings->web_security = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState ImageLoading + property Nullable^ ImageLoadingDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->image_loading); } - void set(BrowserSettingsState value) { _browserSettings->image_loading = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->image_loading); } + void set(Nullable^ value) { _browserSettings->image_loading = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState ImageShrinkStandaloneToFit + property Nullable^ ImageShrinkStandaloneToFitEnabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->image_shrink_standalone_to_fit); } - void set(BrowserSettingsState value) { _browserSettings->image_shrink_standalone_to_fit= CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToEnabledSetting(_browserSettings->image_shrink_standalone_to_fit); } + void set(Nullable^ value) { _browserSettings->image_shrink_standalone_to_fit= CefStateFromEnabledSetting(value); } } - property BrowserSettingsState TextAreaResize + property Nullable^ TextAreaResizeDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->text_area_resize); } - void set(BrowserSettingsState value) { _browserSettings->text_area_resize = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->text_area_resize); } + void set(Nullable^ value) { _browserSettings->text_area_resize = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState TabToLinks + property Nullable^ TabToLinksDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->tab_to_links); } - void set(BrowserSettingsState value) { _browserSettings->tab_to_links = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->tab_to_links); } + void set(Nullable^ value) { _browserSettings->tab_to_links = CefStateFromDisabledSetting(value); } } property String^ UserStyleSheetLocation @@ -216,40 +254,40 @@ namespace CefSharp void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); } } - property BrowserSettingsState AuthorAndUserStyles + property Nullable^ AuthorAndUserStylesDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->author_and_user_styles); } - void set(BrowserSettingsState value) { _browserSettings->author_and_user_styles = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->author_and_user_styles); } + void set(Nullable^ value) { _browserSettings->author_and_user_styles = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState LocalStorage + property Nullable^ LocalStorageDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->local_storage); } - void set(BrowserSettingsState value) { _browserSettings->local_storage = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->local_storage); } + void set(Nullable^ value) { _browserSettings->local_storage = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState Databases + property Nullable^ DatabasesDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->databases); } - void set(BrowserSettingsState value) { _browserSettings->databases = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->databases); } + void set(Nullable^ value) { _browserSettings->databases = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState ApplicationCache + property Nullable^ ApplicationCacheDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->application_cache); } - void set(BrowserSettingsState value) { _browserSettings->application_cache = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->application_cache); } + void set(Nullable^ value) { _browserSettings->application_cache = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState WebGl + property Nullable^ WebGlDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->webgl); } - void set(BrowserSettingsState value) { _browserSettings->webgl = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->webgl); } + void set(Nullable^ value) { _browserSettings->webgl = CefStateFromDisabledSetting(value); } } - property BrowserSettingsState AcceleratedCompositing + property Nullable^ AcceleratedCompositingDisabled { - BrowserSettingsState get() { return CefStateToSettingsState(_browserSettings->accelerated_compositing); } - void set(BrowserSettingsState value) { _browserSettings->accelerated_compositing = CefStateFromSettingsState(value); } + Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->accelerated_compositing); } + void set(Nullable^ value) { _browserSettings->accelerated_compositing = CefStateFromDisabledSetting(value); } } }; } \ No newline at end of file From 517afb210dca77d1d630d23037de8ff8cad784f9 Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 22 Apr 2014 08:40:30 +0200 Subject: [PATCH 6/7] Removed trailing space and updated copyright year --- CefSharp.Core/BrowserSettings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h index cf3872c27a..b26e0986e6 100644 --- a/CefSharp.Core/BrowserSettings.h +++ b/CefSharp.Core/BrowserSettings.h @@ -1,4 +1,4 @@ -// Copyright © 2010-2013 The CefSharp Project. All rights reserved. +// Copyright © 2010-2014 The CefSharp Project. All rights reserved. // // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. @@ -37,7 +37,7 @@ namespace CefSharp return STATE_ENABLED; } return STATE_DEFAULT; - } + } Nullable CefStateToEnabledSetting(cef_state_t state) { @@ -67,7 +67,7 @@ namespace CefSharp return STATE_DISABLED; } return STATE_DEFAULT; - } + } public ref class BrowserSettings { From e4e95bbfd6631218b7de983f3de34fc8a5e4f817 Mon Sep 17 00:00:00 2001 From: fraenke75 Date: Tue, 22 Apr 2014 16:43:30 +0200 Subject: [PATCH 7/7] Changed JavaScriptDisabled to JavascriptDisabled --- CefSharp.Core/BrowserSettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h index b26e0986e6..2a0b11d08c 100644 --- a/CefSharp.Core/BrowserSettings.h +++ b/CefSharp.Core/BrowserSettings.h @@ -158,7 +158,7 @@ namespace CefSharp void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->default_encoding, value); } } - property Nullable^ JavaScriptDisabled + property Nullable^ JavascriptDisabled { Nullable^ get() { return CefStateToDisabledSetting(_browserSettings->javascript); } void set(Nullable^ value) { _browserSettings->javascript = CefStateFromDisabledSetting(value); }