From f560fd56aaa87ba4e69673c37c2393c88b1e869f Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 14:34:57 +0900 Subject: [PATCH 01/21] Update libchromiumcontent to Chrome 56 --- brightray/vendor/libchromiumcontent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 25ec31e58d2..63227c0c929 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 25ec31e58d23002a02dc85dd4b8200b72d50a6c7 +Subproject commit 63227c0c9299e01809bcc705bd7346aecf8b6855 From eb89edbf5b35524e5858e4840119fba99be31f19 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 14:48:23 +0900 Subject: [PATCH 02/21] devtools_discovery and devtools_http_handler are gone --- .../browser/devtools_manager_delegate.cc | 27 +++++++------------ brightray/browser/devtools_manager_delegate.h | 20 ++++++-------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index eedc5616788..a93d13d46da 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -15,11 +15,9 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "common/content_client.h" -#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/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" +#include "content/public/browser/devtools_socket_factory.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_entry.h" #include "content/public/common/content_switches.h" @@ -36,15 +34,14 @@ namespace brightray { namespace { -class TCPServerSocketFactory - : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory { +class TCPServerSocketFactory : public content::DevToolsSocketFactory { public: TCPServerSocketFactory(const std::string& address, int port) : address_(address), port_(port) { } private: - // content::DevToolsHttpHandler::ServerSocketFactory. + // content::ServerSocketFactory. std::unique_ptr CreateForHttpServer() override { std::unique_ptr socket( new net::TCPServerSocket(nullptr, net::NetLog::Source())); @@ -147,27 +144,23 @@ DevToolsManagerDelegate::CreateHttpHandler() { DevToolsManagerDelegate::DevToolsManagerDelegate() : handler_(new DevToolsNetworkProtocolHandler) { - // NB(zcbenz): This call does nothing, the only purpose is to make sure the - // devtools_discovery module is linked into the final executable on Linux. - // Though it is possible to achieve this by modifying the gyp settings, it - // would greatly increase gyp file's complexity, so I chose to instead do - // this hack. - devtools_discovery::DevToolsDiscoveryManager::GetInstance(); } DevToolsManagerDelegate::~DevToolsManagerDelegate() { } -void DevToolsManagerDelegate::DevToolsAgentStateChanged( - content::DevToolsAgentHost* agent_host, - bool attached) { - handler_->DevToolsAgentStateChanged(agent_host, attached); +void DevToolsManagerDelegate::Inspect(content::DevToolsAgentHost* agent_host) { } base::DictionaryValue* DevToolsManagerDelegate::HandleCommand( - content::DevToolsAgentHost* agent_host, + DevToolsAgentHost* agent_host, base::DictionaryValue* command) { return handler_->HandleCommand(agent_host, command); } +scoped_refptr +DevToolsManagerDelegate::::CreateNewTarget(const GURL& url) { + return nullptr; +} + } // namespace brightray diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 23d28c74dbb..f808cdfd7be 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -7,31 +7,27 @@ #include "base/macros.h" #include "base/compiler_specific.h" -#include "components/devtools_http_handler/devtools_http_handler_delegate.h" +#include "content/browser/devtools/devtools_http_handler.h" #include "content/public/browser/devtools_manager_delegate.h" -namespace devtools_http_handler { -class DevToolsHttpHandler; -} - namespace brightray { class DevToolsNetworkProtocolHandler; class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { public: - static devtools_http_handler::DevToolsHttpHandler* CreateHttpHandler(); + static content::DevToolsHttpHandler* CreateHttpHandler(); DevToolsManagerDelegate(); virtual ~DevToolsManagerDelegate(); // DevToolsManagerDelegate implementation. - void Inspect(content::BrowserContext* browser_context, - content::DevToolsAgentHost* agent_host) override {} - void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host, - bool attached) override; - base::DictionaryValue* HandleCommand(content::DevToolsAgentHost* agent_host, - base::DictionaryValue* command) override; + void Inspect(content::DevToolsAgentHost* agent_host) override; + base::DictionaryValue* HandleCommand( + content::DevToolsAgentHost* agent_host, + base::DictionaryValue* command) override; + scoped_refptr CreateNewTarget( + const GURL& url) override; private: std::unique_ptr handler_; From 804d56e1392dcb9cbd2d2351e50833f6098b6ab4 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 14:55:06 +0900 Subject: [PATCH 03/21] Signature of StartDataRequest has changed --- brightray/browser/devtools_ui.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/brightray/browser/devtools_ui.cc b/brightray/browser/devtools_ui.cc index 24d7d4737ca..9764886d571 100644 --- a/brightray/browser/devtools_ui.cc +++ b/brightray/browser/devtools_ui.cc @@ -14,7 +14,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" - namespace brightray { namespace { @@ -62,19 +61,21 @@ class BundledDataSource : public content::URLDataSource { return kChromeUIDevToolsHost; } - void StartDataRequest(const std::string& path, - int render_process_id, - int render_frame_id, - const GotDataCallback& callback) override { + void StartDataRequest( + const std::string& path, + const content::ResourceRequestInfo::WebContentsGetter& wc_getter, + const GotDataCallback& callback) override { // Serve request from local bundle. std::string bundled_path_prefix(kChromeUIDevToolsBundledPath); bundled_path_prefix += "/"; if (base::StartsWith(path, bundled_path_prefix, base::CompareCase::INSENSITIVE_ASCII)) { StartBundledDataRequest(path.substr(bundled_path_prefix.length()), - render_process_id, render_frame_id, callback); + callback); return; } + + // We do not handle remote and custom requests. callback.Run(nullptr); } @@ -94,11 +95,8 @@ class BundledDataSource : public content::URLDataSource { return true; } - void StartBundledDataRequest( - const std::string& path, - int render_process_id, - int render_frame_id, - const content::URLDataSource::GotDataCallback& callback) { + void StartBundledDataRequest(const std::string& path, + const GotDataCallback& callback) { std::string filename = PathWithoutParams(path); base::StringPiece resource = content::DevToolsFrontendHost::GetFrontendResource(filename); From e7ee9f1be98701db43419bf5ccd62c8bcddd0e05 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:07:18 +0900 Subject: [PATCH 04/21] DevToolsDelegate is no longer needed --- brightray/browser/browser_main_parts.cc | 3 +- brightray/browser/browser_main_parts.h | 6 -- .../browser/devtools_manager_delegate.cc | 79 ++++++------------- brightray/browser/devtools_manager_delegate.h | 4 +- 4 files changed, 26 insertions(+), 66 deletions(-) diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 0aae4bcc5bc..52f40a53501 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -13,7 +13,6 @@ #include "base/feature_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "components/devtools_http_handler/devtools_http_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "media/base/media_resources.h" @@ -216,7 +215,7 @@ void BrowserMainParts::PreMainMessageLoopRun() { // --remote-debugging-port auto command_line = base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kRemoteDebuggingPort)) - devtools_http_handler_.reset(DevToolsManagerDelegate::CreateHttpHandler()); + DevToolsManagerDelegate::StartHttpHandler(); } void BrowserMainParts::PostMainMessageLoopStart() { diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index a0d58e7609e..209e95d87b4 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -9,10 +9,6 @@ #include "base/memory/ref_counted.h" #include "content/public/browser/browser_main_parts.h" -namespace devtools_http_handler { -class DevToolsHttpHandler; -} - #if defined(TOOLKIT_VIEWS) namespace brightray { class ViewsDelegate; @@ -48,8 +44,6 @@ class BrowserMainParts : public content::BrowserMainParts { void InitializeMainNib(); #endif - std::unique_ptr devtools_http_handler_; - #if defined(TOOLKIT_VIEWS) std::unique_ptr views_delegate_; #endif diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index a93d13d46da..7d4ae4d7d45 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -44,12 +44,16 @@ class TCPServerSocketFactory : public content::DevToolsSocketFactory { // content::ServerSocketFactory. std::unique_ptr CreateForHttpServer() override { std::unique_ptr socket( - new net::TCPServerSocket(nullptr, net::NetLog::Source())); + new net::TCPServerSocket(nullptr, net::NetLogSource())); if (socket->ListenWithAddressAndPort(address_, port_, 10) != net::OK) return std::unique_ptr(); return socket; } + std::unique_ptr CreateForTethering( + std::string* name) override { + return std::unique_ptr(); + } std::string address_; uint16_t port_; @@ -57,7 +61,7 @@ class TCPServerSocketFactory : public content::DevToolsSocketFactory { DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory); }; -std::unique_ptr +std::unique_ptr CreateSocketFactory() { auto& command_line = *base::CommandLine::ForCurrentProcess(); // See if the user specified a port on the command line (useful for @@ -74,55 +78,8 @@ CreateSocketFactory() { DLOG(WARNING) << "Invalid http debugger port number " << temp_port; } } - return std::unique_ptr< - devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory>( - new TCPServerSocketFactory("127.0.0.1", port)); -} - - -// DevToolsDelegate -------------------------------------------------------- - -class DevToolsDelegate : - public devtools_http_handler::DevToolsHttpHandlerDelegate { - public: - DevToolsDelegate(); - ~DevToolsDelegate() override; - - // devtools_http_handler::DevToolsHttpHandlerDelegate. - std::string GetDiscoveryPageHTML() override; - std::string GetFrontendResource(const std::string& path) override; - std::string GetPageThumbnailData(const GURL& url) override; - content::DevToolsExternalAgentProxyDelegate* HandleWebSocketConnection( - const std::string& path) override; - - private: - DISALLOW_COPY_AND_ASSIGN(DevToolsDelegate); -}; - -DevToolsDelegate::DevToolsDelegate() { -} - -DevToolsDelegate::~DevToolsDelegate() { -} - -std::string DevToolsDelegate::GetDiscoveryPageHTML() { - return ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); -} - - -std::string DevToolsDelegate::GetFrontendResource( - const std::string& path) { - return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); -} - -std::string DevToolsDelegate::GetPageThumbnailData(const GURL& url) { - return std::string(); -} - -content::DevToolsExternalAgentProxyDelegate* -DevToolsDelegate::HandleWebSocketConnection(const std::string& path) { - return nullptr; + return std::unique_ptr( + new TCPServerSocketFactory("127.0.0.1", port)); } } // namespace @@ -130,12 +87,10 @@ DevToolsDelegate::HandleWebSocketConnection(const std::string& path) { // DevToolsManagerDelegate --------------------------------------------------- // static -devtools_http_handler::DevToolsHttpHandler* -DevToolsManagerDelegate::CreateHttpHandler() { - return new devtools_http_handler::DevToolsHttpHandler( +void DevToolsManagerDelegate::StartHttpHandler() { + content::DevToolsAgentHost::StartRemoteDebuggingServer( CreateSocketFactory(), std::string(), - new DevToolsDelegate, base::FilePath(), base::FilePath(), std::string(), @@ -153,14 +108,24 @@ void DevToolsManagerDelegate::Inspect(content::DevToolsAgentHost* agent_host) { } base::DictionaryValue* DevToolsManagerDelegate::HandleCommand( - DevToolsAgentHost* agent_host, + content::DevToolsAgentHost* agent_host, base::DictionaryValue* command) { return handler_->HandleCommand(agent_host, command); } scoped_refptr -DevToolsManagerDelegate::::CreateNewTarget(const GURL& url) { +DevToolsManagerDelegate::CreateNewTarget(const GURL& url) { return nullptr; } +std::string DevToolsManagerDelegate::GetDiscoveryPageHTML() { + return ResourceBundle::GetSharedInstance().GetRawDataResource( + IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); +} + +std::string DevToolsManagerDelegate::GetFrontendResource( + const std::string& path) { + return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); +} + } // namespace brightray diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index f808cdfd7be..2e2e09f43f5 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -16,7 +16,7 @@ class DevToolsNetworkProtocolHandler; class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { public: - static content::DevToolsHttpHandler* CreateHttpHandler(); + static void StartHttpHandler(); DevToolsManagerDelegate(); virtual ~DevToolsManagerDelegate(); @@ -28,6 +28,8 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { base::DictionaryValue* command) override; scoped_refptr CreateNewTarget( const GURL& url) override; + std::string GetDiscoveryPageHTML() override; + std::string GetFrontendResource(const std::string& path) override; private: std::unique_ptr handler_; From 0236f8750730cdb0ce9c3ab29079af9c903bd1e3 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:10:34 +0900 Subject: [PATCH 05/21] Update DevToolsNetworkTransaction --- .../browser/net/devtools_network_transaction.cc | 13 +++++-------- .../browser/net/devtools_network_transaction.h | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/brightray/browser/net/devtools_network_transaction.cc b/brightray/browser/net/devtools_network_transaction.cc index 0a62346392a..dc9fdebd355 100644 --- a/brightray/browser/net/devtools_network_transaction.cc +++ b/brightray/browser/net/devtools_network_transaction.cc @@ -106,7 +106,7 @@ bool DevToolsNetworkTransaction::CheckFailed() { int DevToolsNetworkTransaction::Start( const net::HttpRequestInfo* request, const net::CompletionCallback& callback, - const net::BoundNetLog& net_log) { + const net::BoundNe& net_log) { DCHECK(request); request_ = request; @@ -129,7 +129,8 @@ int DevToolsNetworkTransaction::Start( request_ = custom_request_.get(); } - DevToolsNetworkInterceptor* interceptor = controller_->GetInterceptor(client_id); + DevToolsNetworkInterceptor* interceptor = + controller_->GetInterceptor(client_id); if (interceptor) { interceptor_ = interceptor->GetWeakPtr(); if (custom_upload_data_stream_) @@ -140,9 +141,9 @@ int DevToolsNetworkTransaction::Start( return net::ERR_INTERNET_DISCONNECTED; if (!interceptor_) - return transaction_->Start(request_, callback, net_log); + return network_transaction_->Start(request_, callback, net_log); - int result = transaction_->Start(request_, + int result = network_transaction_->Start(request_, base::Bind(&DevToolsNetworkTransaction::IOCallback, base::Unretained(this), callback, true), net_log); @@ -246,10 +247,6 @@ net::LoadState DevToolsNetworkTransaction::GetLoadState() const { return transaction_->GetLoadState(); } -net::UploadProgress DevToolsNetworkTransaction::GetUploadProgress() const { - return transaction_->GetUploadProgress(); -} - void DevToolsNetworkTransaction::SetQuicServerInfo( net::QuicServerInfo* info) { transaction_->SetQuicServerInfo(info); diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h index 3648ca71c74..7f01d73cad1 100644 --- a/brightray/browser/net/devtools_network_transaction.h +++ b/brightray/browser/net/devtools_network_transaction.h @@ -32,7 +32,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction { // HttpTransaction methods: int Start(const net::HttpRequestInfo* request, const net::CompletionCallback& callback, - const net::BoundNetLog& net_log) override; + const net::NetLogWithSource& net_log) override; int RestartIgnoringLastError( const net::CompletionCallback& callback) override; int RestartWithCertificate(net::X509Certificate* client_cert, @@ -52,7 +52,6 @@ class DevToolsNetworkTransaction : public net::HttpTransaction { void DoneReading() override; const net::HttpResponseInfo* GetResponseInfo() const override; net::LoadState GetLoadState() const override; - net::UploadProgress GetUploadProgress() const override; void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override; bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override; bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override; From 43813ff6804126cfa69b2df04b578581a87c5074 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:13:28 +0900 Subject: [PATCH 06/21] Add a new include dir from boringssl --- brightray/brightray.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 593aeadf643..e1057770678 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -14,6 +14,7 @@ '.', '<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)/skia/config', + '<(libchromiumcontent_src_dir)/third_party/boringssl/src/include', '<(libchromiumcontent_src_dir)/third_party/skia/include/core', '<(libchromiumcontent_src_dir)/third_party/mojo/src', '<(libchromiumcontent_src_dir)/third_party/WebKit', From 70ffec11343e418aa571a29cc43fc2201afd1b7c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:14:38 +0900 Subject: [PATCH 07/21] There is no content::MEDIA_ENUMERATE_DEVICES anymore --- brightray/browser/media/media_stream_devices_controller.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/brightray/browser/media/media_stream_devices_controller.cc b/brightray/browser/media/media_stream_devices_controller.cc index b3548bbe409..a744a08ae4d 100644 --- a/brightray/browser/media/media_stream_devices_controller.cc +++ b/brightray/browser/media/media_stream_devices_controller.cc @@ -137,10 +137,6 @@ void MediaStreamDevicesController::Accept() { webcam_requested_, &devices); break; - case content::MEDIA_ENUMERATE_DEVICES: - // Do nothing. - NOTREACHED(); - break; } } From db7959619eadcc574d23fd7cf8b5c063480129dc Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:18:52 +0900 Subject: [PATCH 08/21] Update DevToolsNetworkUploadDataStream --- brightray/browser/net/devtools_network_transaction.cc | 11 +++++------ .../net/devtools_network_upload_data_stream.cc | 6 ++++-- .../browser/net/devtools_network_upload_data_stream.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/brightray/browser/net/devtools_network_transaction.cc b/brightray/browser/net/devtools_network_transaction.cc index dc9fdebd355..ced70acc5e4 100644 --- a/brightray/browser/net/devtools_network_transaction.cc +++ b/brightray/browser/net/devtools_network_transaction.cc @@ -103,10 +103,9 @@ bool DevToolsNetworkTransaction::CheckFailed() { return false; } -int DevToolsNetworkTransaction::Start( - const net::HttpRequestInfo* request, - const net::CompletionCallback& callback, - const net::BoundNe& net_log) { +int DevToolsNetworkTransaction::Start(const net::HttpRequestInfo* request, + const net::CompletionCallback& callback, + const net::NetLogWithSource& net_log) { DCHECK(request); request_ = request; @@ -141,9 +140,9 @@ int DevToolsNetworkTransaction::Start( return net::ERR_INTERNET_DISCONNECTED; if (!interceptor_) - return network_transaction_->Start(request_, callback, net_log); + return transaction_->Start(request_, callback, net_log); - int result = network_transaction_->Start(request_, + int result = transaction_->Start(request_, base::Bind(&DevToolsNetworkTransaction::IOCallback, base::Unretained(this), callback, true), net_log); diff --git a/brightray/browser/net/devtools_network_upload_data_stream.cc b/brightray/browser/net/devtools_network_upload_data_stream.cc index 975afa4d3c9..c6369dcb458 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.cc +++ b/brightray/browser/net/devtools_network_upload_data_stream.cc @@ -35,11 +35,13 @@ bool DevToolsNetworkUploadDataStream::IsInMemory() const { return false; } -int DevToolsNetworkUploadDataStream::InitInternal(const net::BoundNetLog& net_log) { +int DevToolsNetworkUploadDataStream::InitInternal( + const net::NetLogWithSource& net_log) { throttled_byte_count_ = 0; int result = upload_data_stream_->Init( base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback, - base::Unretained(this)), net_log); + base::Unretained(this)), + net_log); if (result == net::OK && !is_chunked()) SetSize(upload_data_stream_->size()); return result; diff --git a/brightray/browser/net/devtools_network_upload_data_stream.h b/brightray/browser/net/devtools_network_upload_data_stream.h index 8db7dd80c87..c3753e8286f 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.h +++ b/brightray/browser/net/devtools_network_upload_data_stream.h @@ -27,7 +27,7 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream { private: // net::UploadDataStream implementation. bool IsInMemory() const override; - int InitInternal(const net::BoundNetLog& net_log) override; + int InitInternal(const net::NetLogWithSource& net_log) override; int ReadInternal(net::IOBuffer* buf, int buf_len) override; void ResetInternal() override; From 622fd8d1d7e7a6ae13e546e77450bc0e2328ce39 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:27:57 +0900 Subject: [PATCH 09/21] Update InspectableWebContentsImpl --- brightray/browser/inspectable_web_contents_impl.cc | 9 +++++---- brightray/browser/inspectable_web_contents_impl.h | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 1ab496c6ecc..7f18ce65d86 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -144,7 +144,7 @@ class ResponseWriter : public net::URLFetcherResponseWriter { int Write(net::IOBuffer* buffer, int num_bytes, const net::CompletionCallback& callback) override; - int Finish(const net::CompletionCallback& callback) override; + int Finish(int net_error, const net::CompletionCallback& callback) override; private: base::WeakPtr bindings_; @@ -181,7 +181,8 @@ int ResponseWriter::Write(net::IOBuffer* buffer, return num_bytes; } -int ResponseWriter::Finish(const net::CompletionCallback& callback) { +int ResponseWriter::Finish(int net_error, + const net::CompletionCallback& callback) { return net::OK; } @@ -654,7 +655,7 @@ void InspectableWebContentsImpl::WebContentsDestroyed() { view_->GetDelegate()->DevToolsClosed(); } -bool InspectableWebContentsImpl::AddMessageToConsole( +bool InspectableWebContentsImpl::DidAddMessageToConsole( content::WebContents* source, int32_t level, const base::string16& message, @@ -726,7 +727,7 @@ void InspectableWebContentsImpl::OnWebContentsFocused() { void InspectableWebContentsImpl::DidStartNavigationToPendingEntry( const GURL& url, - content::NavigationController::ReloadType reload_type) { + content::ReloadType reload_type) { frontend_host_.reset( content::DevToolsFrontendHost::Create( web_contents()->GetMainFrame(), diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index cab3e2132e3..9b565f0f2dd 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -133,14 +133,14 @@ class InspectableWebContentsImpl : void OnWebContentsFocused() override; void DidStartNavigationToPendingEntry( const GURL& url, - content::NavigationController::ReloadType reload_type) override; + content::ReloadType reload_type) override; // content::WebContentsDelegate: - bool AddMessageToConsole(content::WebContents* source, - int32_t level, - const base::string16& message, - int32_t line_no, - const base::string16& source_id) override; + bool DidAddMessageToConsole(content::WebContents* source, + int32_t level, + const base::string16& message, + int32_t line_no, + const base::string16& source_id) override; bool ShouldCreateWebContents( content::WebContents* web_contents, int32_t route_id, From ac4ef926e1afbdb3c01c406058b22542df842783 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 15:42:37 +0900 Subject: [PATCH 10/21] URLRequestContenxtGetter now accepts task runner --- brightray/browser/browser_context.cc | 4 ++-- brightray/browser/url_request_context_getter.cc | 10 +++++----- brightray/browser/url_request_context_getter.h | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index bbb2a4e7f9b..a28fec5d832 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -140,8 +140,8 @@ net::URLRequestContextGetter* BrowserContext::CreateRequestContext( static_cast(BrowserClient::Get()->GetNetLog()), GetPath(), in_memory_, - BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO), - BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE), + BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), + BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), protocol_handlers, std::move(protocol_interceptors)); resource_context_->set_url_request_context_getter(url_request_getter_.get()); diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 9fc8a721d77..e3e7dca5435 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -118,8 +118,8 @@ URLRequestContextGetter::URLRequestContextGetter( NetLog* net_log, const base::FilePath& base_path, bool in_memory, - base::MessageLoop* io_loop, - base::MessageLoop* file_loop, + scoped_refptr io_task_runner, + scoped_refptr file_task_runner, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector protocol_interceptors) : delegate_(delegate), @@ -127,8 +127,8 @@ URLRequestContextGetter::URLRequestContextGetter( net_log_(net_log), base_path_(base_path), in_memory_(in_memory), - io_loop_(io_loop), - file_loop_(file_loop), + io_task_runner_(io_task_runner), + file_task_runner_(file_task_runner), protocol_interceptors_(std::move(protocol_interceptors)), job_factory_(nullptr) { // Must first be created on the UI thread. @@ -144,7 +144,7 @@ URLRequestContextGetter::URLRequestContextGetter( // must synchronously run on the glib message loop. This will be passed to // the URLRequestContextStorage on the IO thread in GetURLRequestContext(). proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( - io_loop_->task_runner(), file_loop_->task_runner()); + io_task_runner_, file_task_runner_); } URLRequestContextGetter::~URLRequestContextGetter() { diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index c4ff58e2426..e08189d862d 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -67,8 +67,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { NetLog* net_log, const base::FilePath& base_path, bool in_memory, - base::MessageLoop* io_loop, - base::MessageLoop* file_loop, + scoped_refptr io_task_runner, + scoped_refptr file_task_runner, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector protocol_interceptors); virtual ~URLRequestContextGetter(); @@ -90,8 +90,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { NetLog* net_log_; base::FilePath base_path_; bool in_memory_; - base::MessageLoop* io_loop_; - base::MessageLoop* file_loop_; + scoped_refptr io_task_runner_; + scoped_refptr file_task_runner_; std::string user_agent_; From bf4c413947288278514ee337071862b48d388a89 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 17:48:16 +0900 Subject: [PATCH 11/21] Update PlatformNotificationService --- brightray/browser/platform_notification_service.cc | 7 ++++--- brightray/browser/platform_notification_service.h | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/brightray/browser/platform_notification_service.cc b/brightray/browser/platform_notification_service.cc index 378cd1143f3..3fa04e0814c 100644 --- a/brightray/browser/platform_notification_service.cc +++ b/brightray/browser/platform_notification_service.cc @@ -62,6 +62,7 @@ blink::mojom::PermissionStatus PlatformNotificationService::CheckPermissionOnIOT void PlatformNotificationService::DisplayNotification( content::BrowserContext* browser_context, + const std::string& notification_id, const GURL& origin, const content::PlatformNotificationData& notification_data, const content::NotificationResources& notification_resources, @@ -85,8 +86,8 @@ void PlatformNotificationService::DisplayNotification( void PlatformNotificationService::DisplayPersistentNotification( content::BrowserContext* browser_context, - int64_t persistent_notification_id, - const GURL& service_worker_origin, + const std::string& notification_id, + const GURL& service_worker_scope, const GURL& origin, const content::PlatformNotificationData& notification_data, const content::NotificationResources& notification_resources) { @@ -94,7 +95,7 @@ void PlatformNotificationService::DisplayPersistentNotification( void PlatformNotificationService::ClosePersistentNotification( content::BrowserContext* browser_context, - int64_t persistent_notification_id) { + const std::string& notification_id) { } bool PlatformNotificationService::GetDisplayedPersistentNotifications( diff --git a/brightray/browser/platform_notification_service.h b/brightray/browser/platform_notification_service.h index 1e17a6fbae4..b2b6471d0fd 100644 --- a/brightray/browser/platform_notification_service.h +++ b/brightray/browser/platform_notification_service.h @@ -28,7 +28,9 @@ class PlatformNotificationService content::ResourceContext* resource_context, const GURL& origin, int render_process_id) override; - void DisplayNotification(content::BrowserContext* browser_context, + void DisplayNotification( + content::BrowserContext* browser_context, + const std::string& notification_id, const GURL& origin, const content::PlatformNotificationData& notification_data, const content::NotificationResources& notification_resources, @@ -36,14 +38,13 @@ class PlatformNotificationService base::Closure* cancel_callback) override; void DisplayPersistentNotification( content::BrowserContext* browser_context, - int64_t persistent_notification_id, - const GURL& service_worker_origin, + const std::string& notification_id, + const GURL& service_worker_scope, const GURL& origin, const content::PlatformNotificationData& notification_data, const content::NotificationResources& notification_resources) override; - void ClosePersistentNotification( - content::BrowserContext* browser_context, - int64_t persistent_notification_id) override; + void ClosePersistentNotification(content::BrowserContext* browser_context, + const std::string& notification_id) override; bool GetDisplayedPersistentNotifications( content::BrowserContext* browser_context, std::set* displayed_notifications) override; From de7da8e4bee80c58fa7ce1540977ec0747bc3d1b Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 24 Jan 2017 17:32:46 +0900 Subject: [PATCH 12/21] Export boringssl's include dir to dependents --- brightray/brightray.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index e1057770678..25358d2162e 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -27,6 +27,7 @@ '<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)/gpu', '<(libchromiumcontent_src_dir)/skia/config', + '<(libchromiumcontent_src_dir)/third_party/boringssl/src/include', '<(libchromiumcontent_src_dir)/third_party/skia/include/core', '<(libchromiumcontent_src_dir)/third_party/skia/include/config', '<(libchromiumcontent_src_dir)/third_party/icu/source/common', From 7cdcce157adc6ecc2d6ad7c2eae25b74e6696ab8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 24 Jan 2017 17:38:24 +0900 Subject: [PATCH 13/21] devtools_discovery and devtools_http_handler are part of content module now --- brightray/brightray.gyp | 6 ------ brightray/vendor/libchromiumcontent | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 25358d2162e..30568b3a40c 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -89,8 +89,6 @@ 'libraries': [ # Following libraries are always linked statically. '<(libchromiumcontent_dir)/libgtk2ui.a', - '<(libchromiumcontent_dir)/libdevtools_discovery.a', - '<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libhttp_server.a', '<(libchromiumcontent_dir)/libdesktop_capture.a', '<(libchromiumcontent_dir)/libdom_keycode_converter.a', @@ -144,8 +142,6 @@ 'link_settings': { 'libraries': [ # Following libraries are always linked statically. - '<(libchromiumcontent_dir)/libdevtools_discovery.a', - '<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libhttp_server.a', '<(libchromiumcontent_dir)/libdesktop_capture.a', '<(libchromiumcontent_dir)/libdom_keycode_converter.a', @@ -212,8 +208,6 @@ '<(libchromiumcontent_dir)/base_static.lib', '<(libchromiumcontent_dir)/sandbox.lib', '<(libchromiumcontent_dir)/sandbox_helper_win.lib', - '<(libchromiumcontent_dir)/devtools_discovery.lib', - '<(libchromiumcontent_dir)/devtools_http_handler.lib', '<(libchromiumcontent_dir)/http_server.lib', '<(libchromiumcontent_dir)/desktop_capture.lib', '<(libchromiumcontent_dir)/dom_keycode_converter.lib', diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 63227c0c929..446afde7ffb 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 63227c0c9299e01809bcc705bd7346aecf8b6855 +Subproject commit 446afde7ffbd4dd2f73d4d7ae9811f093b1c017c From ce71d16fdda92b4bd74d51976a74d106b4bf1270 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 24 Jan 2017 21:12:26 +0900 Subject: [PATCH 14/21] Link with CoreWLAN.framework --- brightray/brightray.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 30568b3a40c..b010d53ea29 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -191,6 +191,8 @@ '-lsandbox', # bluetooth.gyp: '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', + # components/wifi/BUILD.gn: + '$(SDKROOT)/System/Library/Frameworks/CoreWLAN.framework', ], }, }], From 94fdcb4f489c9b938679d79bf96cc39f0c984957 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 25 Jan 2017 08:43:27 +0900 Subject: [PATCH 15/21] WebInspector has been split up --- brightray/browser/inspectable_web_contents_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 7f18ce65d86..4f4100eb678 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -395,7 +395,7 @@ void InspectableWebContentsImpl::LoadCompleted() { base::RemoveChars(current_dock_state, "\"", &dock_state_); } base::string16 javascript = base::UTF8ToUTF16( - "WebInspector.dockController.setDockSide(\"" + dock_state_ + "\");"); + "Components.dockController.setDockSide(\"" + dock_state_ + "\");"); devtools_web_contents_->GetMainFrame()->ExecuteJavaScript(javascript); } From a749a3dd2af69f9598dc6ca679f3a04cb683477d Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 26 Jan 2017 16:09:45 +0900 Subject: [PATCH 16/21] Fix Debug building on Windows --- brightray/browser/views/views_delegate.cc | 4 ---- brightray/browser/views/views_delegate.h | 1 - brightray/browser/win/notification_presenter_win.cc | 2 +- brightray/vendor/libchromiumcontent | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc index a18d52a6ae2..8dcbe38ae20 100644 --- a/brightray/browser/views/views_delegate.cc +++ b/brightray/browser/views/views_delegate.cc @@ -100,10 +100,6 @@ void ViewsDelegate::OnBeforeWidgetInit( } -base::TimeDelta ViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() { - return base::TimeDelta(); -} - bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) { #if defined(OS_LINUX) // On Ubuntu Unity, the system always provides a title bar for maximized diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h index 157660aa5d0..d63eeb533d6 100644 --- a/brightray/browser/views/views_delegate.h +++ b/brightray/browser/views/views_delegate.h @@ -51,7 +51,6 @@ class ViewsDelegate : public views::ViewsDelegate { void OnBeforeWidgetInit( views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) override; - base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() override; bool WindowManagerProvidesTitleBar(bool maximized) override; private: diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index 107b62ea76b..018fa3212a4 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/brightray/browser/win/notification_presenter_win.cc @@ -56,7 +56,7 @@ bool NotificationPresenterWin::Init() { base::string16 NotificationPresenterWin::SaveIconToFilesystem( const SkBitmap& icon, const GURL& origin) { std::string filename = base::MD5String(origin.spec()) + ".png"; - base::FilePath path = temp_dir_.path().Append(base::UTF8ToUTF16(filename)); + base::FilePath path = temp_dir_.GetPath().Append(base::UTF8ToUTF16(filename)); if (base::PathExists(path)) return path.value(); if (SaveIconToPath(icon, path)) diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 446afde7ffb..b71afafe599 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 446afde7ffbd4dd2f73d4d7ae9811f093b1c017c +Subproject commit b71afafe59998daf0cb275b50140378b8c88b101 From abececd78bc5d4aa4138b27154e9a12ee444234e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 26 Jan 2017 19:54:24 +0900 Subject: [PATCH 17/21] libgtk2ui => libgtkui --- brightray/brightray.gyp | 4 ++-- brightray/browser/browser_main_parts.cc | 5 ++--- brightray/browser/linux/libnotify_notification.cc | 4 ++-- brightray/vendor/libchromiumcontent | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index b010d53ea29..500662762ac 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -69,7 +69,7 @@ }, 'cflags': [ 'UpdateDeviceScaleFactor( - screen->GetPrimaryDisplay().device_scale_factor()); + views::LinuxUI::instance()->UpdateDeviceScaleFactor(); #endif #endif return 0; diff --git a/brightray/browser/linux/libnotify_notification.cc b/brightray/browser/linux/libnotify_notification.cc index 0fd71faaf18..ab296e21831 100644 --- a/brightray/browser/linux/libnotify_notification.cc +++ b/brightray/browser/linux/libnotify_notification.cc @@ -8,7 +8,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "browser/notification_delegate.h" -#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" +#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h" #include "common/application_info.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -111,7 +111,7 @@ void LibnotifyNotification::Show(const base::string16& title, } if (!icon.drawsNothing()) { - GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(icon); + GdkPixbuf* pixbuf = libgtkui::GdkPixbufFromSkBitmap(icon); libnotify_loader_.notify_notification_set_image_from_pixbuf( notification_, pixbuf); libnotify_loader_.notify_notification_set_timeout( diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index b71afafe599..0360b49dc59 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit b71afafe59998daf0cb275b50140378b8c88b101 +Subproject commit 0360b49dc59dcaad80bc056c9c9678273d4200e6 From 766d3c47bb7e74626e0c780e54e1ce05357201fe Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 27 Jan 2017 17:09:22 +0900 Subject: [PATCH 18/21] Link with ncrypt.lib on Windows --- brightray/brightray.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 500662762ac..b627b66fb04 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -294,6 +294,7 @@ # net_common.gypi: 'crypt32.lib', 'dhcpcsvc.lib', + 'ncrypt.lib', 'rpcrt4.lib', 'secur32.lib', 'urlmon.lib', From 8488425e067c7223e3dae43071744119f97f4af7 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 27 Jan 2017 17:11:33 +0900 Subject: [PATCH 19/21] Link with fontsub.lib --- brightray/brightray.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index b627b66fb04..5d6459a6b98 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -301,6 +301,8 @@ 'winhttp.lib', # ui/gfx/BUILD.gn: 'dwrite.lib', + # skia/BUILD.gn: + 'fontsub.lib', ], 'DelayLoadDLLs': [ 'wtsapi32.dll', From 4afc765e280385711444c7c92f703f7ed04a8696 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 30 Jan 2017 15:28:24 +0900 Subject: [PATCH 20/21] Link with xcb on Linux --- brightray/brightray.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 5d6459a6b98..2724510108f 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -1,7 +1,7 @@ { 'variables': { # The libraries brightray will be compiled to. - 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss' + 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss' }, 'includes': [ 'filenames.gypi', From 6e2f9935feb86352bbcceedc8d9832041af6274c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 6 Feb 2017 10:11:37 +0900 Subject: [PATCH 21/21] Update to Chrome 56.0.2924.87 --- brightray/vendor/libchromiumcontent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 0360b49dc59..e0da1e9caa7 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 0360b49dc59dcaad80bc056c9c9678273d4200e6 +Subproject commit e0da1e9caa7c8f3da3519963a9ea32abba43c7c8