From 8486ec564e0e833b175f595a23ec1ccd19ac9fa1 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 2 Apr 2013 21:04:22 +0000 Subject: [PATCH] Update to Chromium revision 190564. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1169 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- cef1/cef.gyp | 1 + cef1/libcef/browser_file_system.cc | 6 ++-- cef1/libcef/browser_file_system.h | 5 +-- cef1/libcef/browser_request_context.cc | 11 +++---- cef1/libcef/browser_resource_loader_bridge.cc | 2 +- cef1/libcef/browser_webview_delegate.cc | 33 ++----------------- cef1/libcef/browser_webview_delegate.h | 14 ++------ cef1/libcef/scheme_impl.cc | 6 ---- cef1/libcef/web_drag_source_win.cc | 2 +- cef1/libcef/web_drag_source_win.h | 4 +-- cef1/libcef/web_drop_target_win.cc | 2 +- cef1/libcef/web_drop_target_win.h | 4 +-- cef1/patch/patch.cfg | 10 +++--- cef1/patch/patches/spi_webcore_364.patch | 6 ++-- cef1/patch/patches/tools_gyp.patch | 14 -------- cef1/patch/patches/webkit_933.patch | 13 ++++++++ 17 files changed, 46 insertions(+), 89 deletions(-) delete mode 100644 cef1/patch/patches/tools_gyp.patch create mode 100644 cef1/patch/patches/webkit_933.patch diff --git a/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt b/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt index 0abb126d1..33662137f 100644 --- a/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -17,5 +17,5 @@ { 'chromium_url': 'http://src.chromium.org/svn/trunk/src', - 'chromium_revision': '187216', + 'chromium_revision': '190564', } diff --git a/cef1/cef.gyp b/cef1/cef.gyp index c61bc34f5..810b51e53 100644 --- a/cef1/cef.gyp +++ b/cef1/cef.gyp @@ -486,6 +486,7 @@ ], 'sources': [ '<@(includes_win)', + '$(OutDir)/obj/global_intermediate/ui/ui_resources/ui_unscaled_resources.rc', '$(OutDir)/obj/global_intermediate/webkit/webkit_chromium_resources.rc', '$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc', 'libcef_dll/libcef_dll.rc', diff --git a/cef1/libcef/browser_file_system.cc b/cef1/libcef/browser_file_system.cc index e4e3f303e..fb6fe8b12 100644 --- a/cef1/libcef/browser_file_system.cc +++ b/cef1/libcef/browser_file_system.cc @@ -105,7 +105,8 @@ BrowserFileSystem::~BrowserFileSystem() { } void BrowserFileSystem::OpenFileSystem( - WebFrame* frame, WebFileSystem::Type type, + WebFrame* frame, + WebKit::WebFileSystemType type, long long, bool create, // NOLINT(runtime/int) WebFileSystemCallbacks* callbacks) { if (!frame || !file_system_context_.get()) { @@ -121,7 +122,8 @@ void BrowserFileSystem::OpenFileSystem( } void BrowserFileSystem::DeleteFileSystem( - WebFrame* frame, WebFileSystem::Type type, + WebFrame* frame, + WebKit::WebFileSystemType type, WebFileSystemCallbacks* callbacks) { if (!frame || !file_system_context_.get()) { callbacks->didFail(WebKit::WebFileErrorSecurity); diff --git a/cef1/libcef/browser_file_system.h b/cef1/libcef/browser_file_system.h index c7a269f8f..badffb64c 100644 --- a/cef1/libcef/browser_file_system.h +++ b/cef1/libcef/browser_file_system.h @@ -12,6 +12,7 @@ #include "base/id_map.h" #include "base/memory/weak_ptr.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_types.h" @@ -41,12 +42,12 @@ class BrowserFileSystem void CreateContext(); void OpenFileSystem(WebKit::WebFrame* frame, - WebKit::WebFileSystem::Type type, + WebKit::WebFileSystemType type, long long size, // NOLINT(runtime/int) bool create, WebKit::WebFileSystemCallbacks* callbacks); void DeleteFileSystem(WebKit::WebFrame* frame, - WebKit::WebFileSystem::Type type, + WebKit::WebFileSystemType type, WebKit::WebFileSystemCallbacks* callbacks); fileapi::FileSystemContext* file_system_context() { diff --git a/cef1/libcef/browser_request_context.cc b/cef1/libcef/browser_request_context.cc index b8339866d..f9088d330 100644 --- a/cef1/libcef/browser_request_context.cc +++ b/cef1/libcef/browser_request_context.cc @@ -23,10 +23,7 @@ #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "net/base/cert_verifier.h" #include "net/cookies/cookie_monster.h" -#include "net/base/default_server_bound_cert_store.h" -#include "net/base/host_resolver.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_config_service_defaults.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_server_properties_impl.h" @@ -34,6 +31,9 @@ #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_resolver.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request_job_factory_impl.h" #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" @@ -133,9 +133,6 @@ class CefHttpUserAgentSettings : public net::HttpUserAgentSettings { virtual std::string GetAcceptLanguage() const OVERRIDE { return "en-us,en"; } - virtual std::string GetAcceptCharset() const OVERRIDE { - return "iso-8859-1,*,utf-8"; - } virtual std::string GetUserAgent(const GURL& url) const OVERRIDE { return webkit_glue::GetUserAgent(url); diff --git a/cef1/libcef/browser_resource_loader_bridge.cc b/cef1/libcef/browser_resource_loader_bridge.cc index 60d26b7c7..5a6de9c2e 100644 --- a/cef1/libcef/browser_resource_loader_bridge.cc +++ b/cef1/libcef/browser_resource_loader_bridge.cc @@ -595,7 +595,7 @@ class RequestProxy : public net::URLRequest::Delegate, browser_->request_context_proxy() : _Context->request_context(); request_.reset(new net::URLRequest(params->url, this, context)); - request_->set_priority(params->priority); + request_->SetPriority(params->priority); request_->set_method(params->method); request_->set_first_party_for_cookies(params->first_party_for_cookies); request_->set_referrer(params->referrer.spec()); diff --git a/cef1/libcef/browser_webview_delegate.cc b/cef1/libcef/browser_webview_delegate.cc index e22265de1..6b99c07c6 100644 --- a/cef1/libcef/browser_webview_delegate.cc +++ b/cef1/libcef/browser_webview_delegate.cc @@ -267,14 +267,6 @@ bool BrowserWebViewDelegate::shouldApplyStyle(const WebString& style, return browser_->UIT_AllowEditing(); } -bool BrowserWebViewDelegate::isSmartInsertDeleteEnabled() { - return smart_insert_delete_enabled_; -} - -bool BrowserWebViewDelegate::isSelectTrailingWhitespaceEnabled() { - return select_trailing_whitespace_enabled_; -} - bool BrowserWebViewDelegate::handleCurrentKeyboardEvent() { WebWidgetHost* host = GetWidgetHost(); if (host && OnKeyboardEvent(host->GetLastKeyEvent(), true)) @@ -1014,7 +1006,8 @@ void BrowserWebViewDelegate::reportFindInPageSelection( } void BrowserWebViewDelegate::openFileSystem( - WebFrame* frame, WebFileSystem::Type type, + WebFrame* frame, + WebKit::WebFileSystemType type, long long size, // NOLINT(runtime/int) bool create, WebFileSystemCallbacks* callbacks) { @@ -1034,12 +1027,6 @@ BrowserWebViewDelegate::BrowserWebViewDelegate(CefBrowserImpl* browser) last_page_id_updated_(-1), #if defined(OS_WIN) destroy_on_drag_end_(false), -#endif - smart_insert_delete_enabled_(true), -#if defined(OS_WIN) - select_trailing_whitespace_enabled_(true), -#else - select_trailing_whitespace_enabled_(false), #endif block_redirects_(false), cookie_jar_(browser) { @@ -1055,22 +1042,8 @@ void BrowserWebViewDelegate::Reset() { new (this)BrowserWebViewDelegate(browser); // NOLINT(whitespace/parens) } -void BrowserWebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) { - smart_insert_delete_enabled_ = enabled; - // In upstream WebKit, smart insert/delete is mutually exclusive with select - // trailing whitespace, however, we allow both because Chromium on Windows - // allows both. -} - -void BrowserWebViewDelegate::SetSelectTrailingWhitespaceEnabled(bool enabled) { - select_trailing_whitespace_enabled_ = enabled; - // In upstream WebKit, smart insert/delete is mutually exclusive with select - // trailing whitespace, however, we allow both because Chromium on Windows - // allows both. -} - void BrowserWebViewDelegate::SetCustomPolicyDelegate(bool is_custom, - bool is_permissive) { + bool is_permissive) { policy_delegate_enabled_ = is_custom; policy_delegate_is_permissive_ = is_permissive; } diff --git a/cef1/libcef/browser_webview_delegate.h b/cef1/libcef/browser_webview_delegate.h index d6faa3190..6a863f655 100644 --- a/cef1/libcef/browser_webview_delegate.h +++ b/cef1/libcef/browser_webview_delegate.h @@ -24,6 +24,7 @@ #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" @@ -99,8 +100,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient, virtual bool shouldDeleteRange(const WebKit::WebRange& range) OVERRIDE; virtual bool shouldApplyStyle( const WebKit::WebString& style, const WebKit::WebRange& range) OVERRIDE; - virtual bool isSmartInsertDeleteEnabled() OVERRIDE; - virtual bool isSelectTrailingWhitespaceEnabled() OVERRIDE; virtual bool handleCurrentKeyboardEvent() OVERRIDE; virtual bool runFileChooser( const WebKit::WebFileChooserParams& params, @@ -211,7 +210,7 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient, OVERRIDE; virtual void openFileSystem( WebKit::WebFrame* frame, - WebKit::WebFileSystem::Type type, + WebKit::WebFileSystemType type, long long size, // NOLINT(runtime/int) bool create, WebKit::WebFileSystemCallbacks* callbacks) OVERRIDE; @@ -245,9 +244,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient, virtual ~BrowserWebViewDelegate(); void Reset(); - void SetSmartInsertDeleteEnabled(bool enabled); - void SetSelectTrailingWhitespaceEnabled(bool enabled); - // Additional accessors #if defined(OS_WIN) || defined(OS_LINUX) // Sets the webview as a drop target. @@ -388,12 +384,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient, scoped_ptr external_popup_menu_; #endif - // true if we want to enable smart insert/delete. - bool smart_insert_delete_enabled_; - - // true if we want to enable selection of trailing whitespaces - bool select_trailing_whitespace_enabled_; - // true if we should block any redirects bool block_redirects_; diff --git a/cef1/libcef/scheme_impl.cc b/cef1/libcef/scheme_impl.cc index 3bb2d9f22..751d0aeb7 100644 --- a/cef1/libcef/scheme_impl.cc +++ b/cef1/libcef/scheme_impl.cc @@ -147,12 +147,6 @@ class CefUrlRequestJob : public net::URLRequestJob { changed = true; } - if (SetHeaderIfMissing(headerMap, - net::HttpRequestHeaders::kAcceptCharset, - ua_settings->GetAcceptCharset())) { - changed = true; - } - if (SetHeaderIfMissing(headerMap, net::HttpRequestHeaders::kUserAgent, ua_settings->GetUserAgent(request_->url()))) { diff --git a/cef1/libcef/web_drag_source_win.cc b/cef1/libcef/web_drag_source_win.cc index 9ae3787a7..4c7a96c0d 100644 --- a/cef1/libcef/web_drag_source_win.cc +++ b/cef1/libcef/web_drag_source_win.cc @@ -32,7 +32,7 @@ static void GetCursorPositions(gfx::NativeWindow wnd, gfx::Point* client, // WebDragSource, public: WebDragSource::WebDragSource(gfx::NativeWindow source_wnd, WebView* view) - : ui::DragSource(), + : ui::DragSourceWin(), source_wnd_(source_wnd), view_(view), effect_(DROPEFFECT_NONE) { diff --git a/cef1/libcef/web_drag_source_win.h b/cef1/libcef/web_drag_source_win.h index 283735acb..c7b485746 100644 --- a/cef1/libcef/web_drag_source_win.h +++ b/cef1/libcef/web_drag_source_win.h @@ -8,7 +8,7 @@ #pragma once #include "base/basictypes.h" -#include "ui/base/dragdrop/drag_source.h" +#include "ui/base/dragdrop/drag_source_win.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" @@ -20,7 +20,7 @@ class WebView; // by an active drag-drop operation as the user mouses over other drop targets // on their system. This object tells Windows whether or not the drag should // continue, and supplies the appropriate cursors. -class WebDragSource : public ui::DragSource { +class WebDragSource : public ui::DragSourceWin { public: // Create a new DragSource for a given HWND and WebView. WebDragSource(gfx::NativeWindow source_wnd, WebKit::WebView* view); diff --git a/cef1/libcef/web_drop_target_win.cc b/cef1/libcef/web_drop_target_win.cc index 4c4bdb58a..d6dd91fab 100644 --- a/cef1/libcef/web_drop_target_win.cc +++ b/cef1/libcef/web_drop_target_win.cc @@ -49,7 +49,7 @@ DWORD GetPreferredDropEffect(DWORD effect) { } // namespace WebDropTarget::WebDropTarget(CefBrowserImpl* browser) - : ui::DropTarget(browser->UIT_GetWebViewWndHandle()), + : ui::DropTargetWin(browser->UIT_GetWebViewWndHandle()), browser_(browser), current_wvh_(NULL), drag_cursor_(WebDragOperationNone), diff --git a/cef1/libcef/web_drop_target_win.h b/cef1/libcef/web_drop_target_win.h index 5759c9bda..71bc1a395 100644 --- a/cef1/libcef/web_drop_target_win.h +++ b/cef1/libcef/web_drop_target_win.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" -#include "ui/base/dragdrop/drop_target.h" +#include "ui/base/dragdrop/drop_target_win.h" class CefBrowserImpl; class WebViewHost; @@ -17,7 +17,7 @@ class WebViewHost; // A helper object that provides drop capabilities to a WebView. The // DropTarget handles drags that enter the region of the WebView by // passing on the events to the renderer. -class WebDropTarget : public ui::DropTarget { +class WebDropTarget : public ui::DropTargetWin { public: // Create a new WebDropTarget associating it with the given HWND and // WebView. diff --git a/cef1/patch/patch.cfg b/cef1/patch/patch.cfg index 0ef2d8a1d..c6a97d990 100644 --- a/cef1/patch/patch.cfg +++ b/cef1/patch/patch.cfg @@ -11,11 +11,6 @@ patches = [ 'name': 'build', 'path': '../build/', }, - { - # http://code.google.com/p/gyp/issues/detail?id=223 - 'name': 'tools_gyp', - 'path': '../tools/gyp/', - }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=496 'name': 'zlib', @@ -26,6 +21,11 @@ patches = [ 'name': 'message_loop_443', 'path': '../base/', }, + { + # http://code.google.com/p/chromiumembedded/issues/detail?id=933 + 'name': 'webkit_933', + 'path': '../third_party/WebKit/Source/WebKit/chromium/src/', + }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=364 'name': 'spi_webcore_364', diff --git a/cef1/patch/patches/spi_webcore_364.patch b/cef1/patch/patches/spi_webcore_364.patch index 646f6fba6..234db8dad 100644 --- a/cef1/patch/patches/spi_webcore_364.patch +++ b/cef1/patch/patches/spi_webcore_364.patch @@ -1,8 +1,8 @@ Index: page/FrameView.cpp =================================================================== ---- page/FrameView.cpp (revision 143980) +--- page/FrameView.cpp (revision 146842) +++ page/FrameView.cpp (working copy) -@@ -208,10 +208,12 @@ +@@ -209,10 +209,12 @@ if (!page) return; @@ -17,7 +17,7 @@ Index: page/FrameView.cpp PassRefPtr FrameView::create(Frame* frame) Index: platform/mac/NSScrollerImpDetails.mm =================================================================== ---- platform/mac/NSScrollerImpDetails.mm (revision 143980) +--- platform/mac/NSScrollerImpDetails.mm (revision 146842) +++ platform/mac/NSScrollerImpDetails.mm (working copy) @@ -34,6 +34,7 @@ #if PLATFORM(CHROMIUM) diff --git a/cef1/patch/patches/tools_gyp.patch b/cef1/patch/patches/tools_gyp.patch deleted file mode 100644 index 37faffb95..000000000 --- a/cef1/patch/patches/tools_gyp.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: pylib/gyp/input.py -=================================================================== ---- pylib/gyp/input.py (revision 1583) -+++ pylib/gyp/input.py (working copy) -@@ -843,7 +843,8 @@ - # that don't load quickly, this can be faster than - # createEventListenerWrapper(eventType, useCapture, m_private.get()); + // The listenerWrapper is only referenced by the actual Node. Once it goes