bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-26 08:58:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 272007.

Browse Source 
- Remove CefSettings.accelerated_compositing option (see https://crbug.com/363772).
- Remove experimental x-webkit-speech support (see https://crbug.com/223198).
- Execute CefGeolocationHandler callbacks on the UI thread (see https://crbug.com/304341#c212).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1711 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-05-29 17:15:34 +00:00
parent 79bd4dd93c
commit 74b35c30eb
66 changed files with 232 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -8,6 +8,6 @@
{
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '263053',
'chromium_checkout': 'dd59d5c59810495630c5fa5cd7a92eceac24bc9a',
'chromium_revision': '272007',
'chromium_checkout': '556ef20cb5deabfd321c044cba8417c2725266cc',
}

6
cef.gyp
View File

@ -611,7 +611,7 @@
'target_name': 'cef_locales',
'type': 'none',
'dependencies': [
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
'cef_strings',
],
@ -1032,6 +1032,10 @@
'<(DEPTH)/chrome/browser/prefs/proxy_prefs.h',
'<(DEPTH)/chrome/common/pref_names.cc',
'<(DEPTH)/chrome/common/pref_names.h',
'<(DEPTH)/components/data_reduction_proxy/common/data_reduction_proxy_switches.cc',
'<(DEPTH)/components/data_reduction_proxy/common/data_reduction_proxy_switches.h',
'<(DEPTH)/components/data_reduction_proxy/common/data_reduction_proxy_pref_names.cc',
'<(DEPTH)/components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h',
# Include sources for the loadtimes V8 extension.
'<(DEPTH)/chrome/renderer/loadtimes_extension_bindings.h',
'<(DEPTH)/chrome/renderer/loadtimes_extension_bindings.cc',

7
include/capi/cef_context_menu_handler_capi.h
View File

@ -203,13 +203,6 @@ typedef struct _cef_context_menu_params_t {
///
int (CEF_CALLBACK *is_editable)(struct _cef_context_menu_params_t* self);
///
// Returns true (1) if the context menu was invoked on an editable node where
// speech-input is enabled.
///
int (CEF_CALLBACK *is_speech_input_enabled)(
struct _cef_context_menu_params_t* self);
///
// Returns flags representing the actions supported by the editable node, if
// any, that the context menu was invoked on.

2
include/capi/cef_geolocation_handler_capi.h
View File

@ -67,7 +67,7 @@ typedef struct _cef_geolocation_callback_t {
///
// Implement this structure to handle events related to geolocation permission
// requests. The functions of this structure will be called on the browser
// process IO thread.
// process UI thread.
///
typedef struct _cef_geolocation_handler_t {
///

7
include/cef_context_menu_handler.h
View File

@ -199,13 +199,6 @@ class CefContextMenuParams : public virtual CefBase {
/*--cef()--*/
virtual bool IsEditable() =0;
///
// Returns true if the context menu was invoked on an editable node where
// speech-input is enabled.
///
/*--cef()--*/
virtual bool IsSpeechInputEnabled() =0;
///
// Returns flags representing the actions supported by the editable node, if
// any, that the context menu was invoked on.

2
include/cef_geolocation_handler.h
View File

@ -58,7 +58,7 @@ class CefGeolocationCallback : public virtual CefBase {
///
// Implement this interface to handle events related to geolocation permission
// requests. The methods of this class will be called on the browser process IO
// requests. The methods of this class will be called on the browser process UI
// thread.
///
/*--cef(source=client)--*/

8
include/internal/cef_types.h
View File

@ -545,14 +545,6 @@ typedef struct _cef_browser_settings_t {
///
cef_state_t webgl;
///
// Controls whether content that depends on accelerated compositing can be
// used. Note that accelerated compositing requires hardware support and may
// not work on all systems even when enabled. Also configurable using the
// "disable-accelerated-compositing" command-line switch.
///
cef_state_t accelerated_compositing;
///
// Opaque background color used for the browser before a document is loaded
// and when no document color is specified. By default the background color

1
include/internal/cef_types_wrappers.h
View File

@ -449,7 +449,6 @@ struct CefBrowserSettingsTraits {
target->databases= src->databases;
target->application_cache = src->application_cache;
target->webgl = src->webgl;
target->accelerated_compositing = src->accelerated_compositing;
target->background_color = src->background_color;
}

29
libcef/browser/browser_context_impl.cc
View File

@ -43,15 +43,14 @@ class CefGeolocationPermissionContext
callback_(callback) {}
virtual void Continue(bool allow) OVERRIDE {
if (CEF_CURRENTLY_ON_IOT()) {
if (CEF_CURRENTLY_ON_UIT()) {
if (!callback_.is_null()) {
// Callback must be executed on the UI thread.
CEF_POST_TASK(CEF_UIT,
base::Bind(&CallbackImpl::Run, callback_, allow));
callback_.Run(allow);
context_->RemoveCallback(bridge_id_);
}
} else {
CEF_POST_TASK(CEF_IOT,
CEF_POST_TASK(CEF_UIT,
base::Bind(&CallbackImpl::Continue, this, allow));
}
}
@ -77,18 +76,16 @@ class CefGeolocationPermissionContext
CefGeolocationPermissionContext() {}
virtual void RequestGeolocationPermission(
int render_process_id,
int render_view_id,
content::WebContents* web_contents,
int bridge_id,
const GURL& requesting_frame,
bool user_gesture,
base::Callback<void(bool)> callback) // NOLINT(readability/function)
OVERRIDE {
CEF_REQUIRE_IOT();
CEF_REQUIRE_UIT();
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::GetBrowserForView(render_process_id,
render_view_id);
CefBrowserHostImpl::GetBrowserForContents(web_contents);
if (browser.get()) {
CefRefPtr<CefClient> client = browser->GetClient();
if (client.get()) {
@ -110,19 +107,17 @@ class CefGeolocationPermissionContext
}
// Disallow geolocation access by default.
CEF_POST_TASK(CEF_UIT, base::Bind(callback, false));
callback.Run(false);
}
virtual void CancelGeolocationPermissionRequest(
int render_process_id,
int render_view_id,
content::WebContents* web_contents,
int bridge_id,
const GURL& requesting_frame) OVERRIDE {
RemoveCallback(bridge_id);
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::GetBrowserForView(render_process_id,
render_view_id);
CefBrowserHostImpl::GetBrowserForContents(web_contents);
if (browser.get()) {
CefRefPtr<CefClient> client = browser->GetClient();
if (client.get()) {
@ -138,7 +133,7 @@ class CefGeolocationPermissionContext
}
void RemoveCallback(int bridge_id) {
CEF_REQUIRE_IOT();
CEF_REQUIRE_UIT();
// Disconnect the callback and remove the reference from the map.
CallbackMap::iterator it = callback_map_.find(bridge_id);
@ -295,6 +290,10 @@ content::GeolocationPermissionContext*
return geolocation_permission_context_;
}
content::BrowserPluginGuestManager* CefBrowserContextImpl::GetGuestManager() {
return NULL;
}
quota::SpecialStoragePolicy* CefBrowserContextImpl::GetSpecialStoragePolicy() {
return NULL;
}

1
libcef/browser/browser_context_impl.h
View File

@ -63,6 +63,7 @@ class CefBrowserContextImpl : public CefBrowserContext {
virtual content::ResourceContext* GetResourceContext() OVERRIDE;
virtual content::GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
// CefBrowserContext methods.

4
libcef/browser/browser_context_proxy.cc
View File

@ -152,6 +152,10 @@ content::GeolocationPermissionContext*
return parent_->GetGeolocationPermissionContext();
}
content::BrowserPluginGuestManager* CefBrowserContextProxy::GetGuestManager() {
return parent_->GetGuestManager();
}
quota::SpecialStoragePolicy* CefBrowserContextProxy::GetSpecialStoragePolicy() {
return parent_->GetSpecialStoragePolicy();
}

1
libcef/browser/browser_context_proxy.h
View File

@ -71,6 +71,7 @@ class CefBrowserContextProxy : public CefBrowserContext {
virtual content::ResourceContext* GetResourceContext() OVERRIDE;
virtual content::GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
// CefBrowserContext methods.

10
libcef/browser/browser_host_impl.cc
View File

@ -47,7 +47,6 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h"
#include "third_party/WebKit/public/web/WebFindOptions.h"
#include "ui/shell_dialogs/selected_file_info.h"
@ -585,8 +584,7 @@ class CefBrowserHostImpl::DevToolsWebContentsObserver :
}
// WebContentsObserver methods:
virtual void WebContentsDestroyed(
content::WebContents* web_contents) OVERRIDE {
virtual void WebContentsDestroyed() OVERRIDE {
browser_->OnDevToolsWebContentsDestroyed();
}
@ -1213,7 +1211,7 @@ gfx::NativeView CefBrowserHostImpl::GetContentView() const {
#else
if (!web_contents_.get())
return NULL;
return web_contents_->GetView()->GetNativeView();
return web_contents_->GetNativeView();
#endif
}
@ -1502,7 +1500,7 @@ void CefBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {
}
if (web_contents_.get())
web_contents_->GetView()->Focus();
web_contents_->Focus();
#if defined(OS_WIN)
// When windowed rendering is used in combination with Aura on Windows we
@ -1803,7 +1801,7 @@ void CefBrowserHostImpl::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) {
CEF_CURRENTLY_ON_UIT();
CEF_REQUIRE_UIT();
content::MediaStreamDevices devices;

2
libcef/browser/browser_host_impl_linux.cc
View File

@ -14,10 +14,8 @@
#include "base/bind.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h"
#include "content/public/common/renderer_preferences.h"
#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/views/widget/widget.h"

3
libcef/browser/browser_host_impl_mac.mm
View File

@ -19,7 +19,6 @@
#include "base/threading/thread_restrictions.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h"
#include "grit/ui_strings.h"
#include "net/base/mime_util.h"
@ -317,7 +316,7 @@ bool CefBrowserHostImpl::PlatformCreateWindow() {
// Parent the TabContents to the browser view.
const NSRect bounds = [browser_view bounds];
NSView* native_view = web_contents_->GetView()->GetNativeView();
NSView* native_view = web_contents_->GetNativeView();
[browser_view addSubview:native_view];
[native_view setFrame:bounds];
[native_view setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];

21
libcef/browser/browser_host_impl_win.cc
View File

@ -25,39 +25,22 @@
#include "base/win/windows_version.h"
#include "content/common/cursors/webcursor.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h"
#include "grit/cef_strings.h"
#include "grit/ui_strings.h"
#include "grit/ui_unscaled_resources.h"
#include "net/base/mime_util.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/win/shell.h"
#include "ui/gfx/win/hwnd_util.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
#include "ui/views/widget/widget.h"
#include "ui/views/win/hwnd_util.h"
#pragma comment(lib, "dwmapi.lib")
namespace {
HWND GetHWND(views::Widget* widget) {
gfx::NativeWindow window = widget->GetNativeWindow();
DCHECK(window);
if (!window)
return NULL;
views::DesktopWindowTreeHostWin* host =
static_cast<views::DesktopWindowTreeHostWin*>(window->GetHost());
DCHECK(host);
if (!host)
return NULL;
HWND hwnd = host->GetHWND();
DCHECK(hwnd);
return hwnd;
}
void WriteTempFileAndView(scoped_refptr<base::RefCountedString> str) {
CEF_REQUIRE_FILET();
@ -630,7 +613,7 @@ LRESULT CALLBACK CefBrowserHostImpl::WndProc(HWND hwnd, UINT message,
void CefBrowserHostImpl::PlatformSetViewFocus() {
if (window_widget_)
::SetFocus(GetHWND(window_widget_));
::SetFocus(views::HWNDForWidget(window_widget_));
}
ui::PlatformCursor CefBrowserHostImpl::GetPlatformCursor(

2
libcef/browser/browser_main.cc
View File

@ -68,7 +68,7 @@ void CefBrowserMainParts::PreEarlyInitialization() {
void CefBrowserMainParts::ToolkitInitialized() {
#if defined(USE_AURA)
aura::Env::CreateInstance();
CHECK(aura::Env::GetInstance());
DCHECK(!views::ViewsDelegate::views_delegate);
new views::DesktopTestViewsDelegate;

3
libcef/browser/browser_message_filter.h
View File

@ -8,6 +8,7 @@
#include <string>
#include "ipc/ipc_channel_proxy.h"
#include "ipc/message_filter.h"
namespace content {
class RenderProcessHost;
@ -18,7 +19,7 @@ struct CefProcessHostMsg_GetNewRenderThreadInfo_Params;
struct ViewHostMsg_CreateWindow_Params;
// This class sends and receives control messages on the browser process.
class CefBrowserMessageFilter : public IPC::ChannelProxy::MessageFilter {
class CefBrowserMessageFilter : public IPC::MessageFilter {
public:
explicit CefBrowserMessageFilter(content::RenderProcessHost* host);
virtual ~CefBrowserMessageFilter();

2
libcef/browser/browser_settings.cc
View File

@ -124,6 +124,4 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
// GPU blacklist is not being checked here.
if (cef.webgl == STATE_DISABLED)
web.experimental_webgl_enabled = false;
if (cef.accelerated_compositing == STATE_DISABLED)
web.accelerated_compositing_enabled = false;
}

10
libcef/browser/chrome_browser_process_stub.cc
View File

@ -234,12 +234,6 @@ component_updater::PnaclComponentInstaller*
return NULL;
}
BookmarkPromptController*
ChromeBrowserProcessStub::bookmark_prompt_controller() {
NOTIMPLEMENTED();
return NULL;
}
MediaFileSystemRegistry*
ChromeBrowserProcessStub::media_file_system_registry() {
NOTIMPLEMENTED();
@ -257,3 +251,7 @@ WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
return NULL;
}
#endif
NetworkTimeTracker* ChromeBrowserProcessStub::network_time_tracker() {
return NULL;
}

2
libcef/browser/chrome_browser_process_stub.h
View File

@ -85,13 +85,13 @@ class ChromeBrowserProcessStub : public BrowserProcess {
virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
virtual component_updater::PnaclComponentInstaller*
pnacl_component_installer() OVERRIDE;
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
virtual MediaFileSystemRegistry*
media_file_system_registry() OVERRIDE;
virtual bool created_local_state() const OVERRIDE;
#if defined(ENABLE_WEBRTC)
virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
#endif
virtual NetworkTimeTracker* network_time_tracker() OVERRIDE;
private:
std::string locale_;

2
libcef/browser/chrome_scheme_handler.cc
View File

@ -219,8 +219,6 @@ class Delegate : public InternalHandlerDelegate {
bool OnCredits(const std::string& path, Action* action) {
if (path == "credits.js") {
action->resource_id = IDR_CEF_CREDITS_JS;
} else if (path == "swiftshader.jpg") {
action->resource_id = IDR_CEF_CREDITS_SWIFTSHADER_JPG;
} else {
action->mime_type = "text/html";
action->resource_id = IDR_CEF_CREDITS_HTML;

2
libcef/browser/content_browser_client.cc
View File

@ -661,11 +661,9 @@ content::MediaObserver* CefContentBrowserClient::GetMediaObserver() {
content::SpeechRecognitionManagerDelegate*
CefContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
#if defined(ENABLE_INPUT_SPEECH)
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kEnableSpeechInput))
return new CefSpeechRecognitionManagerDelegate();
#endif
return NULL;
}

5
libcef/browser/context_menu_params_impl.cc
View File

@ -100,11 +100,6 @@ bool CefContextMenuParamsImpl::IsEditable() {
return const_value().is_editable;
}
bool CefContextMenuParamsImpl::IsSpeechInputEnabled() {
CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().speech_input_enabled;
}
CefContextMenuParamsImpl::EditStateFlags
CefContextMenuParamsImpl::GetEditStateFlags() {
CEF_VALUE_VERIFY_RETURN(false, CM_EDITFLAG_NONE);

1
libcef/browser/context_menu_params_impl.h
View File

@ -32,7 +32,6 @@ class CefContextMenuParamsImpl
virtual MediaStateFlags GetMediaStateFlags() OVERRIDE;
virtual CefString GetSelectionText() OVERRIDE;
virtual bool IsEditable() OVERRIDE;
virtual bool IsSpeechInputEnabled() OVERRIDE;
virtual EditStateFlags GetEditStateFlags() OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(CefContextMenuParamsImpl);

4
libcef/browser/devtools_delegate.cc
View File

@ -44,8 +44,8 @@ class Target : public content::DevToolsTarget {
virtual std::string GetType() const OVERRIDE { return kTargetTypePage; }
virtual std::string GetTitle() const OVERRIDE { return title_; }
virtual std::string GetDescription() const OVERRIDE { return std::string(); }
virtual GURL GetUrl() const OVERRIDE { return url_; }
virtual GURL GetFaviconUrl() const OVERRIDE { return favicon_url_; }
virtual GURL GetURL() const OVERRIDE { return url_; }
virtual GURL GetFaviconURL() const OVERRIDE { return favicon_url_; }
virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
return last_activity_time_;
}

8
libcef/browser/devtools_frontend.cc
View File

@ -16,7 +16,6 @@
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/content_client.h"
#include "net/base/net_util.h"
#include "third_party/skia/include/core/SkColor.h"
@ -63,7 +62,7 @@ void CefDevToolsFrontend::Activate() {
}
void CefDevToolsFrontend::Focus() {
web_contents()->GetView()->Focus();
web_contents()->Focus();
}
void CefDevToolsFrontend::Close() {
@ -92,13 +91,12 @@ void CefDevToolsFrontend::RenderViewCreated(
agent_host_.get(), frontend_host_.get());
}
void CefDevToolsFrontend::DocumentOnLoadCompletedInMainFrame(int32 page_id) {
void CefDevToolsFrontend::DocumentOnLoadCompletedInMainFrame() {
web_contents()->GetMainFrame()->ExecuteJavaScript(
base::ASCIIToUTF16("InspectorFrontendAPI.setUseSoftMenu(true);"));
}
void CefDevToolsFrontend::WebContentsDestroyed(
content::WebContents* web_contents) {
void CefDevToolsFrontend::WebContentsDestroyed() {
content::DevToolsManager::GetInstance()->ClientHostClosing(
frontend_host_.get());
delete this;

5
libcef/browser/devtools_frontend.h
View File

@ -46,9 +46,8 @@ class CefDevToolsFrontend : public content::WebContentsObserver,
// WebContentsObserver overrides
virtual void RenderViewCreated(
content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DocumentOnLoadCompletedInMainFrame(int32 page_id) OVERRIDE;
virtual void WebContentsDestroyed(
content::WebContents* web_contents) OVERRIDE;
virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;
// DevToolsFrontendHostDelegate implementation
virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE {}

31
libcef/browser/geolocation_impl.cc
View File

@ -17,31 +17,25 @@ class CefLocationRequest :
public:
explicit CefLocationRequest(CefRefPtr<CefGetGeolocationCallback> callback)
: callback_(callback) {
CEF_REQUIRE_IOT();
CEF_REQUIRE_UIT();
geo_callback_ = base::Bind(&CefLocationRequest::OnLocationUpdate, this);
content::GeolocationProvider* provider =
content::GeolocationProvider::GetInstance();
provider->AddLocationUpdateCallback(geo_callback_, true);
subscription_ = provider->AddLocationUpdateCallback(geo_callback_, true);
provider->UserDidOptIntoLocationServices();
}
private:
void OnLocationUpdate(const content::Geoposition& position) {
if (CEF_CURRENTLY_ON_UIT()) {
if (callback_) {
CefGeoposition cef_position;
SetPosition(position, cef_position);
callback_->OnLocationUpdate(cef_position);
callback_ = NULL;
}
} else {
content::GeolocationProvider::GetInstance()->RemoveLocationUpdateCallback(
geo_callback_);
geo_callback_.Reset();
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefLocationRequest::OnLocationUpdate, this, position));
CEF_REQUIRE_UIT();
if (callback_) {
CefGeoposition cef_position;
SetPosition(position, cef_position);
callback_->OnLocationUpdate(cef_position);
callback_ = NULL;
}
subscription_.reset();
geo_callback_.Reset();
}
void SetPosition(const content::Geoposition& source, CefGeoposition& target) {
@ -74,6 +68,7 @@ class CefLocationRequest :
CefRefPtr<CefGetGeolocationCallback> callback_;
content::GeolocationProvider::LocationUpdateCallback geo_callback_;
scoped_ptr<content::GeolocationProvider::Subscription> subscription_;
DISALLOW_COPY_AND_ASSIGN(CefLocationRequest);
};
@ -91,7 +86,7 @@ bool CefGetGeolocation(CefRefPtr<CefGetGeolocationCallback> callback) {
return false;
}
if (CEF_CURRENTLY_ON_IOT()) {
if (CEF_CURRENTLY_ON_UIT()) {
if (content::GeolocationProvider::GetInstance()) {
// Will be released after the callback executes.
new CefLocationRequest(callback);
@ -99,7 +94,7 @@ bool CefGetGeolocation(CefRefPtr<CefGetGeolocationCallback> callback) {
}
return false;
} else {
CEF_POST_TASK(CEF_IOT,
CEF_POST_TASK(CEF_UIT,
base::Bind(base::IgnoreResult(CefGetGeolocation), callback));
return true;
}

3
libcef/browser/menu_creator_runner_linux.cc
View File

@ -36,7 +36,8 @@ bool CefMenuCreatorRunnerLinux::RunContextMenu(CefMenuCreator* manager) {
views::MenuRunner::RunResult result =
menu_->RunMenuAt(manager->browser()->window_widget(),
NULL, gfx::Rect(screen_point, gfx::Size()),
views::MenuItemView::TOPRIGHT, ui::MENU_SOURCE_NONE,
views::MENU_ANCHOR_TOPRIGHT,
ui::MENU_SOURCE_NONE,
views::MenuRunner::CONTEXT_MENU);
UNUSED(result);

3
libcef/browser/menu_creator_runner_mac.mm
View File

@ -8,7 +8,6 @@
#include "base/message_loop/message_loop.h"
#include "base/compiler_specific.h"
#import "base/mac/scoped_sending_event.h"
#include "content/public/browser/web_contents_view.h"
#import "ui/base/cocoa/menu_controller.h"
CefMenuCreatorRunnerMac::CefMenuCreatorRunnerMac()
@ -29,7 +28,7 @@ bool CefMenuCreatorRunnerMac::RunContextMenu(CefMenuCreator* manager) {
useWithPopUpButtonCell:NO];
NSView* parent_view =
manager->browser()->GetWebContents()->GetView()->GetContentNativeView();
manager->browser()->GetWebContents()->GetContentNativeView();
// Synthesize an event for the click, as there is no certainty that
// [NSApp currentEvent] will return a valid event.

1
libcef/browser/menu_creator_runner_win.cc
View File

@ -6,7 +6,6 @@
#include "libcef/browser/browser_host_impl.h"
#include "base/message_loop/message_loop.h"
#include "content/public/browser/web_contents_view.h"
#include "ui/aura/window.h"
#include "ui/gfx/point.h"
#include "ui/views/controls/menu/menu_2.h"

1
libcef/browser/printing/print_view_manager_base.cc
View File

@ -26,7 +26,6 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "grit/generated_resources.h"
#include "printing/metafile_impl.h"
#include "printing/printed_document.h"

5
libcef/browser/printing/printing_message_filter.cc
View File

@ -106,10 +106,9 @@ void PrintingMessageFilter::OverrideThreadForMessage(
#endif
}
bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message,
bool* message_was_ok) {
bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP_EX(PrintingMessageFilter, message, *message_was_ok)
IPC_BEGIN_MESSAGE_MAP(PrintingMessageFilter, message)
#if defined(OS_WIN)
IPC_MESSAGE_HANDLER(PrintHostMsg_DuplicateSection, OnDuplicateSection)
#endif

3
libcef/browser/printing/printing_message_filter.h
View File

@ -41,8 +41,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
virtual void OverrideThreadForMessage(
const IPC::Message& message,
content::BrowserThread::ID* thread) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
bool* message_was_ok) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private:
virtual ~PrintingMessageFilter();

32
libcef/browser/proxy_stubs.cc
View File

@ -1,18 +1,18 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/logging.h"
#include "components/user_prefs/pref_registry_syncable.h"
namespace user_prefs {
// Required by PrefProxyConfigTrackerImpl::RegisterUserPrefs.
void PrefRegistrySyncable::RegisterDictionaryPref(
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/logging.h"
#include "components/pref_registry/pref_registry_syncable.h"
namespace user_prefs {
// Required by PrefProxyConfigTrackerImpl::RegisterUserPrefs.
void PrefRegistrySyncable::RegisterDictionaryPref(
const char* path,
base::DictionaryValue* default_value,
PrefSyncStatus sync_status) {
NOTREACHED();
}
} // namespace user_prefs
PrefSyncStatus sync_status) {
NOTREACHED();
}
} // namespace user_prefs

5
libcef/browser/scheme_impl.cc
View File

@ -36,6 +36,7 @@
#include "net/url_request/url_request_http_job.h"
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "url/third_party/mozilla/url_parse.h"
#include "url/url_util.h"
using net::URLRequestStatus;
@ -43,8 +44,8 @@ using net::URLRequestStatus;
namespace {
bool IsStandardScheme(const std::string& scheme) {
url_parse::Component scheme_comp(0, scheme.length());
return url_util::IsStandard(scheme.c_str(), scheme_comp);
url::Component scheme_comp(0, scheme.length());
return url::IsStandard(scheme.c_str(), scheme_comp);
}
// Copied from net/url_request/url_request_job_manager.cc.

4
libcef/browser/stream_impl.cc
View File

@ -176,7 +176,7 @@ int CefBytesReader::Seek(int64 offset, int whence) {
rv = 0;
break;
case SEEK_END: {
int64 offset_abs = abs(offset);
int64 offset_abs = std::abs(offset);
if (offset_abs > datasize_)
break;
offset_ = datasize_ - offset_abs;
@ -267,7 +267,7 @@ int CefBytesWriter::Seek(int64 offset, int whence) {
rv = 0;
break;
case SEEK_END: {
int64 offset_abs = abs(offset);
int64 offset_abs = std::abs(offset);
if (offset_abs > datasize_)
break;
offset_ = datasize_ - offset_abs;

4
libcef/renderer/browser_impl.cc
View File

@ -50,9 +50,9 @@ namespace {
blink::WebString FilePathStringToWebString(
const base::FilePath::StringType& str) {
#if defined(OS_POSIX)
return base::WideToUTF16Hack(base::SysNativeMBToWide(str));
return base::WideToUTF16(base::SysNativeMBToWide(str));
#elif defined(OS_WIN)
return base::WideToUTF16Hack(str);
return base::WideToUTF16(str);
#endif
}

8
libcef/renderer/content_renderer_client.cc
View File

@ -199,14 +199,15 @@ void CefContentRendererClient::OnBrowserDestroyed(CefBrowserImpl* browser) {
void CefContentRendererClient::WebKitInitialized() {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
// Create global objects associated with the default Isolate.
CefV8IsolateCreated();
blink::WebRuntimeFeatures::enableMediaPlayer(
media::IsMediaLibraryInitialized());
// TODO(cef): Enable these once the implementation supports it.
blink::WebRuntimeFeatures::enableNotifications(false);
blink::WebRuntimeFeatures::enableSpeechInput(
command_line.HasSwitch(switches::kEnableSpeechInput));
blink::WebRuntimeFeatures::enableMediaStream(
command_line.HasSwitch(switches::kEnableMediaStream));
@ -401,9 +402,6 @@ void CefContentRendererClient::RenderThreadStarted() {
blink::WebPrerenderingSupport::initialize(new CefPrerenderingSupport());
// Create global objects associated with the default Isolate.
CefV8IsolateCreated();
// Retrieve the new render thread information synchronously.
CefProcessHostMsg_GetNewRenderThreadInfo_Params params;
thread->Send(new CefProcessHostMsg_GetNewRenderThreadInfo(&params));

3
libcef/renderer/render_message_filter.h
View File

@ -8,9 +8,10 @@
#include <string>
#include "ipc/ipc_channel_proxy.h"
#include "ipc/message_filter.h"
// This class sends and receives control messages on the renderer process.
class CefRenderMessageFilter : public IPC::ChannelProxy::MessageFilter {
class CefRenderMessageFilter : public IPC::MessageFilter {
public:
CefRenderMessageFilter();
virtual ~CefRenderMessageFilter();

14
libcef/renderer/v8_impl.cc
View File

@ -19,8 +19,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "core/workers/WorkerGlobalScope.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8RecursionScope.h"
#include "bindings/v8/WorkerScriptController.h"
MSVC_POP_WARNING();
#undef FROM_HERE
#undef LOG
@ -41,6 +39,7 @@ MSVC_POP_WARNING();
#include "base/threading/thread_local.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebScriptController.h"
#include "url/gurl.h"
@ -499,9 +498,6 @@ void GetCefString(v8::Handle<v8::String> str, CefString& out) {
// V8 function callback.
void FunctionCallbackImpl(const v8::FunctionCallbackInfo<v8::Value>& info) {
v8::Isolate* isolate = info.GetIsolate();
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(isolate->GetCurrentContext()));
CefV8Handler* handler =
static_cast<CefV8Handler*>(v8::External::Cast(*info.Data())->Value());
@ -540,9 +536,6 @@ void AccessorGetterCallbackImpl(
v8::Local<v8::String> property,
const v8::PropertyCallbackInfo<v8::Value>& info) {
v8::Isolate* isolate = info.GetIsolate();
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(isolate->GetCurrentContext()));
v8::Handle<v8::Object> obj = info.This();
@ -581,9 +574,6 @@ void AccessorSetterCallbackImpl(
v8::Local<v8::Value> value,
const v8::PropertyCallbackInfo<void>& info) {
v8::Isolate* isolate = info.GetIsolate();
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(isolate->GetCurrentContext()));
v8::Handle<v8::Object> obj = info.This();
@ -1039,7 +1029,7 @@ blink::WebFrame* CefV8ContextImpl::GetWebFrame() {
CEF_REQUIRE_RT();
v8::HandleScope handle_scope(handle_->isolate());
v8::Context::Scope context_scope(GetV8Context());
return blink::WebFrame::frameForCurrentContext();
return blink::WebLocalFrame::frameForCurrentContext();
}

1
libcef/resources/cef_resources.grd
View File

@ -12,7 +12,6 @@
<include name="IDR_CEF_DEVTOOLS_DISCOVERY_PAGE" file="devtools_discovery_page.html" type="BINDATA" />
<include name="IDR_CEF_CREDITS_HTML" file="${about_credits_file}" use_base_dir="false" type="BINDATA" />
<include name="IDR_CEF_CREDITS_JS" file="..\..\..\chrome\browser\resources\about_credits.js" type="BINDATA" />
<include name="IDR_CEF_CREDITS_SWIFTSHADER_JPG" file="..\..\..\chrome\browser\resources\swiftshader.jpg" type="BINDATA" />
<include name="IDR_CEF_LICENSE_TXT" file="..\..\LICENSE.txt" type="BINDATA" />
<include name="IDR_CEF_VERSION_HTML" file="about_version.html" type="BINDATA" />
<include name="IDR_PRINT_PREVIEW_PAGE" file="print_preview_page_stub.html" type="BINDATA" />

17
libcef_dll/cpptoc/context_menu_params_cpptoc.cc
View File

@ -229,21 +229,6 @@ int CEF_CALLBACK context_menu_params_is_editable(
return _retval;
}
int CEF_CALLBACK context_menu_params_is_speech_input_enabled(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self)
return 0;
// Execute
bool _retval = CefContextMenuParamsCppToC::Get(self)->IsSpeechInputEnabled();
// Return type: bool
return _retval;
}
cef_context_menu_edit_state_flags_t CEF_CALLBACK context_menu_params_get_edit_state_flags(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -283,8 +268,6 @@ CefContextMenuParamsCppToC::CefContextMenuParamsCppToC(
context_menu_params_get_media_state_flags;
struct_.struct_.get_selection_text = context_menu_params_get_selection_text;
struct_.struct_.is_editable = context_menu_params_is_editable;
struct_.struct_.is_speech_input_enabled =
context_menu_params_is_speech_input_enabled;
struct_.struct_.get_edit_state_flags =
context_menu_params_get_edit_state_flags;
}

13
libcef_dll/ctocpp/context_menu_params_ctocpp.cc
View File

@ -213,19 +213,6 @@ bool CefContextMenuParamsCToCpp::IsEditable() {
return _retval?true:false;
}
bool CefContextMenuParamsCToCpp::IsSpeechInputEnabled() {
if (CEF_MEMBER_MISSING(struct_, is_speech_input_enabled))
return false;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->is_speech_input_enabled(struct_);
// Return type: bool
return _retval?true:false;
}
CefContextMenuParams::EditStateFlags CefContextMenuParamsCToCpp::GetEditStateFlags(
) {
if (CEF_MEMBER_MISSING(struct_, get_edit_state_flags))

1
libcef_dll/ctocpp/context_menu_params_ctocpp.h
View File

@ -48,7 +48,6 @@ class CefContextMenuParamsCToCpp
virtual MediaStateFlags GetMediaStateFlags() OVERRIDE;
virtual CefString GetSelectionText() OVERRIDE;
virtual bool IsEditable() OVERRIDE;
virtual bool IsSpeechInputEnabled() OVERRIDE;
virtual EditStateFlags GetEditStateFlags() OVERRIDE;
};

2
libcef_dll/wrapper/cef_byte_read_handler.cc
View File

@ -36,7 +36,7 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
#if defined(OS_WIN)
int64 offset_abs = _abs64(offset);
#else
int64 offset_abs = abs(offset);
int64 offset_abs = std::abs(offset);
#endif
if (offset_abs > size_)
break;

9
patch/patch.cfg
View File

@ -88,11 +88,10 @@ patches = [
'path': '../webkit/',
},
{
# Add WebContentsDelegate::CanDragEnter support for Aura.
# http://code.google.com/p/chromiumembedded/issues/detail?id=1262
# https://codereview.chromium.org/267113008/
'name': 'web_contents_1262',
'path': '../content/browser/web_contents/',
# Fix Blink VectorComparer::compare assertion with VS2013 debug build.
# https://code.google.com/p/chromium/issues/detail?id=377942
'name': 'wtf_vector_377942',
'path': '../third_party/WebKit/Source/wtf/',
},
{
# Disable scollbar bounce and overlay on OS X.

18
patch/patches/build.patch
View File

@ -1,7 +1,7 @@
diff --git common.gypi common.gypi
index c87ec63..45bb14e 100644
--- common.gypi
+++ common.gypi
Index: common.gypi
===================================================================
--- common.gypi (revision 272007)
+++ common.gypi (working copy)
@@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by
# ~/.gyp/include.gypi.
@ -12,11 +12,11 @@ index c87ec63..45bb14e 100644
# Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary
diff --git mac/strip_save_dsym mac/strip_save_dsym
index c9cf226..0dedbe3 100755
--- mac/strip_save_dsym
+++ mac/strip_save_dsym
@@ -48,7 +48,7 @@ def macho_archs(macho):
Index: mac/strip_save_dsym
===================================================================
--- mac/strip_save_dsym (revision 272007)
+++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@
"bundle"]
macho_types_re = "Mach-O (?:64-bit )?(?:" + "|".join(macho_types) + ")"

14
patch/patches/content_nav_1129.patch
View File

@ -1,6 +1,6 @@
Index: public/renderer/content_renderer_client.cc
===================================================================
--- public/renderer/content_renderer_client.cc (revision 263053)
--- public/renderer/content_renderer_client.cc (revision 272007)
+++ public/renderer/content_renderer_client.cc (working copy)
@@ -92,7 +92,6 @@
return false;
@ -20,9 +20,9 @@ Index: public/renderer/content_renderer_client.cc
const GURL& url,
Index: public/renderer/content_renderer_client.h
===================================================================
--- public/renderer/content_renderer_client.h (revision 263053)
--- public/renderer/content_renderer_client.h (revision 272007)
+++ public/renderer/content_renderer_client.h (working copy)
@@ -175,7 +175,6 @@
@@ -176,7 +176,6 @@
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
@ -30,7 +30,7 @@ Index: public/renderer/content_renderer_client.h
// TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351
@@ -190,7 +189,6 @@
@@ -191,7 +190,6 @@
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect);
@ -40,9 +40,9 @@ Index: public/renderer/content_renderer_client.h
// If |send_referrer| is set to false (which is the default), no referrer
Index: renderer/render_frame_impl.cc
===================================================================
--- renderer/render_frame_impl.cc (revision 263053)
--- renderer/render_frame_impl.cc (revision 272007)
+++ renderer/render_frame_impl.cc (working copy)
@@ -2870,7 +2870,6 @@
@@ -3084,7 +3084,6 @@
WebNavigationType type,
WebNavigationPolicy default_policy,
bool is_redirect) {
@ -50,7 +50,7 @@ Index: renderer/render_frame_impl.cc
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) &&
@@ -2885,7 +2884,6 @@
@@ -3099,7 +3098,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

2
patch/patches/gritsettings.patch
View File

@ -1,6 +1,6 @@
Index: resource_ids
===================================================================
--- resource_ids (revision 263053)
--- resource_ids (revision 272007)
+++ resource_ids (working copy)
@@ -16,6 +16,12 @@
{

2
patch/patches/gyp_331.patch
View File

@ -1,6 +1,6 @@
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1892)
--- gyp/generator/ninja.py (revision 1921)
+++ gyp/generator/ninja.py (working copy)
@@ -738,7 +738,16 @@
for path in copy['files']:

4
patch/patches/message_loop_443.patch
View File

@ -1,8 +1,8 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 263053)
--- message_loop.cc (revision 272007)
+++ message_loop.cc (working copy)
@@ -144,7 +144,7 @@
@@ -154,7 +154,7 @@
MessageLoop::~MessageLoop() {
DCHECK_EQ(this, current());

8
patch/patches/prefs_content_1161.patch
View File

@ -1,8 +1,8 @@
Index: public/common/common_param_traits_macros.h
===================================================================
--- public/common/common_param_traits_macros.h (revision 263053)
--- public/common/common_param_traits_macros.h (revision 272007)
+++ public/common/common_param_traits_macros.h (working copy)
@@ -181,6 +181,7 @@
@@ -175,6 +175,7 @@
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
@ -12,9 +12,9 @@ Index: public/common/common_param_traits_macros.h
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
Index: renderer/web_preferences.cc
===================================================================
--- renderer/web_preferences.cc (revision 263053)
--- renderer/web_preferences.cc (revision 272007)
+++ renderer/web_preferences.cc (working copy)
@@ -171,6 +171,8 @@
@@ -165,6 +165,8 @@
settings->setJavaEnabled(prefs.java_enabled);

8
patch/patches/prefs_webkit_1161.patch
View File

@ -1,8 +1,8 @@
Index: common/webpreferences.cc
===================================================================
--- common/webpreferences.cc (revision 263053)
--- common/webpreferences.cc (revision 272007)
+++ common/webpreferences.cc (working copy)
@@ -120,6 +120,7 @@
@@ -114,6 +114,7 @@
use_solid_color_scrollbars(false),
compositor_touch_hit_testing(true),
navigate_on_drag_drop(true),
@ -12,9 +12,9 @@ Index: common/webpreferences.cc
#if defined(OS_ANDROID)
Index: common/webpreferences.h
===================================================================
--- common/webpreferences.h (revision 263053)
--- common/webpreferences.h (revision 272007)
+++ common/webpreferences.h (working copy)
@@ -155,6 +155,7 @@
@@ -149,6 +149,7 @@
bool use_solid_color_scrollbars;
bool compositor_touch_hit_testing;
bool navigate_on_drag_drop;

8
patch/patches/public_browser_1161.patch
View File

@ -1,8 +1,8 @@
Index: content_browser_client.cc
===================================================================
--- content_browser_client.cc (revision 263053)
--- content_browser_client.cc (revision 272007)
+++ content_browser_client.cc (working copy)
@@ -255,6 +255,10 @@
@@ -253,6 +253,10 @@
return true;
}
@ -15,7 +15,7 @@ Index: content_browser_client.cc
}
Index: content_browser_client.h
===================================================================
--- content_browser_client.h (revision 263053)
--- content_browser_client.h (revision 272007)
+++ content_browser_client.h (working copy)
@@ -22,6 +22,7 @@
#include "net/base/mime_util.h"
@ -25,7 +25,7 @@ Index: content_browser_client.h
#include "third_party/WebKit/public/web/WebNotificationPresenter.h"
#include "ui/base/window_open_disposition.h"
#include "webkit/browser/fileapi/file_system_context.h"
@@ -542,6 +543,9 @@
@@ -535,6 +536,9 @@
// Clears browser cookies.
virtual void ClearCookies(RenderViewHost* rvh) {}

69
patch/patches/renderer_host_1161.patch
View File

@ -1,11 +1,11 @@
Index: compositing_iosurface_layer_mac.mm
===================================================================
--- compositing_iosurface_layer_mac.mm (revision 263053)
--- compositing_iosurface_layer_mac.mm (revision 272007)
+++ compositing_iosurface_layer_mac.mm (working copy)
@@ -117,7 +117,7 @@
(context_ && context_->cgl_context() != glContext) ||
@@ -133,7 +133,7 @@
!renderWidgetHostView_ ||
!renderWidgetHostView_->compositing_iosurface_) {
!renderWidgetHostView_->compositing_iosurface_ ||
!renderWidgetHostView_->compositing_iosurface_->HasIOSurface()) {
- glClearColor(1, 1, 1, 1);
+ glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
@ -13,7 +13,7 @@ Index: compositing_iosurface_layer_mac.mm
}
Index: compositing_iosurface_mac.mm
===================================================================
--- compositing_iosurface_mac.mm (revision 263053)
--- compositing_iosurface_mac.mm (revision 272007)
+++ compositing_iosurface_mac.mm (working copy)
@@ -360,7 +360,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc
===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 263053)
--- compositing_iosurface_shader_programs_mac.cc (revision 272007)
+++ compositing_iosurface_shader_programs_mac.cc (working copy)
@@ -11,6 +11,8 @@
#include "base/debug/trace_event.h"
@ -81,7 +81,7 @@ Index: compositing_iosurface_shader_programs_mac.cc
shader_programs_[which] =
Index: compositing_iosurface_shader_programs_mac.h
===================================================================
--- compositing_iosurface_shader_programs_mac.h (revision 263053)
--- compositing_iosurface_shader_programs_mac.h (revision 272007)
+++ compositing_iosurface_shader_programs_mac.h (working copy)
@@ -48,6 +48,8 @@
return rgb_to_yv12_output_format_;
@ -94,30 +94,30 @@ Index: compositing_iosurface_shader_programs_mac.h
TransformsRGBToYV12);
Index: render_widget_host_view_aura.cc
===================================================================
--- render_widget_host_view_aura.cc (revision 263053)
--- render_widget_host_view_aura.cc (revision 272007)
+++ render_widget_host_view_aura.cc (working copy)
@@ -2284,8 +2284,14 @@
// For non-opaque windows, we don't draw anything, since we depend on the
// canvas coming from the compositor to already be initialized as
// transparent.
- if (window_->layer()->fills_bounds_opaquely())
- canvas->DrawColor(SK_ColorWHITE);
+ if (window_->layer()->fills_bounds_opaquely()) {
+ if (host_->IsRenderView()) {
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
+ RenderViewHost::From(host_)));
+ } else {
+ canvas->DrawColor(SK_ColorWHITE);
+ }
@@ -1602,8 +1602,14 @@
// For non-opaque windows, we don't draw anything, since we depend on the
// canvas coming from the compositor to already be initialized as
// transparent.
- if (window_->layer()->fills_bounds_opaquely())
- canvas->DrawColor(SK_ColorWHITE);
+ if (window_->layer()->fills_bounds_opaquely()) {
+ if (host_->IsRenderView()) {
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
+ RenderViewHost::From(host_)));
+ } else {
+ canvas->DrawColor(SK_ColorWHITE);
+ }
}
+ }
}
void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged(
Index: render_widget_host_view_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 263053)
--- render_widget_host_view_mac.mm (revision 272007)
+++ render_widget_host_view_mac.mm (working copy)
@@ -440,7 +440,7 @@
@@ -498,7 +498,7 @@
use_core_animation_ = true;
background_layer_.reset([[CALayer alloc] init]);
[background_layer_
@ -126,7 +126,7 @@ Index: render_widget_host_view_mac.mm
[cocoa_view_ setLayer:background_layer_];
[cocoa_view_ setWantsLayer:YES];
}
@@ -3097,7 +3097,7 @@
@@ -3304,7 +3304,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@ -135,7 +135,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
if (damagedRect.bottom() > rect.bottom()) {
@@ -3119,7 +3119,7 @@
@@ -3326,7 +3326,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@ -144,7 +144,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
}
@@ -3269,7 +3269,7 @@
@@ -3465,7 +3465,7 @@
}
} else {
CGContextSetFillColorWithColor(context,
@ -153,21 +153,12 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, dirtyRect);
if (renderWidgetHostView_->whiteout_start_time_.is_null())
renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
@@ -4276,7 +4276,7 @@
if (self = [super init]) {
renderWidgetHostView_ = r;
@@ -4420,7 +4420,7 @@
- (id)init {
if (self = [super init]) {
- [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
+ [self setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
[self setAnchorPoint:CGPointMake(0, 0)];
// Setting contents gravity is necessary to prevent the layer from being
// scaled during dyanmic resizes (especially with devtools open).
@@ -4305,7 +4305,7 @@
inContext:context];
} else {
CGContextSetFillColorWithColor(context,
- CGColorGetConstantColor(kCGColorWhite));
+ CGColorGetConstantColor(kCGColorClear));
CGContextFillRect(context, clipRect);
}
}

8
patch/patches/spi_webcore_364.patch
View File

@ -1,9 +1,9 @@
Index: core/frame/FrameView.cpp
===================================================================
--- core/frame/FrameView.cpp (revision 171269)
--- core/frame/FrameView.cpp (revision 174434)
+++ core/frame/FrameView.cpp (working copy)
@@ -162,8 +162,10 @@
if (!isMainFrame())
@@ -165,8 +165,10 @@
if (!m_frame->isMainFrame())
return;
+#if 0
@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
Index: platform/scroll/ScrollbarThemeMacCommon.mm
===================================================================
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 171269)
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 174434)
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
@@ -358,10 +358,14 @@
// static

2
patch/patches/underlay_1051.patch
View File

@ -1,6 +1,6 @@
Index: underlay_opengl_hosting_window.h
===================================================================
--- underlay_opengl_hosting_window.h (revision 263053)
--- underlay_opengl_hosting_window.h (revision 272007)
+++ underlay_opengl_hosting_window.h (working copy)
@@ -12,7 +12,7 @@
// Common base class for windows that host a OpenGL surface that renders under

90
patch/patches/views_widget_180.patch
View File

@ -1,8 +1,8 @@
diff --git desktop_aura/desktop_screen_win.cc desktop_aura/desktop_screen_win.cc
index c5edf76..9389662 100644
--- desktop_aura/desktop_screen_win.cc
+++ desktop_aura/desktop_screen_win.cc
@@ -54,6 +54,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(
Index: desktop_aura/desktop_screen_win.cc
===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 272007)
+++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@
}
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
@ -11,11 +11,11 @@ index c5edf76..9389662 100644
aura::WindowTreeHost* host = window->GetHost();
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
index 2fc499b..6fa63b5 100644
--- desktop_aura/desktop_window_tree_host_win.cc
+++ desktop_aura/desktop_window_tree_host_win.cc
@@ -130,7 +130,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
Index: desktop_aura/desktop_window_tree_host_win.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_win.cc (revision 272007)
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
@@ -129,7 +129,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
@ -26,33 +26,21 @@ index 2fc499b..6fa63b5 100644
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
diff --git desktop_aura/desktop_window_tree_host_win.h desktop_aura/desktop_window_tree_host_win.h
index dc8a218..84680cf 100644
--- desktop_aura/desktop_window_tree_host_win.h
+++ desktop_aura/desktop_window_tree_host_win.h
@@ -214,6 +214,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
LPARAM l_param) OVERRIDE;
virtual bool HandleScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
+ public:
Widget* GetWidget();
const Widget* GetWidget() const;
HWND GetHWND() const;
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index 028b6f5..e8b4bd2 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -138,7 +138,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
content_window_(NULL),
Index: desktop_aura/desktop_window_tree_host_x11.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_x11.cc (revision 272007)
+++ desktop_aura/desktop_window_tree_host_x11.cc (working copy)
@@ -143,7 +143,8 @@
window_parent_(NULL),
custom_window_shape_(NULL),
window_shape_(NULL),
custom_window_shape_(false),
- urgency_hint_set_(false) {
+ urgency_hint_set_(false),
+ xwindow_destroyed_(false) {
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -315,7 +316,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -332,7 +333,8 @@
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@ -62,9 +50,9 @@ index 028b6f5..e8b4bd2 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -968,9 +970,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
if (swa.override_redirect)
attribute_mask |= CWOverrideRedirect;
@@ -998,9 +1000,13 @@
}
}
+ gfx::AcceleratedWidget parent_widget = params.parent_widget;
+ if (parent_widget == gfx::kNullAcceleratedWidget)
@ -77,7 +65,7 @@ index 028b6f5..e8b4bd2 100644
bounds_.x(), bounds_.y(),
bounds_.width(), bounds_.height(),
0, // border width
@@ -1378,6 +1384,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1503,6 +1509,10 @@
}
break;
}
@ -88,11 +76,11 @@ index 028b6f5..e8b4bd2 100644
case FocusOut:
if (xev->xfocus.mode != NotifyGrab) {
ReleaseCapture();
diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
index bc20464..63527ae 100644
--- desktop_aura/desktop_window_tree_host_x11.h
+++ desktop_aura/desktop_window_tree_host_x11.h
@@ -299,6 +299,9 @@ private:
Index: desktop_aura/desktop_window_tree_host_x11.h
===================================================================
--- desktop_aura/desktop_window_tree_host_x11.h (revision 272007)
+++ desktop_aura/desktop_window_tree_host_x11.h (working copy)
@@ -319,6 +319,9 @@
// the frame when |xwindow_| gains focus or handles a mouse button event.
bool urgency_hint_set_;
@ -102,11 +90,11 @@ index bc20464..63527ae 100644
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
};
diff --git widget.cc widget.cc
index e05db49..a936235 100644
--- widget.cc
+++ widget.cc
@@ -122,6 +122,7 @@ Widget::InitParams::InitParams()
Index: widget.cc
===================================================================
--- widget.cc (revision 272007)
+++ widget.cc (working copy)
@@ -116,6 +116,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
double_buffer(false),
parent(NULL),
@ -114,7 +102,7 @@ index e05db49..a936235 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
top_level(false),
@@ -148,6 +149,7 @@ Widget::InitParams::InitParams(Type type)
@@ -141,6 +142,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
double_buffer(false),
parent(NULL),
@ -122,7 +110,7 @@ index e05db49..a936235 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
top_level(false),
@@ -386,7 +388,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -398,7 +400,12 @@
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
@ -136,11 +124,11 @@ index e05db49..a936235 100644
}
native_widget_initialized_ = true;
}
diff --git widget.h widget.h
index 640b140..43feff7 100644
--- widget.h
+++ widget.h
@@ -200,6 +200,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
Index: widget.h
===================================================================
--- widget.h (revision 272007)
+++ widget.h (working copy)
@@ -213,6 +213,7 @@
// Should the widget be double buffered? Default is false.
bool double_buffer;
gfx::NativeView parent;

64
patch/patches/web_contents_1262.patch
View File

@ -1,64 +0,0 @@
Index: web_contents_view_aura.cc
===================================================================
--- web_contents_view_aura.cc (revision 263053)
+++ web_contents_view_aura.cc (working copy)
@@ -1417,17 +1417,25 @@
// WebContentsViewAura, aura::client::DragDropDelegate implementation:
void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
- if (drag_dest_delegate_)
- drag_dest_delegate_->DragInitialize(web_contents_);
-
+ current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
current_drop_data_.reset(new DropData());
PrepareDropData(current_drop_data_.get(), event.data());
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
+ // Give the delegate an opportunity to cancel the drag.
+ if (!web_contents_->GetDelegate()->CanDragEnter(web_contents_,
+ *current_drop_data_.get(),
+ op)) {
+ current_drop_data_.reset(NULL);
+ return;
+ }
+
+ if (drag_dest_delegate_)
+ drag_dest_delegate_->DragInitialize(web_contents_);
+
gfx::Point screen_pt =
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
- current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
web_contents_->GetRenderViewHost()->DragTargetDragEnter(
*current_drop_data_.get(), event.location(), screen_pt, op,
ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
@@ -1443,6 +1451,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
OnDragEntered(event);
+ if (!current_drop_data_)
+ return ui::DragDropTypes::DRAG_NONE;
+
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
gfx::Point screen_pt =
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
@@ -1461,6 +1472,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
return;
+ if (!current_drop_data_)
+ return;
+
web_contents_->GetRenderViewHost()->DragTargetDragLeave();
if (drag_dest_delegate_)
drag_dest_delegate_->OnDragLeave();
@@ -1473,6 +1487,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
OnDragEntered(event);
+ if (!current_drop_data_)
+ return ui::DragDropTypes::DRAG_NONE;
+
web_contents_->GetRenderViewHost()->DragTargetDrop(
event.location(),
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),

2
patch/patches/webkit_933.patch
View File

@ -1,6 +1,6 @@
Index: WebNode.cpp
===================================================================
--- WebNode.cpp (revision 171269)
--- WebNode.cpp (revision 174434)
+++ WebNode.cpp (working copy)
@@ -172,7 +172,7 @@
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)

16
patch/patches/wtf_vector_377942.patch Normal file
View File

@ -0,0 +1,16 @@
Index: Vector.h
===================================================================
--- Vector.h (revision 174434)
+++ Vector.h (working copy)
@@ -221,7 +221,10 @@
{
static bool compare(const T* a, const T* b, size_t size)
{
- return std::equal(a, a + size, b);
+ for (size_t i = 0; i < size; ++i)
+ if (!(a[i] == b[i]))
+ return false;
+ return true;
}
};

2
patch/patches/zlib.patch
View File

@ -1,6 +1,6 @@
Index: contrib/minizip/unzip.c
===================================================================
--- contrib/minizip/unzip.c (revision 263053)
--- contrib/minizip/unzip.c (revision 272007)
+++ contrib/minizip/unzip.c (working copy)
@@ -69,7 +69,7 @@
#include <string.h>

2
tests/cefclient/res/other_tests.html
View File

@ -22,7 +22,7 @@
<li><a href="http://tests/localstorage">Local Storage</a></li>
<li><a href="http://mrdoob.com/lab/javascript/requestanimationframe/">requestAnimationFrame</a></li>
<li><a href="client://tests/handler.html">Scheme Handler</a></li>
<li><a href="http://slides.html5rocks.com/#speech-input">Speech Input</a> - requires "enable-speech-input" flag</li>
<li><a href="https://www.google.com/intl/en/chrome/demos/speech.html">Speech Input</a> - requires "enable-speech-input" flag</li>
<li><a href="http://tests/transparency">Transparency</a></li>
<li><a href="http://webglsamples.googlecode.com/hg/field/field.html">WebGL</a></li>
<li><a href="http://apprtc.appspot.com/">WebRTC</a> - requires "enable-media-stream" flag</li>

4
tests/unittests/geolocation_unittest.cc
View File

@ -85,7 +85,7 @@ class GeolocationTestHandler : public TestHandler {
CefRefPtr<CefGeolocationCallback> callback) OVERRIDE {
got_requestgeolocationpermission_.yes();
EXPECT_TRUE(CefCurrentlyOn(TID_IO));
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
EXPECT_STREQ(kTestOrigin, requesting_url.ToString().c_str());
request_id_ = request_id;
@ -105,7 +105,7 @@ class GeolocationTestHandler : public TestHandler {
int request_id) OVERRIDE {
got_cancelgeolocationpermission_.yes();
EXPECT_TRUE(CefCurrentlyOn(TID_IO));
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
EXPECT_STREQ(kTestOrigin, requesting_url.ToString().c_str());
EXPECT_EQ(request_id, request_id_);