bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 263053. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1683 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-04-30 17:14:40 +00:00
parent 95b76b30b5
commit 7f16f5fbd2
36 changed files with 123 additions and 307 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': '261035',
'chromium_checkout': '1312deba7b323a2285202f88acfbd59500bf9779',
'chromium_revision': '263053',
'chromium_checkout': 'dd59d5c59810495630c5fa5cd7a92eceac24bc9a',
}

3
cef.gyp
View File

@ -811,7 +811,9 @@
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_prefs',
'<(DEPTH)/base/base.gyp:base_static',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/cc/cc.gyp:cc',
'<(DEPTH)/components/components.gyp:breakpad_component',
'<(DEPTH)/components/components.gyp:navigation_interception',
'<(DEPTH)/content/content.gyp:content_app_both',
@ -824,6 +826,7 @@
'<(DEPTH)/content/content.gyp:content_utility',
'<(DEPTH)/content/content.gyp:content_worker',
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/gpu/gpu.gyp:gpu',
'<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/net/net.gyp:net',

1
libcef/browser/browser_context_impl.cc
View File

@ -81,6 +81,7 @@ class CefGeolocationPermissionContext
int render_view_id,
int bridge_id,
const GURL& requesting_frame,
bool user_gesture,
base::Callback<void(bool)> callback) // NOLINT(readability/function)
OVERRIDE {
CEF_REQUIRE_IOT();

5
libcef/browser/browser_host_impl.cc
View File

@ -624,7 +624,7 @@ void CefBrowserHostImpl::CloseBrowser(bool force_close) {
if (contents && contents->NeedToFireBeforeUnload()) {
// Will result in a call to BeforeUnloadFired() and, if the close isn't
// canceled, CloseContents().
contents->GetMainFrame()->DispatchBeforeUnload(false);
contents->DispatchBeforeUnload(false);
} else {
CloseContents(contents);
}
@ -1657,10 +1657,9 @@ void CefBrowserHostImpl::WebContentsFocused(content::WebContents* contents) {
}
bool CefBrowserHostImpl::HandleContextMenu(
content::RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params) {
if (!menu_creator_.get())
menu_creator_.reset(new CefMenuCreator(this, render_frame_host));
menu_creator_.reset(new CefMenuCreator(this));
return menu_creator_->CreateContextMenu(params);
}

1
libcef/browser/browser_host_impl.h
View File

@ -315,7 +315,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
bool reverse) OVERRIDE;
virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
virtual bool HandleContextMenu(
content::RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params) OVERRIDE;
virtual bool PreHandleKeyboardEvent(
content::WebContents* source,

1
libcef/browser/browser_host_impl_win.cc
View File

@ -31,7 +31,6 @@
#include "grit/ui_unscaled_resources.h"
#include "net/base/mime_util.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/public/web/win/WebInputEventFactory.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/win/shell.h"

2
libcef/browser/browser_main.cc
View File

@ -100,7 +100,7 @@ int CefBrowserMainParts::PreCreateThreads() {
}
// Initialize the V8 proxy integration.
net::ProxyResolverV8::RememberDefaultIsolate();
net::ProxyResolverV8::EnsureIsolateCreated();
// Initialize proxy configuration tracker.
pref_proxy_config_tracker_.reset(

16
libcef/browser/content_browser_client.cc
View File

@ -40,6 +40,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/storage_quota_params.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
#include "ui/base/ui_base_switches.h"
#include "url/gurl.h"
@ -172,13 +173,10 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
// The callback will be dispatched on the IO thread.
virtual void RequestQuotaPermission(
const GURL& origin_url,
quota::StorageType type,
int64 new_quota,
const content::StorageQuotaParams& params,
int render_process_id,
int render_view_id,
const PermissionCallback& callback) OVERRIDE {
if (type != quota::kStorageTypePersistent) {
if (params.storage_type != quota::kStorageTypePersistent) {
// To match Chrome behavior we only support requesting quota with this
// interface for Persistent storage type.
callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
@ -189,7 +187,7 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::GetBrowserForView(render_process_id,
render_view_id);
params.render_view_id);
if (browser.get()) {
CefRefPtr<CefClient> client = browser->GetClient();
if (client.get()) {
@ -197,8 +195,10 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
if (handler.get()) {
CefRefPtr<CefQuotaCallbackImpl> callbackImpl(
new CefQuotaCallbackImpl(callback));
handled = handler->OnQuotaRequest(browser.get(), origin_url.spec(),
new_quota, callbackImpl.get());
handled = handler->OnQuotaRequest(browser.get(),
params.origin_url.spec(),
params.requested_size,
callbackImpl.get());
if (!handled)
callbackImpl->Disconnect();
}

2
libcef/browser/download_manager_delegate.cc
View File

@ -20,7 +20,7 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/file_chooser_params.h"
#include "net/base/net_util.h"
#include "net/base/filename_util.h"
using content::DownloadItem;
using content::DownloadManager;

46
libcef/browser/menu_creator.cc
View File

@ -33,12 +33,8 @@ CefString GetLabel(int message_id) {
} // namespace
CefMenuCreator::CefMenuCreator(CefBrowserHostImpl* browser,
content::RenderFrameHost* render_frame_host)
CefMenuCreator::CefMenuCreator(CefBrowserHostImpl* browser)
: browser_(browser) {
DCHECK(render_frame_host);
render_process_id_ = render_frame_host->GetProcess()->GetID();
render_frame_id_ = render_frame_host->GetRoutingID();
model_ = new CefMenuModelImpl(this);
}
@ -83,16 +79,12 @@ bool CefMenuCreator::CreateContextMenu(
CefRefPtr<CefContextMenuHandler> handler =
client->GetContextMenuHandler();
if (handler.get()) {
CefRefPtr<CefFrame> frame;
if (render_frame_id_ > 0)
frame = browser_->GetFrame(render_frame_id_);
if (!frame.get())
frame = browser_->GetMainFrame();
CefRefPtr<CefContextMenuParamsImpl> paramsPtr(
new CefContextMenuParamsImpl(&params_));
handler->OnBeforeContextMenu(browser_, frame, paramsPtr.get(),
handler->OnBeforeContextMenu(browser_,
browser_->GetFocusedFrame(),
paramsPtr.get(),
model_.get());
// Do not keep references to the parameters in the callback.
@ -137,17 +129,15 @@ void CefMenuCreator::ExecuteCommand(CefRefPtr<CefMenuModelImpl> source,
CefRefPtr<CefContextMenuHandler> handler =
client->GetContextMenuHandler();
if (handler.get()) {
CefRefPtr<CefFrame> frame;
if (render_frame_id_ > 0)
frame = browser_->GetFrame(render_frame_id_);
if (!frame.get())
frame = browser_->GetMainFrame();
CefRefPtr<CefContextMenuParamsImpl> paramsPtr(
new CefContextMenuParamsImpl(&params_));
bool handled = handler->OnContextMenuCommand(browser_, frame,
paramsPtr.get(), command_id, event_flags);
bool handled = handler->OnContextMenuCommand(
browser_,
browser_->GetFocusedFrame(),
paramsPtr.get(),
command_id,
event_flags);
// Do not keep references to the parameters in the callback.
paramsPtr->Detach(NULL);
@ -188,26 +178,18 @@ void CefMenuCreator::MenuClosed(CefRefPtr<CefMenuModelImpl> source) {
CefRefPtr<CefContextMenuHandler> handler =
client->GetContextMenuHandler();
if (handler.get()) {
CefRefPtr<CefFrame> frame;
if (render_frame_id_ > 0)
frame = browser_->GetFrame(render_frame_id_);
if (!frame.get())
frame = browser_->GetMainFrame();
handler->OnContextMenuDismissed(browser_, frame);
handler->OnContextMenuDismissed(browser_, browser_->GetFocusedFrame());
}
}
if (IsShowingContextMenu()) {
// Notify the host after closing the context menu.
content::WebContents* web_contents = browser_->GetWebContents();
content::RenderWidgetHostView* view =
browser_->GetWebContents()->GetRenderWidgetHostView();
web_contents->GetRenderWidgetHostView();
if (view)
view->SetShowingContextMenu(false);
content::RenderFrameHost* render_frame_host =
content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
if (render_frame_host)
render_frame_host->NotifyContextMenuClosed(params_.custom_context);
web_contents->NotifyContextMenuClosed(params_.custom_context);
}
}

7
libcef/browser/menu_creator.h
View File

@ -26,8 +26,7 @@ class CefMenuCreator : public CefMenuModelImpl::Delegate {
virtual bool RunContextMenu(CefMenuCreator* manager) =0;
};
CefMenuCreator(CefBrowserHostImpl* browser,
content::RenderFrameHost* render_frame_host);
explicit CefMenuCreator(CefBrowserHostImpl* browser);
virtual ~CefMenuCreator();
// Returns true if the context menu is currently showing.
@ -59,10 +58,6 @@ class CefMenuCreator : public CefMenuModelImpl::Delegate {
// CefBrowserHostImpl pointer is guaranteed to outlive this object.
CefBrowserHostImpl* browser_;
// The RenderFrameHost's IDs.
int render_process_id_;
int render_frame_id_;
CefRefPtr<CefMenuModelImpl> model_;
content::ContextMenuParams params_;
scoped_ptr<Runner> runner_;

8
libcef/browser/resource_dispatcher_host_delegate.cc
View File

@ -91,9 +91,11 @@ void CefResourceDispatcherHostDelegate::RequestBeginning(
}
}
bool CefResourceDispatcherHostDelegate::HandleExternalProtocol(const GURL& url,
int child_id,
int route_id) {
bool CefResourceDispatcherHostDelegate::HandleExternalProtocol(
const GURL& url,
int child_id,
int route_id,
bool initiated_by_user_gesture) {
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::GetBrowserForView(child_id, route_id);
if (browser.get())

3
libcef/browser/resource_dispatcher_host_delegate.h
View File

@ -27,7 +27,8 @@ class CefResourceDispatcherHostDelegate
ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
virtual bool HandleExternalProtocol(const GURL& url,
int child_id,
int route_id) OVERRIDE;
int route_id,
bool initiated_by_user_gesture) OVERRIDE;
virtual void OnRequestRedirected(
const GURL& redirect_url,
net::URLRequest* request,

19
libcef/renderer/browser_impl.cc
View File

@ -33,6 +33,7 @@
#include "third_party/WebKit/public/web/WebDataSource.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/public/web/WebScriptSource.h"
#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
@ -476,13 +477,13 @@ void CefBrowserImpl::DidStopLoading() {
}
void CefBrowserImpl::DidFailLoad(
blink::WebFrame* frame,
blink::WebLocalFrame* frame,
const blink::WebURLError& error) {
OnLoadError(frame, error);
OnLoadEnd(frame);
}
void CefBrowserImpl::DidFinishLoad(blink::WebFrame* frame) {
void CefBrowserImpl::DidFinishLoad(blink::WebLocalFrame* frame) {
blink::WebDataSource* ds = frame->dataSource();
Send(new CefHostMsg_DidFinishLoad(routing_id(),
webkit_glue::GetIdentifier(frame),
@ -492,18 +493,18 @@ void CefBrowserImpl::DidFinishLoad(blink::WebFrame* frame) {
OnLoadEnd(frame);
}
void CefBrowserImpl::DidStartProvisionalLoad(blink::WebFrame* frame) {
void CefBrowserImpl::DidStartProvisionalLoad(blink::WebLocalFrame* frame) {
// Send the frame creation notification if necessary.
GetWebFrameImpl(frame);
}
void CefBrowserImpl::DidFailProvisionalLoad(
blink::WebFrame* frame,
blink::WebLocalFrame* frame,
const blink::WebURLError& error) {
OnLoadError(frame, error);
}
void CefBrowserImpl::DidCommitProvisionalLoad(blink::WebFrame* frame,
void CefBrowserImpl::DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation) {
OnLoadStart(frame);
}
@ -585,7 +586,7 @@ void CefBrowserImpl::FocusedNodeChanged(const blink::WebNode& node) {
Send(new CefHostMsg_FrameFocusChange(routing_id(), frame_id));
}
void CefBrowserImpl::DidCreateDataSource(blink::WebFrame* frame,
void CefBrowserImpl::DidCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* ds) {
const blink::WebURLRequest& request = ds->request();
if (request.requestorID() == -1) {
@ -768,7 +769,7 @@ void CefBrowserImpl::OnLoadingStateChange(bool isLoading) {
}
}
void CefBrowserImpl::OnLoadStart(blink::WebFrame* frame) {
void CefBrowserImpl::OnLoadStart(blink::WebLocalFrame* frame) {
if (is_swapped_out())
return;
@ -786,7 +787,7 @@ void CefBrowserImpl::OnLoadStart(blink::WebFrame* frame) {
}
}
void CefBrowserImpl::OnLoadEnd(blink::WebFrame* frame) {
void CefBrowserImpl::OnLoadEnd(blink::WebLocalFrame* frame) {
if (is_swapped_out())
return;
@ -805,7 +806,7 @@ void CefBrowserImpl::OnLoadEnd(blink::WebFrame* frame) {
}
}
void CefBrowserImpl::OnLoadError(blink::WebFrame* frame,
void CefBrowserImpl::OnLoadError(blink::WebLocalFrame* frame,
const blink::WebURLError& error) {
if (is_swapped_out())
return;

23
libcef/renderer/browser_impl.h
View File

@ -30,10 +30,6 @@ namespace base {
class ListValue;
}
namespace blink {
class WebFrame;
}
// Renderer plumbing for CEF features. There is a one-to-one relationship
// between RenderView on the renderer side and RenderViewHost on the browser
// side.
@ -110,18 +106,18 @@ class CefBrowserImpl : public CefBrowser,
virtual void OnDestruct() OVERRIDE;
virtual void DidStartLoading() OVERRIDE;
virtual void DidStopLoading() OVERRIDE;
virtual void DidFailLoad(blink::WebFrame* frame,
virtual void DidFailLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error) OVERRIDE;
virtual void DidFinishLoad(blink::WebFrame* frame) OVERRIDE;
virtual void DidStartProvisionalLoad(blink::WebFrame* frame) OVERRIDE;
virtual void DidFinishLoad(blink::WebLocalFrame* frame) OVERRIDE;
virtual void DidStartProvisionalLoad(blink::WebLocalFrame* frame) OVERRIDE;
virtual void DidFailProvisionalLoad(
blink::WebFrame* frame,
blink::WebLocalFrame* frame,
const blink::WebURLError& error) OVERRIDE;
virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation) OVERRIDE;
virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE;
virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
virtual void DidCreateDataSource(blink::WebFrame* frame,
virtual void DidCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* ds) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@ -131,9 +127,10 @@ class CefBrowserImpl : public CefBrowser,
void OnResponseAck(int request_id);
void OnLoadingStateChange(bool isLoading);
void OnLoadStart(blink::WebFrame* frame);
void OnLoadEnd(blink::WebFrame* frame);
void OnLoadError(blink::WebFrame* frame, const blink::WebURLError& error);
void OnLoadStart(blink::WebLocalFrame* frame);
void OnLoadEnd(blink::WebLocalFrame* frame);
void OnLoadError(blink::WebLocalFrame* frame,
const blink::WebURLError& error);
// ID of the browser that this RenderView is associated with. During loading
// of cross-origin requests multiple RenderViews may be associated with the

2
libcef/renderer/content_renderer_client.cc
View File

@ -510,6 +510,7 @@ void CefContentRendererClient::DidCreateScriptContext(
v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(context));
CefRefPtr<CefV8Context> contextPtr(new CefV8ContextImpl(isolate, context));
@ -542,6 +543,7 @@ void CefContentRendererClient::WillReleaseScriptContext(
v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(context));
CefRefPtr<CefV8Context> contextPtr(

14
libcef/renderer/v8_impl.cc
View File

@ -500,6 +500,7 @@ void GetCefString(v8::Handle<v8::String> str, CefString& out) {
void FunctionCallbackImpl(const v8::FunctionCallbackInfo<v8::Value>& info) {
v8::Isolate* isolate = info.GetIsolate();
WebCore::V8RecursionScope recursion_scope(
isolate,
WebCore::toExecutionContext(isolate->GetCurrentContext()));
CefV8Handler* handler =
@ -540,6 +541,7 @@ void AccessorGetterCallbackImpl(
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();
@ -580,6 +582,7 @@ void AccessorSetterCallbackImpl(
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();
@ -949,9 +952,10 @@ CefRefPtr<CefV8Value> CefV8ContextImpl::GetGlobal() {
bool CefV8ContextImpl::Enter() {
CEF_V8_REQUIRE_VALID_HANDLE_RETURN(false);
v8::HandleScope handle_scope(handle_->isolate());
v8::Isolate* isolate = handle_->isolate();
v8::HandleScope handle_scope(isolate);
WebCore::V8PerIsolateData::current()->incrementRecursionLevel();
WebCore::V8PerIsolateData::from(isolate)->incrementRecursionLevel();
handle_->GetNewV8Handle()->Enter();
#ifndef NDEBUG
++enter_count_;
@ -962,11 +966,12 @@ bool CefV8ContextImpl::Enter() {
bool CefV8ContextImpl::Exit() {
CEF_V8_REQUIRE_VALID_HANDLE_RETURN(false);
v8::Isolate* isolate = handle_->isolate();
v8::HandleScope handle_scope(handle_->isolate());
DLOG_ASSERT(enter_count_ > 0);
handle_->GetNewV8Handle()->Exit();
WebCore::V8PerIsolateData::current()->decrementRecursionLevel();
WebCore::V8PerIsolateData::from(isolate)->decrementRecursionLevel();
#ifndef NDEBUG
--enter_count_;
#endif
@ -1034,8 +1039,7 @@ blink::WebFrame* CefV8ContextImpl::GetWebFrame() {
CEF_REQUIRE_RT();
v8::HandleScope handle_scope(handle_->isolate());
v8::Context::Scope context_scope(GetV8Context());
blink::WebFrame* frame = blink::WebFrame::frameForCurrentContext();
return frame;
return blink::WebFrame::frameForCurrentContext();
}

1
libcef/renderer/webkit_glue.cc
View File

@ -26,7 +26,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "third_party/WebKit/public/web/WebViewClient.h"
#include "third_party/WebKit/Source/core/dom/Node.h"
#include "third_party/WebKit/Source/web/WebFrameImpl.h"
#include "third_party/WebKit/Source/web/WebViewImpl.h"
MSVC_POP_WARNING();
#undef LOG

12
patch/patch.cfg
View File

@ -87,18 +87,6 @@ patches = [
'name': 'prefs_webkit_1161',
'path': '../webkit/',
},
{
# Pass RenderFrameHost to WebContentsDelegate::HandleContextMenu.
# https://codereview.chromium.org/148843003/
'name': 'web_contents_304341',
'path': '../content/',
},
{
# Pass RenderFrameHost to WebContentsDelegate::HandleContextMenu.
# https://codereview.chromium.org/148843003/
'name': 'views_webview_304341',
'path': '../ui/views/controls/webview/',
},
{
# Disable scollbar bounce and overlay on OS X.
# http://code.google.com/p/chromiumembedded/issues/detail?id=364

4
patch/patches/build.patch
View File

@ -1,6 +1,6 @@
Index: common.gypi
===================================================================
--- common.gypi (revision 261035)
--- common.gypi (revision 263053)
+++ common.gypi (working copy)
@@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by
@ -27,7 +27,7 @@ Index: common.gypi
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
Index: mac/strip_save_dsym
===================================================================
--- mac/strip_save_dsym (revision 261035)
--- mac/strip_save_dsym (revision 263053)
+++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@
"bundle"]

10
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 261035)
--- public/renderer/content_renderer_client.cc (revision 263053)
+++ public/renderer/content_renderer_client.cc (working copy)
@@ -92,7 +92,6 @@
return false;
@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc
const GURL& url,
Index: public/renderer/content_renderer_client.h
===================================================================
--- public/renderer/content_renderer_client.h (revision 261035)
--- public/renderer/content_renderer_client.h (revision 263053)
+++ public/renderer/content_renderer_client.h (working copy)
@@ -175,7 +175,6 @@
// Returns true if a popup window should be allowed.
@ -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 261035)
--- renderer/render_frame_impl.cc (revision 263053)
+++ renderer/render_frame_impl.cc (working copy)
@@ -2661,7 +2661,6 @@
@@ -2870,7 +2870,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) &&
@@ -2676,7 +2675,6 @@
@@ -2885,7 +2884,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

2
patch/patches/gritsettings.patch
View File

@ -1,6 +1,6 @@
Index: resource_ids
===================================================================
--- resource_ids (revision 149431)
--- resource_ids (revision 263053)
+++ 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 1880)
--- gyp/generator/ninja.py (revision 1892)
+++ gyp/generator/ninja.py (working copy)
@@ -738,7 +738,16 @@
for path in copy['files']:

2
patch/patches/message_loop_443.patch
View File

@ -1,6 +1,6 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 261035)
--- message_loop.cc (revision 263053)
+++ message_loop.cc (working copy)
@@ -144,7 +144,7 @@
MessageLoop::~MessageLoop() {

18
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 261035)
--- public/common/common_param_traits_macros.h (revision 263053)
+++ public/common/common_param_traits_macros.h (working copy)
@@ -182,6 +182,7 @@
@@ -181,6 +181,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,14 +12,14 @@ 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 261035)
--- renderer/web_preferences.cc (revision 263053)
+++ renderer/web_preferences.cc (working copy)
@@ -163,6 +163,8 @@
settings->setCookieEnabled(prefs.cookie_enabled);
settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
@@ -171,6 +171,8 @@
settings->setJavaEnabled(prefs.java_enabled);
+ web_view->setBaseBackgroundColor(prefs.base_background_color);
+
// This setting affects the behavior of links in an editable region:
// clicking the link should select it rather than navigate to it.
// Safari uses the same default. It is unlikley an embedder would want to
// By default, allow_universal_access_from_file_urls is set to false and thus
// we mitigate attacks from local HTML files by not granting file:// URLs
// universal access. Only test shell will enable this.

8
patch/patches/prefs_webkit_1161.patch
View File

@ -1,8 +1,8 @@
Index: common/webpreferences.cc
===================================================================
--- common/webpreferences.cc (revision 261035)
--- common/webpreferences.cc (revision 263053)
+++ common/webpreferences.cc (working copy)
@@ -121,6 +121,7 @@
@@ -120,6 +120,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 261035)
--- common/webpreferences.h (revision 263053)
+++ common/webpreferences.h (working copy)
@@ -156,6 +156,7 @@
@@ -155,6 +155,7 @@
bool use_solid_color_scrollbars;
bool compositor_touch_hit_testing;
bool navigate_on_drag_drop;

4
patch/patches/public_browser_1161.patch
View File

@ -1,6 +1,6 @@
Index: content_browser_client.cc
===================================================================
--- content_browser_client.cc (revision 261035)
--- content_browser_client.cc (revision 263053)
+++ content_browser_client.cc (working copy)
@@ -255,6 +255,10 @@
return true;
@ -15,7 +15,7 @@ Index: content_browser_client.cc
}
Index: content_browser_client.h
===================================================================
--- content_browser_client.h (revision 261035)
--- content_browser_client.h (revision 263053)
+++ content_browser_client.h (working copy)
@@ -22,6 +22,7 @@
#include "net/base/mime_util.h"

30
patch/patches/renderer_host_1161.patch
View File

@ -1,8 +1,8 @@
Index: compositing_iosurface_layer_mac.mm
===================================================================
--- compositing_iosurface_layer_mac.mm (revision 261035)
--- compositing_iosurface_layer_mac.mm (revision 263053)
+++ compositing_iosurface_layer_mac.mm (working copy)
@@ -120,7 +120,7 @@
@@ -117,7 +117,7 @@
(context_ && context_->cgl_context() != glContext) ||
!renderWidgetHostView_ ||
!renderWidgetHostView_->compositing_iosurface_) {
@ -13,9 +13,9 @@ Index: compositing_iosurface_layer_mac.mm
}
Index: compositing_iosurface_mac.mm
===================================================================
--- compositing_iosurface_mac.mm (revision 261035)
--- compositing_iosurface_mac.mm (revision 263053)
+++ compositing_iosurface_mac.mm (working copy)
@@ -362,7 +362,7 @@
@@ -360,7 +360,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
} else {
// Should match the clear color of RenderWidgetHostViewMac.
@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc
===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 261035)
--- compositing_iosurface_shader_programs_mac.cc (revision 263053)
+++ compositing_iosurface_shader_programs_mac.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/debug/trace_event.h"
@ -78,7 +78,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 261035)
--- compositing_iosurface_shader_programs_mac.h (revision 263053)
+++ compositing_iosurface_shader_programs_mac.h (working copy)
@@ -48,6 +48,8 @@
return rgb_to_yv12_output_format_;
@ -91,9 +91,9 @@ Index: compositing_iosurface_shader_programs_mac.h
TransformsRGBToYV12);
Index: render_widget_host_view_aura.cc
===================================================================
--- render_widget_host_view_aura.cc (revision 261035)
--- render_widget_host_view_aura.cc (revision 263053)
+++ render_widget_host_view_aura.cc (working copy)
@@ -2685,8 +2685,10 @@
@@ -2284,8 +2284,10 @@
// 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.
@ -108,9 +108,9 @@ Index: render_widget_host_view_aura.cc
Index: render_widget_host_view_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 261035)
--- render_widget_host_view_mac.mm (revision 263053)
+++ render_widget_host_view_mac.mm (working copy)
@@ -434,7 +434,7 @@
@@ -440,7 +440,7 @@
use_core_animation_ = true;
background_layer_.reset([[CALayer alloc] init]);
[background_layer_
@ -119,7 +119,7 @@ Index: render_widget_host_view_mac.mm
[cocoa_view_ setLayer:background_layer_];
[cocoa_view_ setWantsLayer:YES];
}
@@ -3087,7 +3087,7 @@
@@ -3097,7 +3097,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@ -128,7 +128,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
if (damagedRect.bottom() > rect.bottom()) {
@@ -3109,7 +3109,7 @@
@@ -3119,7 +3119,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@ -137,7 +137,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
}
@@ -3259,7 +3259,7 @@
@@ -3269,7 +3269,7 @@
}
} else {
CGContextSetFillColorWithColor(context,
@ -146,7 +146,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, dirtyRect);
if (renderWidgetHostView_->whiteout_start_time_.is_null())
renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
@@ -4282,7 +4282,7 @@
@@ -4276,7 +4276,7 @@
if (self = [super init]) {
renderWidgetHostView_ = r;
@ -155,7 +155,7 @@ Index: render_widget_host_view_mac.mm
[self setAnchorPoint:CGPointMake(0, 0)];
// Setting contents gravity is necessary to prevent the layer from being
// scaled during dyanmic resizes (especially with devtools open).
@@ -4311,7 +4311,7 @@
@@ -4305,7 +4305,7 @@
inContext:context];
} else {
CGContextSetFillColorWithColor(context,

6
patch/patches/spi_webcore_364.patch
View File

@ -1,8 +1,8 @@
Index: core/frame/FrameView.cpp
===================================================================
--- core/frame/FrameView.cpp (revision 170525)
--- core/frame/FrameView.cpp (revision 171269)
+++ core/frame/FrameView.cpp (working copy)
@@ -165,8 +165,10 @@
@@ -162,8 +162,10 @@
if (!isMainFrame())
return;
@ -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 170525)
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 171269)
+++ 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 248478)
--- underlay_opengl_hosting_window.h (revision 263053)
+++ underlay_opengl_hosting_window.h (working copy)
@@ -12,7 +12,7 @@
// Common base class for windows that host a OpenGL surface that renders under

65
patch/patches/views_webview_304341.patch
View File

@ -1,65 +0,0 @@
Index: web_dialog_view.cc
===================================================================
--- web_dialog_view.cc (revision 261035)
+++ web_dialog_view.cc (working copy)
@@ -257,13 +257,6 @@
return true;
}
-bool WebDialogView::HandleContextMenu(
- const content::ContextMenuParams& params) {
- if (delegate_)
- return delegate_->HandleContextMenu(params);
- return WebDialogWebContentsDelegate::HandleContextMenu(params);
-}
-
////////////////////////////////////////////////////////////////////////////////
// content::WebContentsDelegate implementation:
@@ -337,6 +330,15 @@
*proceed_to_fire_unload = proceed;
}
+bool WebDialogView::HandleContextMenu(
+ content::RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params) {
+ if (delegate_)
+ return delegate_->HandleContextMenu(params);
+ return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host,
+ params);
+}
+
////////////////////////////////////////////////////////////////////////////////
// WebDialogView, private:
Index: web_dialog_view.h
===================================================================
--- web_dialog_view.h (revision 261035)
+++ web_dialog_view.h (working copy)
@@ -74,6 +74,7 @@
virtual const views::Widget* GetWidget() const OVERRIDE;
// Overridden from ui::WebDialogDelegate:
+ using ui::WebDialogDelegate::HandleContextMenu;
virtual ui::ModalType GetDialogModalType() const OVERRIDE;
virtual base::string16 GetDialogTitle() const OVERRIDE;
virtual GURL GetDialogContentURL() const OVERRIDE;
@@ -91,8 +92,6 @@
virtual void OnCloseContents(content::WebContents* source,
bool* out_close_dialog) OVERRIDE;
virtual bool ShouldShowDialogTitle() const OVERRIDE;
- virtual bool HandleContextMenu(
- const content::ContextMenuParams& params) OVERRIDE;
// Overridden from content::WebContentsDelegate:
virtual void MoveContents(content::WebContents* source,
@@ -115,6 +114,9 @@
virtual void BeforeUnloadFired(content::WebContents* tab,
bool proceed,
bool* proceed_to_fire_unload) OVERRIDE;
+ virtual bool HandleContextMenu(
+ content::RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params) OVERRIDE;
private:
FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);

10
patch/patches/views_widget_180.patch
View File

@ -1,6 +1,6 @@
Index: desktop_aura/desktop_screen_win.cc
===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 261035)
--- desktop_aura/desktop_screen_win.cc (revision 263053)
+++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@
}
@ -13,7 +13,7 @@ Index: desktop_aura/desktop_screen_win.cc
}
Index: desktop_aura/desktop_window_tree_host_win.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_win.cc (revision 261035)
--- desktop_aura/desktop_window_tree_host_win.cc (revision 263053)
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
@@ -130,7 +130,9 @@
native_widget_delegate_);
@ -28,7 +28,7 @@ Index: desktop_aura/desktop_window_tree_host_win.cc
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
Index: desktop_aura/desktop_window_tree_host_win.h
===================================================================
--- desktop_aura/desktop_window_tree_host_win.h (revision 261035)
--- desktop_aura/desktop_window_tree_host_win.h (revision 263053)
+++ desktop_aura/desktop_window_tree_host_win.h (working copy)
@@ -214,6 +214,7 @@
LPARAM l_param) OVERRIDE;
@ -40,7 +40,7 @@ Index: desktop_aura/desktop_window_tree_host_win.h
HWND GetHWND() const;
Index: widget.cc
===================================================================
--- widget.cc (revision 261035)
--- widget.cc (revision 263053)
+++ widget.cc (working copy)
@@ -122,6 +122,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
@ -74,7 +74,7 @@ Index: widget.cc
}
Index: widget.h
===================================================================
--- widget.h (revision 261035)
--- widget.h (revision 263053)
+++ widget.h (working copy)
@@ -200,6 +200,7 @@
// Should the widget be double buffered? Default is false.

92
patch/patches/web_contents_304341.patch
View File

@ -1,92 +0,0 @@
Index: browser/browser_plugin/browser_plugin_guest.cc
===================================================================
--- browser/browser_plugin/browser_plugin_guest.cc (revision 261035)
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
@@ -794,7 +794,8 @@
return this;
}
-bool BrowserPluginGuest::HandleContextMenu(const ContextMenuParams& params) {
+bool BrowserPluginGuest::HandleContextMenu(RenderFrameHost* render_frame_host,
+ const ContextMenuParams& params) {
// TODO(fsamuel): We show the regular page context menu handler for now until
// we implement the Apps Context Menu API for Browser Plugin (see
// http://crbug.com/140315).
Index: browser/browser_plugin/browser_plugin_guest.h
===================================================================
--- browser/browser_plugin/browser_plugin_guest.h (revision 261035)
+++ browser/browser_plugin/browser_plugin_guest.h (working copy)
@@ -204,7 +204,8 @@
double progress) OVERRIDE;
virtual void CloseContents(WebContents* source) OVERRIDE;
virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
- virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
+ virtual bool HandleContextMenu(RenderFrameHost* render_frame_host,
+ const ContextMenuParams& params) OVERRIDE;
virtual void HandleKeyboardEvent(
WebContents* source,
const NativeWebKeyboardEvent& event) OVERRIDE;
Index: browser/web_contents/web_contents_impl.cc
===================================================================
--- browser/web_contents/web_contents_impl.cc (revision 261035)
+++ browser/web_contents/web_contents_impl.cc (working copy)
@@ -2831,7 +2831,7 @@
void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
// Allow WebContentsDelegates to handle the context menu operation first.
- if (delegate_ && delegate_->HandleContextMenu(params))
+ if (delegate_ && delegate_->HandleContextMenu(render_frame_host, params))
return;
render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params);
Index: browser/web_contents/web_contents_view_mac.mm
===================================================================
--- browser/web_contents/web_contents_view_mac.mm (revision 261035)
+++ browser/web_contents/web_contents_view_mac.mm (working copy)
@@ -227,12 +227,6 @@
void WebContentsViewMac::ShowContextMenu(
content::RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
- // Allow delegates to handle the context menu operation first.
- if (web_contents_->GetDelegate() &&
- web_contents_->GetDelegate()->HandleContextMenu(params)) {
- return;
- }
-
if (delegate())
delegate()->ShowContextMenu(render_frame_host, params);
else
Index: public/browser/web_contents_delegate.cc
===================================================================
--- public/browser/web_contents_delegate.cc (revision 261035)
+++ public/browser/web_contents_delegate.cc (working copy)
@@ -76,6 +76,7 @@
}
bool WebContentsDelegate::HandleContextMenu(
+ RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params) {
return false;
}
Index: public/browser/web_contents_delegate.h
===================================================================
--- public/browser/web_contents_delegate.h (revision 261035)
+++ public/browser/web_contents_delegate.h (working copy)
@@ -35,6 +35,7 @@
class DownloadItem;
class JavaScriptDialogManager;
class PageState;
+class RenderFrameHost;
class RenderViewHost;
class SessionStorageNamespace;
class WebContents;
@@ -231,7 +232,8 @@
virtual int GetExtraRenderViewHeight() const;
// Returns true if the context menu operation was handled by the delegate.
- virtual bool HandleContextMenu(const content::ContextMenuParams& params);
+ virtual bool HandleContextMenu(RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params);
// Opens source view for given WebContents that is navigated to the given
// page url.

2
patch/patches/webkit_933.patch
View File

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

2
patch/patches/zlib.patch
View File

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

1
tools/gyp_cef
View File

@ -24,6 +24,7 @@ sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
import gyp
# Add paths so that pymod_do_main(...) can import files.
sys.path.insert(1, os.path.join(chrome_src, 'build'))
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build'))