From 7e1fbaca6ad5174b9a24354a31d282b046c1aa81 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 11 Nov 2013 17:29:52 +0000 Subject: [PATCH] Update to Chromium revision 234212 - The CefBrowserSettings.user_style_sheet_location option is no longer supported in Blink. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1516 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- include/internal/cef_types.h | 8 -------- include/internal/cef_types_wrappers.h | 5 ----- libcef/browser/browser_settings.cc | 13 ------------- libcef/browser/devtools_delegate.cc | 3 +-- libcef/common/cef_switches.cc | 3 --- libcef/common/cef_switches.h | 1 - patch/patches/webkit_popups.patch | 14 +++++++------- 8 files changed, 9 insertions(+), 40 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index a47728fb7..d30270090 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -17,5 +17,5 @@ { 'chromium_url': 'http://src.chromium.org/svn/trunk/src', - 'chromium_revision': '233896', + 'chromium_revision': '234212', } diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index 0f7b36c6a..a44917089 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -372,14 +372,6 @@ typedef struct _cef_browser_settings_t { /// cef_string_t default_encoding; - /// - // Location of the user style sheet that will be used for all pages. This must - // be a data URL of the form "data:text/css;charset=utf-8;base64,csscontent" - // where "csscontent" is the base64 encoded contents of the CSS file. Also - // configurable using the "user-style-sheet-location" command-line switch. - /// - cef_string_t user_style_sheet_location; - /// // Controls the loading of fonts from remote sources. Also configurable using // the "disable-remote-fonts" command-line switch. diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h index 8c201faf7..7dbbd3111 100644 --- a/include/internal/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -400,7 +400,6 @@ struct CefBrowserSettingsTraits { cef_string_clear(&s->cursive_font_family); cef_string_clear(&s->fantasy_font_family); cef_string_clear(&s->default_encoding); - cef_string_clear(&s->user_style_sheet_location); } static inline void set(const struct_type* src, struct_type* target, @@ -427,10 +426,6 @@ struct CefBrowserSettingsTraits { cef_string_set(src->default_encoding.str, src->default_encoding.length, &target->default_encoding, copy); - cef_string_set(src->user_style_sheet_location.str, - src->user_style_sheet_location.length, - &target->user_style_sheet_location, copy); - target->remote_fonts = src->remote_fonts; target->javascript = src->javascript; target->javascript_open_windows = src->javascript_open_windows; diff --git a/libcef/browser/browser_settings.cc b/libcef/browser/browser_settings.cc index ecea65db4..d52658296 100644 --- a/libcef/browser/browser_settings.cc +++ b/libcef/browser/browser_settings.cc @@ -22,13 +22,6 @@ void SetDefaults(WebPreferences& web) { command_line.GetSwitchValueASCII(switches::kDefaultEncoding); } - if (command_line.HasSwitch(switches::kUserStyleSheetLocation)) { - web.user_style_sheet_location = GURL( - command_line.GetSwitchValueASCII(switches::kUserStyleSheetLocation)); - if (!web.user_style_sheet_location.is_empty()) - web.user_style_sheet_enabled = true; - } - web.javascript_can_open_windows_automatically = !command_line.HasSwitch(switches::kDisableJavascriptOpenWindows); web.allow_scripts_to_close_windows = @@ -102,12 +95,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) { if (cef.default_encoding.length > 0) web.default_encoding = CefString(&cef.default_encoding); - if (cef.user_style_sheet_location.length > 0) { - web.user_style_sheet_enabled = true; - web.user_style_sheet_location = - GURL(CefString(&cef.user_style_sheet_location).ToString()); - } - SET_STATE(cef.remote_fonts, web.remote_fonts_enabled); SET_STATE(cef.javascript, web.javascript_enabled); SET_STATE(cef.javascript_open_windows, diff --git a/libcef/browser/devtools_delegate.cc b/libcef/browser/devtools_delegate.cc index f5ce913db..f080047ae 100644 --- a/libcef/browser/devtools_delegate.cc +++ b/libcef/browser/devtools_delegate.cc @@ -28,7 +28,6 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "grit/cef_resources.h" -#include "net/base/escape.h" #include "net/socket/tcp_listen_socket.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" @@ -74,7 +73,7 @@ Target::Target(content::WebContents* web_contents) { content::DevToolsAgentHost::GetOrCreateFor( web_contents->GetRenderViewHost()); id_ = agent_host_->GetId(); - title_ = UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle())); + title_ = UTF16ToUTF8(web_contents->GetTitle()); url_ = web_contents->GetURL(); content::NavigationController& controller = web_contents->GetController(); content::NavigationEntry* entry = controller.GetActiveEntry(); diff --git a/libcef/common/cef_switches.cc b/libcef/common/cef_switches.cc index d5e17ae74..7ef72eea9 100644 --- a/libcef/common/cef_switches.cc +++ b/libcef/common/cef_switches.cc @@ -39,9 +39,6 @@ const char kContextSafetyImplementation[] = "context-safety-implementation"; // Default encoding. const char kDefaultEncoding[] = "default-encoding"; -// User style sheet location. -const char kUserStyleSheetLocation[] = "user-style-sheet-location"; - // Disable opening of windows via JavaScript. const char kDisableJavascriptOpenWindows[] = "disable-javascript-open-windows"; diff --git a/libcef/common/cef_switches.h b/libcef/common/cef_switches.h index c53588529..2ca072214 100644 --- a/libcef/common/cef_switches.h +++ b/libcef/common/cef_switches.h @@ -25,7 +25,6 @@ extern const char kDisablePackLoading[]; extern const char kUncaughtExceptionStackSize[]; extern const char kContextSafetyImplementation[]; extern const char kDefaultEncoding[]; -extern const char kUserStyleSheetLocation[]; extern const char kDisableJavascriptOpenWindows[]; extern const char kDisableJavascriptCloseWindows[]; extern const char kDisableJavascriptAccessClipboard[]; diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index d649d4564..d50d4be03 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,8 +1,8 @@ Index: public/web/WebView.h =================================================================== ---- public/web/WebView.h (revision 161588) +--- public/web/WebView.h (revision 161696) +++ public/web/WebView.h (working copy) -@@ -443,6 +443,7 @@ +@@ -441,6 +441,7 @@ // Sets whether select popup menus should be rendered by the browser. BLINK_EXPORT static void setUseExternalPopupMenus(bool); @@ -12,7 +12,7 @@ Index: public/web/WebView.h // Visited link state -------------------------------------------------- Index: Source/web/ChromeClientImpl.cpp =================================================================== ---- Source/web/ChromeClientImpl.cpp (revision 161588) +--- Source/web/ChromeClientImpl.cpp (revision 161696) +++ Source/web/ChromeClientImpl.cpp (working copy) @@ -871,7 +871,7 @@ @@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp return adoptRef(new PopupMenuChromium(frame, client)); Index: Source/web/WebViewImpl.cpp =================================================================== ---- Source/web/WebViewImpl.cpp (revision 161588) +--- Source/web/WebViewImpl.cpp (revision 161696) +++ Source/web/WebViewImpl.cpp (working copy) -@@ -403,6 +403,7 @@ +@@ -390,6 +390,7 @@ , m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationUseAnchor(false) , m_contextMenuAllowed(false) @@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -3714,9 +3715,14 @@ +@@ -3693,9 +3694,14 @@ updateLayerTreeViewport(); } @@ -53,7 +53,7 @@ Index: Source/web/WebViewImpl.cpp void WebViewImpl::startDragging(Frame* frame, Index: Source/web/WebViewImpl.h =================================================================== ---- Source/web/WebViewImpl.h (revision 161588) +--- Source/web/WebViewImpl.h (revision 161696) +++ Source/web/WebViewImpl.h (working copy) @@ -414,7 +414,8 @@