bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-24 16:07:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 251746.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1628 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-02-19 16:27:54 +00:00
parent 4b75a68f9b
commit 5b6086ffb3
26 changed files with 105 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '248478', 'chromium_revision': '251746',
} }

6
libcef/browser/browser_context_impl.cc
View File

@ -250,17 +250,17 @@ net::URLRequestContextGetter*
return GetRequestContext(); return GetRequestContext();
} }
void CefBrowserContextImpl::RequestMIDISysExPermission( void CefBrowserContextImpl::RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback& callback) { const MidiSysExPermissionCallback& callback) {
// TODO(CEF): Implement Web MIDI API permission handling. // TODO(CEF): Implement Web MIDI API permission handling.
callback.Run(false); callback.Run(false);
} }
void CefBrowserContextImpl::CancelMIDISysExPermissionRequest( void CefBrowserContextImpl::CancelMidiSysExPermissionRequest(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,

6
libcef/browser/browser_context_impl.h
View File

@ -39,13 +39,13 @@ class CefBrowserContextImpl : public CefBrowserContext {
GetMediaRequestContextForStoragePartition( GetMediaRequestContextForStoragePartition(
const base::FilePath& partition_path, const base::FilePath& partition_path,
bool in_memory) OVERRIDE; bool in_memory) OVERRIDE;
virtual void RequestMIDISysExPermission( virtual void RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback& callback) OVERRIDE; const MidiSysExPermissionCallback& callback) OVERRIDE;
virtual void CancelMIDISysExPermissionRequest( virtual void CancelMidiSysExPermissionRequest(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,

6
libcef/browser/browser_context_proxy.cc
View File

@ -112,17 +112,17 @@ net::URLRequestContextGetter*
return GetRequestContext(); return GetRequestContext();
} }
void CefBrowserContextProxy::RequestMIDISysExPermission( void CefBrowserContextProxy::RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback& callback) { const MidiSysExPermissionCallback& callback) {
// TODO(CEF): Implement Web MIDI API permission handling. // TODO(CEF): Implement Web MIDI API permission handling.
callback.Run(false); callback.Run(false);
} }
void CefBrowserContextProxy::CancelMIDISysExPermissionRequest( void CefBrowserContextProxy::CancelMidiSysExPermissionRequest(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,

6
libcef/browser/browser_context_proxy.h
View File

@ -47,13 +47,13 @@ class CefBrowserContextProxy : public CefBrowserContext {
GetMediaRequestContextForStoragePartition( GetMediaRequestContextForStoragePartition(
const base::FilePath& partition_path, const base::FilePath& partition_path,
bool in_memory) OVERRIDE; bool in_memory) OVERRIDE;
virtual void RequestMIDISysExPermission( virtual void RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback& callback) OVERRIDE; const MidiSysExPermissionCallback& callback) OVERRIDE;
virtual void CancelMIDISysExPermissionRequest( virtual void CancelMidiSysExPermissionRequest(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id, int bridge_id,

11
libcef/browser/chrome_browser_process_stub.cc
View File

@ -109,12 +109,6 @@ GpuModeManager* ChromeBrowserProcessStub::gpu_mode_manager() {
return NULL; return NULL;
} }
RenderWidgetSnapshotTaker*
ChromeBrowserProcessStub::GetRenderWidgetSnapshotTaker() {
NOTIMPLEMENTED();
return NULL;
}
AutomationProviderList* AutomationProviderList*
ChromeBrowserProcessStub::GetAutomationProviderList() { ChromeBrowserProcessStub::GetAutomationProviderList() {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
@ -259,11 +253,6 @@ bool ChromeBrowserProcessStub::created_local_state() const {
return false; return false;
} }
StorageMonitor* ChromeBrowserProcessStub::storage_monitor() {
NOTIMPLEMENTED();
return NULL;
}
#if defined(ENABLE_WEBRTC) #if defined(ENABLE_WEBRTC)
WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() { WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
NOTIMPLEMENTED(); NOTIMPLEMENTED();

2
libcef/browser/chrome_browser_process_stub.h
View File

@ -48,7 +48,6 @@ class ChromeBrowserProcessStub : public BrowserProcess {
virtual IconManager* icon_manager() OVERRIDE; virtual IconManager* icon_manager() OVERRIDE;
virtual GLStringManager* gl_string_manager() OVERRIDE; virtual GLStringManager* gl_string_manager() OVERRIDE;
virtual GpuModeManager* gpu_mode_manager() OVERRIDE; virtual GpuModeManager* gpu_mode_manager() OVERRIDE;
virtual RenderWidgetSnapshotTaker* GetRenderWidgetSnapshotTaker() OVERRIDE;
virtual AutomationProviderList* GetAutomationProviderList() OVERRIDE; virtual AutomationProviderList* GetAutomationProviderList() OVERRIDE;
virtual void CreateDevToolsHttpProtocolHandler( virtual void CreateDevToolsHttpProtocolHandler(
chrome::HostDesktopType host_desktop_type, chrome::HostDesktopType host_desktop_type,
@ -91,7 +90,6 @@ class ChromeBrowserProcessStub : public BrowserProcess {
virtual MediaFileSystemRegistry* virtual MediaFileSystemRegistry*
media_file_system_registry() OVERRIDE; media_file_system_registry() OVERRIDE;
virtual bool created_local_state() const OVERRIDE; virtual bool created_local_state() const OVERRIDE;
virtual StorageMonitor* storage_monitor() OVERRIDE;
#if defined(ENABLE_WEBRTC) #if defined(ENABLE_WEBRTC)
virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE; virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
#endif #endif

8
libcef/browser/chrome_scheme_handler.cc
View File

@ -340,14 +340,14 @@ class ChromeProtocolHandlerWrapper :
net::NetworkDelegate* network_delegate) const OVERRIDE { net::NetworkDelegate* network_delegate) const OVERRIDE {
// Keep synchronized with the checks in ChromeProtocolHandler::MaybeCreateJob. // Keep synchronized with the checks in ChromeProtocolHandler::MaybeCreateJob.
if (content::ViewHttpCacheJobFactory::IsSupportedURL(request->url()) || if (content::ViewHttpCacheJobFactory::IsSupportedURL(request->url()) ||
(request->url().SchemeIs(chrome::kChromeUIScheme) && (request->url().SchemeIs(content::kChromeUIScheme) &&
request->url().host() == content::kChromeUIAppCacheInternalsHost) || request->url().host() == content::kChromeUIAppCacheInternalsHost) ||
content::ViewBlobInternalsJobFactory::IsSupportedURL(request->url()) || content::ViewBlobInternalsJobFactory::IsSupportedURL(request->url()) ||
#if defined(USE_TCMALLOC) #if defined(USE_TCMALLOC)
(request->url().SchemeIs(chrome::kChromeUIScheme) && (request->url().SchemeIs(content::kChromeUIScheme) &&
request->url().host() == content::kChromeUITcmallocHost) || request->url().host() == content::kChromeUITcmallocHost) ||
#endif #endif
(request->url().SchemeIs(chrome::kChromeUIScheme) && (request->url().SchemeIs(content::kChromeUIScheme) &&
request->url().host() == content::kChromeUIHistogramHost)) { request->url().host() == content::kChromeUIHistogramHost)) {
return chrome_protocol_handler_->MaybeCreateJob(request, network_delegate); return chrome_protocol_handler_->MaybeCreateJob(request, network_delegate);
} }
@ -364,7 +364,7 @@ class ChromeProtocolHandlerWrapper :
void RegisterChromeHandler() { void RegisterChromeHandler() {
CefRegisterSchemeHandlerFactory( CefRegisterSchemeHandlerFactory(
chrome::kChromeUIScheme, content::kChromeUIScheme,
std::string(), std::string(),
CreateInternalHandlerFactory( CreateInternalHandlerFactory(
make_scoped_ptr<InternalHandlerDelegate>(new Delegate()))); make_scoped_ptr<InternalHandlerDelegate>(new Delegate())));

4
libcef/browser/devtools_delegate.cc
View File

@ -79,7 +79,7 @@ Target::Target(content::WebContents* web_contents) {
content::NavigationEntry* entry = controller.GetActiveEntry(); content::NavigationEntry* entry = controller.GetActiveEntry();
if (entry != NULL && entry->GetURL().is_valid()) if (entry != NULL && entry->GetURL().is_valid())
favicon_url_ = entry->GetFavicon().url; favicon_url_ = entry->GetFavicon().url;
last_activity_time_ = web_contents->GetLastSelectedTime(); last_activity_time_ = web_contents->GetLastActiveTime();
} }
bool Target::Activate() const { bool Target::Activate() const {
@ -166,5 +166,5 @@ scoped_ptr<net::StreamListenSocket>
std::string CefDevToolsDelegate::GetChromeDevToolsURL() { std::string CefDevToolsDelegate::GetChromeDevToolsURL() {
return base::StringPrintf("%s://%s/devtools.html", return base::StringPrintf("%s://%s/devtools.html",
chrome::kChromeDevToolsScheme, scheme::kChromeDevToolsHost); content::kChromeDevToolsScheme, scheme::kChromeDevToolsHost);
} }

2
libcef/browser/devtools_scheme_handler.cc
View File

@ -45,7 +45,7 @@ class Delegate : public InternalHandlerDelegate {
void RegisterChromeDevToolsHandler() { void RegisterChromeDevToolsHandler() {
CefRegisterSchemeHandlerFactory( CefRegisterSchemeHandlerFactory(
chrome::kChromeDevToolsScheme, content::kChromeDevToolsScheme,
kChromeDevToolsHost, kChromeDevToolsHost,
CreateInternalHandlerFactory( CreateInternalHandlerFactory(
make_scoped_ptr<InternalHandlerDelegate>(new Delegate()))); make_scoped_ptr<InternalHandlerDelegate>(new Delegate())));

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

@ -82,7 +82,8 @@ void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
} // namespace } // namespace
PrintingMessageFilter::PrintingMessageFilter(int render_process_id) PrintingMessageFilter::PrintingMessageFilter(int render_process_id)
: render_process_id_(render_process_id), : content::BrowserMessageFilter(PrintMsgStart),
render_process_id_(render_process_id),
queue_(g_browser_process->print_job_manager()->queue()) { queue_(g_browser_process->print_job_manager()->queue()) {
DCHECK(queue_); DCHECK(queue_);
} }

6
libcef/browser/scheme_handler.cc
View File

@ -49,10 +49,10 @@ void InstallInternalProtectedHandlers(
const std::string& scheme = it->first; const std::string& scheme = it->first;
scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> protocol_handler; scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> protocol_handler;
if (scheme == chrome::kChromeDevToolsScheme) { if (scheme == content::kChromeDevToolsScheme) {
// Don't use the default "chrome-devtools" handler. // Don't use the default "chrome-devtools" handler.
continue; continue;
} else if (scheme == chrome::kChromeUIScheme) { } else if (scheme == content::kChromeUIScheme) {
// Filter the URLs that are passed to the default "chrome" handler so as // Filter the URLs that are passed to the default "chrome" handler so as
// not to interfere with CEF's "chrome" handler. // not to interfere with CEF's "chrome" handler.
protocol_handler.reset( protocol_handler.reset(
@ -78,7 +78,7 @@ void RegisterInternalHandlers() {
} }
void DidFinishLoad(CefRefPtr<CefFrame> frame, const GURL& validated_url) { void DidFinishLoad(CefRefPtr<CefFrame> frame, const GURL& validated_url) {
if (validated_url.scheme() == chrome::kChromeUIScheme) if (validated_url.scheme() == content::kChromeUIScheme)
scheme::DidFinishChromeLoad(frame, validated_url); scheme::DidFinishChromeLoad(frame, validated_url);
} }

10
libcef/common/scheme_registration.cc
View File

@ -11,8 +11,8 @@ namespace scheme {
void AddInternalSchemes(std::vector<std::string>* standard_schemes) { void AddInternalSchemes(std::vector<std::string>* standard_schemes) {
static CefContentClient::SchemeInfo schemes[] = { static CefContentClient::SchemeInfo schemes[] = {
{ chrome::kChromeUIScheme, true, true, true }, { content::kChromeUIScheme, true, true, true },
{ chrome::kChromeDevToolsScheme, true, false, true } { content::kChromeDevToolsScheme, true, false, true }
}; };
CefContentClient* client = CefContentClient::Get(); CefContentClient* client = CefContentClient::Get();
@ -26,8 +26,8 @@ void AddInternalSchemes(std::vector<std::string>* standard_schemes) {
bool IsInternalHandledScheme(const std::string& scheme) { bool IsInternalHandledScheme(const std::string& scheme) {
static const char* schemes[] = { static const char* schemes[] = {
chrome::kBlobScheme, chrome::kBlobScheme,
chrome::kChromeDevToolsScheme, content::kChromeDevToolsScheme,
chrome::kChromeUIScheme, content::kChromeUIScheme,
content::kDataScheme, content::kDataScheme,
content::kFileScheme, content::kFileScheme,
content::kFileSystemScheme, content::kFileSystemScheme,
@ -47,7 +47,7 @@ bool IsInternalProtectedScheme(const std::string& scheme) {
// InstallInternalProtectedHandlers(). // InstallInternalProtectedHandlers().
static const char* schemes[] = { static const char* schemes[] = {
chrome::kBlobScheme, chrome::kBlobScheme,
chrome::kChromeUIScheme, content::kChromeUIScheme,
content::kDataScheme, content::kDataScheme,
content::kFileScheme, content::kFileScheme,
content::kFileSystemScheme, content::kFileSystemScheme,

5
libcef/renderer/content_renderer_client.cc
View File

@ -51,6 +51,7 @@ MSVC_POP_WARNING();
#include "third_party/WebKit/public/platform/WebWorkerRunLoop.h" #include "third_party/WebKit/public/platform/WebWorkerRunLoop.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebPluginParams.h" #include "third_party/WebKit/public/web/WebPluginParams.h"
#include "third_party/WebKit/public/web/WebPrerendererClient.h" #include "third_party/WebKit/public/web/WebPrerendererClient.h"
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
@ -586,7 +587,7 @@ void CefContentRendererClient::DidCreateScriptContext(
CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame); CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame);
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame); v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context); v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope( WebCore::V8RecursionScope recursion_scope(
@ -618,7 +619,7 @@ void CefContentRendererClient::WillReleaseScriptContext(
if (browserPtr.get()) { if (browserPtr.get()) {
CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame); CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame);
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame); v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context); v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope( WebCore::V8RecursionScope recursion_scope(

5
libcef/renderer/frame_impl.cc
View File

@ -18,6 +18,7 @@
#include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebScriptSource.h"
@ -238,9 +239,9 @@ CefRefPtr<CefV8Context> CefFrameImpl::GetV8Context() {
CEF_REQUIRE_RT_RETURN(NULL); CEF_REQUIRE_RT_RETURN(NULL);
if (frame_) { if (frame_) {
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame_); v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
return new CefV8ContextImpl(isolate, webkit_glue::GetV8Context(frame_)); return new CefV8ContextImpl(isolate, frame_->mainWorldScriptContext());
} else { } else {
return NULL; return NULL;
} }

6
libcef/renderer/render_urlrequest_impl.cc
View File

@ -56,7 +56,8 @@ class CefWebURLLoaderClient : public blink::WebURLLoaderClient {
const char* data, const char* data,
int dataLength) OVERRIDE; int dataLength) OVERRIDE;
virtual void didFinishLoading(WebURLLoader* loader, virtual void didFinishLoading(WebURLLoader* loader,
double finishTime) OVERRIDE; double finishTime,
int64_t totalEncodedDataLength) OVERRIDE;
virtual void didFail(WebURLLoader* loader, virtual void didFail(WebURLLoader* loader,
const WebURLError& error) OVERRIDE; const WebURLError& error) OVERRIDE;
@ -299,7 +300,8 @@ void CefWebURLLoaderClient::didReceiveCachedMetadata(WebURLLoader* loader,
} }
void CefWebURLLoaderClient::didFinishLoading(WebURLLoader* loader, void CefWebURLLoaderClient::didFinishLoading(WebURLLoader* loader,
double finishTime) { double finishTime,
int64_t totalEncodedDataLength) {
context_->OnComplete(); context_->OnComplete();
} }

14
libcef/renderer/webkit_glue.cc
View File

@ -16,7 +16,6 @@
#include "libcef/renderer/webkit_glue.h" #include "libcef/renderer/webkit_glue.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "v8/include/v8.h"
#include "config.h" #include "config.h"
MSVC_PUSH_WARNING_LEVEL(0); MSVC_PUSH_WARNING_LEVEL(0);
@ -26,12 +25,9 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/public/web/WebViewClient.h" #include "third_party/WebKit/public/web/WebViewClient.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/ScriptController.h"
#include "third_party/WebKit/Source/core/dom/Node.h" #include "third_party/WebKit/Source/core/dom/Node.h"
#include "third_party/WebKit/Source/web/WebFrameImpl.h" #include "third_party/WebKit/Source/web/WebFrameImpl.h"
#include "third_party/WebKit/Source/web/WebViewImpl.h" #include "third_party/WebKit/Source/web/WebViewImpl.h"
#include "third_party/WebKit/Source/wtf/PassRefPtr.h"
MSVC_POP_WARNING(); MSVC_POP_WARNING();
#undef LOG #undef LOG
@ -67,16 +63,6 @@ void GoForward(blink::WebView* view) {
impl->client()->navigateBackForwardSoon(1); impl->client()->navigateBackForwardSoon(1);
} }
v8::Isolate* GetV8Isolate(blink::WebFrame* frame) {
blink::WebFrameImpl* impl = static_cast<blink::WebFrameImpl*>(frame);
return WebCore::toIsolate(impl->frame());
}
v8::Handle<v8::Context> GetV8Context(blink::WebFrame* frame) {
blink::WebFrameImpl* impl = static_cast<blink::WebFrameImpl*>(frame);
return WebCore::ScriptController::mainWorldContext(impl->frame());
}
std::string DumpDocumentText(blink::WebFrame* frame) { std::string DumpDocumentText(blink::WebFrame* frame) {
// We use the document element's text instead of the body text here because // We use the document element's text instead of the body text here because
// not all documents have a body, such as XML documents. // not all documents have a body, such as XML documents.

6
libcef/renderer/webkit_glue.h
View File

@ -28,12 +28,6 @@ bool CanGoForward(blink::WebView* view);
void GoBack(blink::WebView* view); void GoBack(blink::WebView* view);
void GoForward(blink::WebView* view); void GoForward(blink::WebView* view);
// Retrieve the V8 isolate associated with the frame.
v8::Isolate* GetV8Isolate(blink::WebFrame* frame);
// Retrieve the V8 context associated with the frame.
v8::Handle<v8::Context> GetV8Context(blink::WebFrame* frame);
// Returns the text of the document element. // Returns the text of the document element.
std::string DumpDocumentText(blink::WebFrame* frame); std::string DumpDocumentText(blink::WebFrame* frame);

6
patch/patches/build.patch
View File

@ -1,6 +1,6 @@
Index: common.gypi Index: common.gypi
=================================================================== ===================================================================
--- common.gypi (revision 248478) --- common.gypi (revision 251746)
+++ common.gypi (working copy) +++ common.gypi (working copy)
@@ -9,6 +9,9 @@ @@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by # Variables expected to be overriden on the GYP command line (-D) or by
@ -12,7 +12,7 @@ Index: common.gypi
# Putting a variables dict inside another variables dict looks kind of # Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as # weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary # variables within the outer variables dict here. This is necessary
@@ -88,9 +91,9 @@ @@ -85,9 +88,9 @@
# #
# TODO(erg): Merge this into the previous block once compiling with # TODO(erg): Merge this into the previous block once compiling with
# aura safely implies including ash capabilities. # aura safely implies including ash capabilities.
@ -27,7 +27,7 @@ Index: common.gypi
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', { ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
Index: mac/strip_save_dsym Index: mac/strip_save_dsym
=================================================================== ===================================================================
--- mac/strip_save_dsym (revision 248478) --- mac/strip_save_dsym (revision 251746)
+++ mac/strip_save_dsym (working copy) +++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
"bundle"] "bundle"]

10
patch/patches/content_nav_1129.patch
View File

@ -1,6 +1,6 @@
Index: public/renderer/content_renderer_client.cc Index: public/renderer/content_renderer_client.cc
=================================================================== ===================================================================
--- public/renderer/content_renderer_client.cc (revision 248478) --- public/renderer/content_renderer_client.cc (revision 251746)
+++ public/renderer/content_renderer_client.cc (working copy) +++ public/renderer/content_renderer_client.cc (working copy)
@@ -92,7 +92,6 @@ @@ -92,7 +92,6 @@
return false; return false;
@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc
const GURL& url, const GURL& url,
Index: public/renderer/content_renderer_client.h Index: public/renderer/content_renderer_client.h
=================================================================== ===================================================================
--- public/renderer/content_renderer_client.h (revision 248478) --- public/renderer/content_renderer_client.h (revision 251746)
+++ public/renderer/content_renderer_client.h (working copy) +++ public/renderer/content_renderer_client.h (working copy)
@@ -175,7 +175,6 @@ @@ -175,7 +175,6 @@
// Returns true if a popup window should be allowed. // 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 // If |send_referrer| is set to false (which is the default), no referrer
Index: renderer/render_view_impl.cc Index: renderer/render_view_impl.cc
=================================================================== ===================================================================
--- renderer/render_view_impl.cc (revision 248478) --- renderer/render_view_impl.cc (revision 251746)
+++ renderer/render_view_impl.cc (working copy) +++ renderer/render_view_impl.cc (working copy)
@@ -3071,7 +3071,6 @@ @@ -2628,7 +2628,6 @@
WebDataSource::ExtraData* extraData, const WebURLRequest& request, WebDataSource::ExtraData* extraData, const WebURLRequest& request,
WebNavigationType type, WebNavigationPolicy default_policy, WebNavigationType type, WebNavigationPolicy default_policy,
bool is_redirect) { bool is_redirect) {
@ -50,7 +50,7 @@ Index: renderer/render_view_impl.cc
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) && if (request.url() != GURL(kSwappedOutURL) &&
@@ -3086,7 +3085,6 @@ @@ -2643,7 +2642,6 @@
is_redirect)) { is_redirect)) {
return blink::WebNavigationPolicyIgnore; return blink::WebNavigationPolicyIgnore;
} }

4
patch/patches/gyp_331.patch
View File

@ -1,8 +1,8 @@
Index: gyp/generator/ninja.py Index: gyp/generator/ninja.py
=================================================================== ===================================================================
--- gyp/generator/ninja.py (revision 1769) --- gyp/generator/ninja.py (revision 1852)
+++ gyp/generator/ninja.py (working copy) +++ gyp/generator/ninja.py (working copy)
@@ -723,7 +723,16 @@ @@ -726,7 +726,16 @@
for path in copy['files']: for path in copy['files']:
# Normalize the path so trailing slashes don't confuse us. # Normalize the path so trailing slashes don't confuse us.
path = os.path.normpath(path) path = os.path.normpath(path)

26
patch/patches/renderer_host_1161.patch
View File

@ -1,10 +1,10 @@
Index: compositing_iosurface_layer_mac.mm Index: compositing_iosurface_layer_mac.mm
=================================================================== ===================================================================
--- compositing_iosurface_layer_mac.mm (revision 248478) --- compositing_iosurface_layer_mac.mm (revision 251746)
+++ compositing_iosurface_layer_mac.mm (working copy) +++ compositing_iosurface_layer_mac.mm (working copy)
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
(context_ && context_->cgl_context() != glContext) ||
if (!context_.get() || !renderWidgetHostView_ || !renderWidgetHostView_ ||
!renderWidgetHostView_->compositing_iosurface_) { !renderWidgetHostView_->compositing_iosurface_) {
- glClearColor(1, 1, 1, 1); - glClearColor(1, 1, 1, 1);
+ glClearColor(0, 0, 0, 0); + glClearColor(0, 0, 0, 0);
@ -13,9 +13,9 @@ Index: compositing_iosurface_layer_mac.mm
} }
Index: compositing_iosurface_mac.mm Index: compositing_iosurface_mac.mm
=================================================================== ===================================================================
--- compositing_iosurface_mac.mm (revision 248478) --- compositing_iosurface_mac.mm (revision 251746)
+++ compositing_iosurface_mac.mm (working copy) +++ compositing_iosurface_mac.mm (working copy)
@@ -424,7 +424,7 @@ @@ -360,7 +360,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR(); glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
} else { } else {
// Should match the clear color of RenderWidgetHostViewMac. // Should match the clear color of RenderWidgetHostViewMac.
@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc Index: compositing_iosurface_shader_programs_mac.cc
=================================================================== ===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 248478) --- compositing_iosurface_shader_programs_mac.cc (revision 251746)
+++ compositing_iosurface_shader_programs_mac.cc (working copy) +++ compositing_iosurface_shader_programs_mac.cc (working copy)
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
@ -78,7 +78,7 @@ Index: compositing_iosurface_shader_programs_mac.cc
shader_programs_[which] = shader_programs_[which] =
Index: compositing_iosurface_shader_programs_mac.h Index: compositing_iosurface_shader_programs_mac.h
=================================================================== ===================================================================
--- compositing_iosurface_shader_programs_mac.h (revision 248478) --- compositing_iosurface_shader_programs_mac.h (revision 251746)
+++ compositing_iosurface_shader_programs_mac.h (working copy) +++ compositing_iosurface_shader_programs_mac.h (working copy)
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
return rgb_to_yv12_output_format_; return rgb_to_yv12_output_format_;
@ -91,9 +91,9 @@ Index: compositing_iosurface_shader_programs_mac.h
TransformsRGBToYV12); TransformsRGBToYV12);
Index: render_widget_host_view_mac.mm Index: render_widget_host_view_mac.mm
=================================================================== ===================================================================
--- render_widget_host_view_mac.mm (revision 248478) --- render_widget_host_view_mac.mm (revision 251746)
+++ render_widget_host_view_mac.mm (working copy) +++ render_widget_host_view_mac.mm (working copy)
@@ -494,7 +494,7 @@ @@ -483,7 +483,7 @@
software_layer_.reset([[CALayer alloc] init]); software_layer_.reset([[CALayer alloc] init]);
if (!software_layer_) if (!software_layer_)
LOG(ERROR) << "Failed to create CALayer for software rendering"; LOG(ERROR) << "Failed to create CALayer for software rendering";
@ -102,7 +102,7 @@ Index: render_widget_host_view_mac.mm
[software_layer_ setDelegate:cocoa_view_]; [software_layer_ setDelegate:cocoa_view_];
[software_layer_ setContentsGravity:kCAGravityTopLeft]; [software_layer_ setContentsGravity:kCAGravityTopLeft];
[software_layer_ setFrame:NSRectToCGRect([cocoa_view_ bounds])]; [software_layer_ setFrame:NSRectToCGRect([cocoa_view_ bounds])];
@@ -2846,7 +2846,7 @@ @@ -2856,7 +2856,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)]; NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context, CGContextSetFillColorWithColor(context,
@ -111,7 +111,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r)); CGContextFillRect(context, NSRectToCGRect(r));
} }
if (damagedRect.bottom() > rect.bottom()) { if (damagedRect.bottom() > rect.bottom()) {
@@ -2868,7 +2868,7 @@ @@ -2878,7 +2878,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)]; NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context, CGContextSetFillColorWithColor(context,
@ -120,7 +120,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r)); CGContextFillRect(context, NSRectToCGRect(r));
} }
} }
@@ -3029,7 +3029,7 @@ @@ -3037,7 +3037,7 @@
} }
} else { } else {
CGContextSetFillColorWithColor(context, CGContextSetFillColorWithColor(context,
@ -129,7 +129,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, dirtyRect); CGContextFillRect(context, dirtyRect);
if (renderWidgetHostView_->whiteout_start_time_.is_null()) if (renderWidgetHostView_->whiteout_start_time_.is_null())
renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now(); renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
@@ -4037,7 +4037,7 @@ @@ -4045,7 +4045,7 @@
if (!renderWidgetHostView_->render_widget_host_ || if (!renderWidgetHostView_->render_widget_host_ ||
renderWidgetHostView_->render_widget_host_->is_hidden()) { renderWidgetHostView_->render_widget_host_->is_hidden()) {
CGContextSetFillColorWithColor(context, CGContextSetFillColorWithColor(context,

6
patch/patches/spi_webcore_364.patch
View File

@ -1,8 +1,8 @@
Index: core/frame/FrameView.cpp Index: core/frame/FrameView.cpp
=================================================================== ===================================================================
--- core/frame/FrameView.cpp (revision 166298) --- core/frame/FrameView.cpp (revision 167304)
+++ core/frame/FrameView.cpp (working copy) +++ core/frame/FrameView.cpp (working copy)
@@ -168,8 +168,10 @@ @@ -141,8 +141,10 @@
if (!isMainFrame()) if (!isMainFrame())
return; return;
@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(Frame* frame) PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/scroll/ScrollbarThemeMacCommon.mm Index: platform/scroll/ScrollbarThemeMacCommon.mm
=================================================================== ===================================================================
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 166298) --- platform/scroll/ScrollbarThemeMacCommon.mm (revision 167304)
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy) +++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
@@ -369,10 +369,14 @@ @@ -369,10 +369,14 @@
// static // static

49
patch/patches/views_widget_180.patch
View File

@ -1,30 +1,6 @@
Index: desktop_aura/desktop_root_window_host_win.cc
===================================================================
--- desktop_aura/desktop_root_window_host_win.cc (revision 248478)
+++ desktop_aura/desktop_root_window_host_win.cc (working copy)
@@ -132,7 +132,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
- if (params.parent && params.parent->GetDispatcher()) {
+ if (params.parent_widget) {
+ parent_hwnd = params.parent_widget;
+ } else if (params.parent && params.parent->GetDispatcher()) {
parent_hwnd =
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
}
@@ -771,7 +773,7 @@
void DesktopWindowTreeHostWin::HandleCreate() {
// TODO(beng): moar
- NOTIMPLEMENTED();
+ // NOTIMPLEMENTED();
native_widget_delegate_->OnNativeWidgetCreated(true);
Index: desktop_aura/desktop_screen_win.cc Index: desktop_aura/desktop_screen_win.cc
=================================================================== ===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 248478) --- desktop_aura/desktop_screen_win.cc (revision 251746)
+++ desktop_aura/desktop_screen_win.cc (working copy) +++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
} }
@ -35,9 +11,24 @@ Index: desktop_aura/desktop_screen_win.cc
aura::WindowEventDispatcher* dispatcher = window->GetDispatcher(); aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();
return dispatcher ? dispatcher->host()->GetAcceleratedWidget() : NULL; return dispatcher ? dispatcher->host()->GetAcceleratedWidget() : NULL;
} }
Index: desktop_aura/desktop_window_tree_host_win.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_win.cc (revision 251746)
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
@@ -133,7 +133,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
- if (params.parent && params.parent->GetDispatcher()) {
+ if (params.parent_widget) {
+ parent_hwnd = params.parent_widget;
+ } else if (params.parent && params.parent->GetDispatcher()) {
parent_hwnd =
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
}
Index: widget.cc Index: widget.cc
=================================================================== ===================================================================
--- widget.cc (revision 248478) --- widget.cc (revision 251746)
+++ widget.cc (working copy) +++ widget.cc (working copy)
@@ -124,6 +124,7 @@ @@ -124,6 +124,7 @@
show_state(ui::SHOW_STATE_DEFAULT), show_state(ui::SHOW_STATE_DEFAULT),
@ -45,7 +36,7 @@ Index: widget.cc
parent(NULL), parent(NULL),
+ parent_widget(NULL), + parent_widget(NULL),
native_widget(NULL), native_widget(NULL),
desktop_root_window_host(NULL), desktop_window_tree_host(NULL),
top_level(false), top_level(false),
@@ -149,6 +150,7 @@ @@ -149,6 +150,7 @@
show_state(ui::SHOW_STATE_DEFAULT), show_state(ui::SHOW_STATE_DEFAULT),
@ -53,11 +44,11 @@ Index: widget.cc
parent(NULL), parent(NULL),
+ parent_widget(NULL), + parent_widget(NULL),
native_widget(NULL), native_widget(NULL),
desktop_root_window_host(NULL), desktop_window_tree_host(NULL),
top_level(false), top_level(false),
Index: widget.h Index: widget.h
=================================================================== ===================================================================
--- widget.h (revision 248478) --- widget.h (revision 251746)
+++ widget.h (working copy) +++ widget.h (working copy)
@@ -197,6 +197,7 @@ @@ -197,6 +197,7 @@
// Should the widget be double buffered? Default is false. // Should the widget be double buffered? Default is false.

18
patch/patches/web_contents_304341.patch
View File

@ -1,8 +1,8 @@
Index: browser/browser_plugin/browser_plugin_guest.cc Index: browser/browser_plugin/browser_plugin_guest.cc
=================================================================== ===================================================================
--- browser/browser_plugin/browser_plugin_guest.cc (revision 248478) --- browser/browser_plugin/browser_plugin_guest.cc (revision 251746)
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy) +++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
@@ -785,7 +785,8 @@ @@ -789,7 +789,8 @@
return this; return this;
} }
@ -14,9 +14,9 @@ Index: browser/browser_plugin/browser_plugin_guest.cc
// http://crbug.com/140315). // http://crbug.com/140315).
Index: browser/browser_plugin/browser_plugin_guest.h Index: browser/browser_plugin/browser_plugin_guest.h
=================================================================== ===================================================================
--- browser/browser_plugin/browser_plugin_guest.h (revision 248478) --- browser/browser_plugin/browser_plugin_guest.h (revision 251746)
+++ browser/browser_plugin/browser_plugin_guest.h (working copy) +++ browser/browser_plugin/browser_plugin_guest.h (working copy)
@@ -200,7 +200,8 @@ @@ -204,7 +204,8 @@
double progress) OVERRIDE; double progress) OVERRIDE;
virtual void CloseContents(WebContents* source) OVERRIDE; virtual void CloseContents(WebContents* source) OVERRIDE;
virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE; virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
@ -28,9 +28,9 @@ Index: browser/browser_plugin/browser_plugin_guest.h
const NativeWebKeyboardEvent& event) OVERRIDE; const NativeWebKeyboardEvent& event) OVERRIDE;
Index: browser/web_contents/web_contents_impl.cc Index: browser/web_contents/web_contents_impl.cc
=================================================================== ===================================================================
--- browser/web_contents/web_contents_impl.cc (revision 248478) --- browser/web_contents/web_contents_impl.cc (revision 251746)
+++ browser/web_contents/web_contents_impl.cc (working copy) +++ browser/web_contents/web_contents_impl.cc (working copy)
@@ -2687,7 +2687,7 @@ @@ -2727,7 +2727,7 @@
void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host, void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) { const ContextMenuParams& params) {
// Allow WebContentsDelegates to handle the context menu operation first. // Allow WebContentsDelegates to handle the context menu operation first.
@ -41,7 +41,7 @@ Index: browser/web_contents/web_contents_impl.cc
render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params); render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params);
Index: browser/web_contents/web_contents_view_mac.mm Index: browser/web_contents/web_contents_view_mac.mm
=================================================================== ===================================================================
--- browser/web_contents/web_contents_view_mac.mm (revision 248478) --- browser/web_contents/web_contents_view_mac.mm (revision 251746)
+++ browser/web_contents/web_contents_view_mac.mm (working copy) +++ browser/web_contents/web_contents_view_mac.mm (working copy)
@@ -233,12 +233,6 @@ @@ -233,12 +233,6 @@
void WebContentsViewMac::ShowContextMenu( void WebContentsViewMac::ShowContextMenu(
@ -58,7 +58,7 @@ Index: browser/web_contents/web_contents_view_mac.mm
else else
Index: public/browser/web_contents_delegate.cc Index: public/browser/web_contents_delegate.cc
=================================================================== ===================================================================
--- public/browser/web_contents_delegate.cc (revision 248478) --- public/browser/web_contents_delegate.cc (revision 251746)
+++ public/browser/web_contents_delegate.cc (working copy) +++ public/browser/web_contents_delegate.cc (working copy)
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
} }
@ -70,7 +70,7 @@ Index: public/browser/web_contents_delegate.cc
} }
Index: public/browser/web_contents_delegate.h Index: public/browser/web_contents_delegate.h
=================================================================== ===================================================================
--- public/browser/web_contents_delegate.h (revision 248478) --- public/browser/web_contents_delegate.h (revision 251746)
+++ public/browser/web_contents_delegate.h (working copy) +++ public/browser/web_contents_delegate.h (working copy)
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
class DownloadItem; class DownloadItem;

20
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
Index: public/web/WebView.h Index: public/web/WebView.h
=================================================================== ===================================================================
--- public/web/WebView.h (revision 166298) --- public/web/WebView.h (revision 167304)
+++ public/web/WebView.h (working copy) +++ public/web/WebView.h (working copy)
@@ -417,6 +417,7 @@ @@ -424,6 +424,7 @@
// Sets whether select popup menus should be rendered by the browser. // Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool); BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@ -12,9 +12,9 @@ Index: public/web/WebView.h
virtual void hidePopups() = 0; virtual void hidePopups() = 0;
Index: Source/web/ChromeClientImpl.cpp Index: Source/web/ChromeClientImpl.cpp
=================================================================== ===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 166298) --- Source/web/ChromeClientImpl.cpp (revision 167304)
+++ Source/web/ChromeClientImpl.cpp (working copy) +++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -828,7 +828,7 @@ @@ -751,7 +751,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{ {
@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client)); return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/web/WebViewImpl.cpp Index: Source/web/WebViewImpl.cpp
=================================================================== ===================================================================
--- Source/web/WebViewImpl.cpp (revision 166298) --- Source/web/WebViewImpl.cpp (revision 167304)
+++ Source/web/WebViewImpl.cpp (working copy) +++ Source/web/WebViewImpl.cpp (working copy)
@@ -340,6 +340,7 @@ @@ -343,6 +343,7 @@
, m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false) , m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false) , m_contextMenuAllowed(false)
@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0) , m_compositorDeviceScaleFactorOverride(0)
@@ -3517,9 +3518,14 @@ @@ -3521,9 +3522,14 @@
updateLayerTreeViewport(); updateLayerTreeViewport();
} }
@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::startDragging(Frame* frame, void WebViewImpl::startDragging(Frame* frame,
Index: Source/web/WebViewImpl.h Index: Source/web/WebViewImpl.h
=================================================================== ===================================================================
--- Source/web/WebViewImpl.h (revision 166298) --- Source/web/WebViewImpl.h (revision 167304)
+++ Source/web/WebViewImpl.h (working copy) +++ Source/web/WebViewImpl.h (working copy)
@@ -397,7 +397,8 @@ @@ -401,7 +401,8 @@
// Returns true if popup menus should be rendered by the browser, false if // Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default). // they should be rendered by WebKit (which is the default).
@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
bool contextMenuAllowed() const bool contextMenuAllowed() const
{ {
@@ -683,6 +684,8 @@ @@ -685,6 +686,8 @@
bool m_contextMenuAllowed; bool m_contextMenuAllowed;