mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #269 from electron/use_gn-chrome54

Browse source 
Use gn chrome54
This commit is contained in:
Kevin Sawicki 2017-01-19 10:56:00 -08:00 • committed by GitHub
commit 5715dfcf17
14 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
brightray/brightray.gyp
View file

@ -91,14 +91,13 @@
'<(libchromiumcontent_dir)/libdevtools_http_handler.a',
'<(libchromiumcontent_dir)/libhttp_server.a',
'<(libchromiumcontent_dir)/libdesktop_capture.a',
'<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a',
'<(libchromiumcontent_dir)/libdom_keycode_converter.a',
'<(libchromiumcontent_dir)/libsystem_wrappers.a',
'<(libchromiumcontent_dir)/librtc_base.a',
'<(libchromiumcontent_dir)/librtc_base_approved.a',
'<(libchromiumcontent_dir)/libwebrtc_common.a',
'<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/librenderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a',
],
},
@ -147,14 +146,13 @@
'<(libchromiumcontent_dir)/libdevtools_http_handler.a',
'<(libchromiumcontent_dir)/libhttp_server.a',
'<(libchromiumcontent_dir)/libdesktop_capture.a',
'<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a',
'<(libchromiumcontent_dir)/libdom_keycode_converter.a',
'<(libchromiumcontent_dir)/librtc_base.a',
'<(libchromiumcontent_dir)/librtc_base_approved.a',
'<(libchromiumcontent_dir)/libsystem_wrappers.a',
'<(libchromiumcontent_dir)/libwebrtc_common.a',
'<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/librenderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a',
],
},
@ -187,6 +185,8 @@
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
# device/gamepad/BUILD.gn:
'$(SDKROOT)/System/Library/Frameworks/GameController.framework',
# content_browser.gypi:
'-lbsm',
# content_common.gypi:
@ -205,6 +205,7 @@
'libraries': [
# Needed by desktop_capture.lib:
'-ld3d11.lib',
'-ldxgi.lib',
# Following libs are always linked statically.
'<(libchromiumcontent_dir)/base_static.lib',
'<(libchromiumcontent_dir)/sandbox.lib',
@ -213,14 +214,13 @@
'<(libchromiumcontent_dir)/devtools_http_handler.lib',
'<(libchromiumcontent_dir)/http_server.lib',
'<(libchromiumcontent_dir)/desktop_capture.lib',
'<(libchromiumcontent_dir)/desktop_capture_differ_sse2.lib',
'<(libchromiumcontent_dir)/dom_keycode_converter.lib',
'<(libchromiumcontent_dir)/rtc_base.lib',
'<(libchromiumcontent_dir)/rtc_base_approved.lib',
'<(libchromiumcontent_dir)/system_wrappers.lib',
'<(libchromiumcontent_dir)/webrtc_common.lib',
'<(libchromiumcontent_dir)/libyuv.lib',
'<(libchromiumcontent_dir)/cdm_renderer.lib',
'<(libchromiumcontent_dir)/renderer.lib',
'<(libchromiumcontent_dir)/security_state.lib',
# Friends of pdf.lib:
'<(libchromiumcontent_dir)/pdf.lib',
@ -238,9 +238,9 @@
'<(libchromiumcontent_dir)/fxcrt.lib',
'<(libchromiumcontent_dir)/fxedit.lib',
'<(libchromiumcontent_dir)/fxge.lib',
'<(libchromiumcontent_dir)/fxjs.lib',
'<(libchromiumcontent_dir)/javascript.lib',
'<(libchromiumcontent_dir)/pdfwindow.lib',
'<(libchromiumcontent_dir)/bigint.lib',
'<(libchromiumcontent_dir)/fx_agg.lib',
'<(libchromiumcontent_dir)/fx_freetype.lib',
'<(libchromiumcontent_dir)/fx_lcms2.lib',
@ -260,6 +260,7 @@
# content_common.gypi:
'-ld3d9.lib',
'-ld3d11.lib',
'-ldxgi.lib',
'-ldxva2.lib',
'-lstrmiids.lib',
'-lmf.lib',
@ -299,6 +300,8 @@
'secur32.lib',
'urlmon.lib',
'winhttp.lib',
# ui/gfx/BUILD.gn:
'dwrite.lib',
],
'DelayLoadDLLs': [
'wtsapi32.dll',

4
brightray/browser/devtools_file_system_indexer.cc
View file

@ -267,8 +267,8 @@ DevToolsFileSystemIndexer::FileSystemIndexingJob::FileSystemIndexingJob(
total_work_callback_(total_work_callback),
worked_callback_(worked_callback),
done_callback_(done_callback),
current_file_(BrowserThread::GetMessageLoopProxyForThread(
BrowserThread::FILE).get()),
current_file_(
BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE).get()),
files_indexed_(0),
stopped_(false) {
current_trigrams_set_.resize(kTrigramCount);

2
brightray/browser/devtools_manager_delegate.cc
View file

@ -18,7 +18,6 @@
#include "components/devtools_discovery/basic_target_descriptor.h"
#include "components/devtools_discovery/devtools_discovery_manager.h"
#include "components/devtools_http_handler/devtools_http_handler.h"
#include "content/grit/shell_resources.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/favicon_status.h"
@ -26,6 +25,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "content/public/common/user_agent.h"
#include "content/shell/grit/shell_resources.h"
#include "net/base/net_errors.h"
#include "net/socket/tcp_server_socket.h"
#include "net/socket/stream_socket.h"

1
brightray/browser/inspectable_web_contents.h
View file

@ -44,6 +44,7 @@ class InspectableWebContents {
const base::Value* arg1 = nullptr,
const base::Value* arg2 = nullptr,
const base::Value* arg3 = nullptr) = 0;
virtual void InspectElement(int x, int y) = 0;
};
} // namespace brightray

5
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -249,6 +249,11 @@ content::WebContents* InspectableWebContentsImpl::GetDevToolsWebContents() const
return devtools_web_contents_.get();
}
void InspectableWebContentsImpl::InspectElement(int x, int y) {
if (agent_host_.get())
agent_host_->InspectElement(this, x, y);
}
void InspectableWebContentsImpl::SetDelegate(InspectableWebContentsDelegate* delegate) {
delegate_ = delegate;
}

1
brightray/browser/inspectable_web_contents_impl.h
View file

@ -60,6 +60,7 @@ class InspectableWebContentsImpl :
const base::Value* arg1,
const base::Value* arg2,
const base::Value* arg3) override;
void InspectElement(int x, int y) override;
// Return the last position and size of devtools window.
gfx::Rect GetDevToolsBounds() const;

4
brightray/browser/net/devtools_network_upload_data_stream.cc
View file

@ -35,11 +35,11 @@ bool DevToolsNetworkUploadDataStream::IsInMemory() const {
return false;
}
int DevToolsNetworkUploadDataStream::InitInternal() {
int DevToolsNetworkUploadDataStream::InitInternal(const net::BoundNetLog& net_log) {
throttled_byte_count_ = 0;
int result = upload_data_stream_->Init(
base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback,
base::Unretained(this)));
base::Unretained(this)), net_log);
if (result == net::OK && !is_chunked())
SetSize(upload_data_stream_->size());
return result;

2
brightray/browser/net/devtools_network_upload_data_stream.h
View file

@ -27,7 +27,7 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
private:
// net::UploadDataStream implementation.
bool IsInMemory() const override;
int InitInternal() override;
int InitInternal(const net::BoundNetLog& net_log) override;
int ReadInternal(net::IOBuffer* buf, int buf_len) override;
void ResetInternal() override;

2
brightray/browser/permission_manager.cc
View file

@ -22,6 +22,7 @@ int PermissionManager::RequestPermission(
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
if (permission == content::PermissionType::MIDI_SYSEX) {
content::ChildProcessSecurityPolicy::GetInstance()->
@ -35,6 +36,7 @@ int PermissionManager::RequestPermissions(
const std::vector<content::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(
const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
std::vector<blink::mojom::PermissionStatus> permissionStatuses;

2
brightray/browser/permission_manager.h
View file

@ -21,11 +21,13 @@ class PermissionManager : public content::PermissionManager {
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override;
int RequestPermissions(
const std::vector<content::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(
const std::vector<blink::mojom::PermissionStatus>&)>& callback) override;
void CancelPermissionRequest(int request_id) override;

1
brightray/browser/platform_notification_service.cc
View file

@ -86,6 +86,7 @@ void PlatformNotificationService::DisplayNotification(
void PlatformNotificationService::DisplayPersistentNotification(
content::BrowserContext* browser_context,
int64_t persistent_notification_id,
const GURL& service_worker_origin,
const GURL& origin,
const content::PlatformNotificationData& notification_data,
const content::NotificationResources& notification_resources) {

1
brightray/browser/platform_notification_service.h
View file

@ -37,6 +37,7 @@ class PlatformNotificationService
void DisplayPersistentNotification(
content::BrowserContext* browser_context,
int64_t persistent_notification_id,
const GURL& service_worker_origin,
const GURL& origin,
const content::PlatformNotificationData& notification_data,
const content::NotificationResources& notification_resources) override;

8
brightray/browser/url_request_context_getter.cc
View file

@ -96,7 +96,7 @@ URLRequestContextGetter::Delegate::CreateHttpCacheBackendFactory(const base::Fil
net::CACHE_BACKEND_DEFAULT,
cache_path,
0,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE));
}
std::unique_ptr<net::CertVerifier>
@ -291,10 +291,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
network_session_params.ignore_certificate_errors = false;
// --disable-http2
if (command_line.HasSwitch(switches::kDisableHttp2)) {
network_session_params.enable_spdy31 = false;
if (command_line.HasSwitch(switches::kDisableHttp2))
network_session_params.enable_http2 = false;
}
// --ignore-certificate-errors
if (command_line.HasSwitch(switches::kIgnoreCertificateErrors))
@ -357,7 +355,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
}
scoped_refptr<base::SingleThreadTaskRunner> URLRequestContextGetter::GetNetworkTaskRunner() const {
return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
}
} // namespace brightray

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 76bb29da18cbeec0051e0690bc1b95e78034a422
Subproject commit 25ec31e58d23002a02dc85dd4b8200b72d50a6c7