diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 7331b66a808..46cc4c26faf 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -19,6 +19,7 @@ #include "native_mate/callback.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "net/base/load_flags.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -46,10 +47,10 @@ class ResolveProxyHelper { // Start the request. int result = proxy_service->ResolveProxy( - url, &proxy_info_, + url, net::LOAD_NORMAL, &proxy_info_, base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted, base::Unretained(this)), - &pac_req_, net::BoundNetLog()); + &pac_req_, nullptr, net::BoundNetLog()); // Completed synchronously. if (result != net::ERR_IO_PENDING) diff --git a/atom/browser/api/atom_api_content_tracing.cc b/atom/browser/api/atom_api_content_tracing.cc index e5894a771ba..81120461124 100644 --- a/atom/browser/api/atom_api_content_tracing.cc +++ b/atom/browser/api/atom_api_content_tracing.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include +#include #include "atom/common/native_mate_converters/file_path_converter.h" #include "base/bind.h" @@ -31,17 +32,30 @@ struct Converter > { }; template<> -struct Converter { +struct Converter { static bool FromV8(v8::Isolate* isolate, v8::Handle val, - TracingController::Options* out) { - if (!val->IsNumber()) + base::debug::CategoryFilter* out) { + std::string filter; + if (!ConvertFromV8(isolate, val, &filter)) return false; - *out = static_cast(val->IntegerValue()); + *out = base::debug::CategoryFilter(filter); return true; } }; +template<> +struct Converter { + static bool FromV8(v8::Isolate* isolate, + v8::Handle val, + base::debug::TraceOptions* out) { + std::string options; + if (!ConvertFromV8(isolate, val, &options)) + return false; + return out->SetFromString(options); + } +}; + } // namespace mate namespace { diff --git a/atom/browser/api/atom_api_menu_views.cc b/atom/browser/api/atom_api_menu_views.cc index 2a2b85b57de..a6292fbc142 100644 --- a/atom/browser/api/atom_api_menu_views.cc +++ b/atom/browser/api/atom_api_menu_views.cc @@ -17,14 +17,13 @@ MenuViews::MenuViews() { void MenuViews::Popup(Window* window) { gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(); - views::MenuRunner menu_runner(model()); + views::MenuRunner menu_runner(model(), views::MenuRunner::CONTEXT_MENU); ignore_result(menu_runner.RunMenuAt( static_cast(window->window())->widget(), NULL, gfx::Rect(cursor, gfx::Size()), views::MENU_ANCHOR_TOPLEFT, - ui::MENU_SOURCE_MOUSE, - views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); + ui::MENU_SOURCE_MOUSE)); } // static diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 33abbcd75e9..a56688c616d 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -35,10 +35,10 @@ void WebContents::RenderProcessGone(base::TerminationStatus status) { Emit("crashed"); } -void WebContents::DidFinishLoad(int64 frame_id, - const GURL& validated_url, - bool is_main_frame, - content::RenderViewHost* render_view_host) { +void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host, + const GURL& validated_url) { + bool is_main_frame = !render_frame_host->GetParent(); + base::ListValue args; args.AppendBoolean(is_main_frame); Emit("did-frame-finish-load", args); diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 4a83153bca2..145cd5aba9a 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -52,11 +52,8 @@ class WebContents : public mate::EventEmitter, // content::WebContentsObserver implementations: virtual void RenderViewDeleted(content::RenderViewHost*) OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; - virtual void DidFinishLoad( - int64 frame_id, - const GURL& validated_url, - bool is_main_frame, - content::RenderViewHost* render_view_host) OVERRIDE; + virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, + const GURL& validated_url) OVERRIDE; virtual void DidStartLoading( content::RenderViewHost* render_view_host) OVERRIDE; virtual void DidStopLoading( diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index ba3e8a69666..22ff32ad219 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -18,8 +18,8 @@ #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "content/public/common/web_preferences.h" #include "ui/base/l10n/l10n_util.h" -#include "webkit/common/webpreferences.h" namespace atom { @@ -76,7 +76,7 @@ content::AccessTokenStore* AtomBrowserClient::CreateAccessTokenStore() { void AtomBrowserClient::OverrideWebkitPrefs( content::RenderViewHost* render_view_host, const GURL& url, - WebPreferences* prefs) { + content::WebPreferences* prefs) { prefs->javascript_enabled = true; prefs->web_security_enabled = true; prefs->javascript_can_open_windows_automatically = true; diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 344606c3ca2..523b95143d0 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -28,7 +28,7 @@ class AtomBrowserClient : public brightray::BrowserClient { virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE; virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, const GURL& url, - WebPreferences* prefs) OVERRIDE; + content::WebPreferences* prefs) OVERRIDE; virtual bool ShouldSwapBrowsingInstancesForNavigation( content::SiteInstance* site_instance, const GURL& current_url, diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 583958cb24d..dfd58904963 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -44,13 +44,13 @@ #include "content/public/common/content_switches.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/user_agent.h" +#include "content/public/common/web_preferences.h" #include "ipc/ipc_message_macros.h" #include "native_mate/dictionary.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "webkit/common/webpreferences.h" using content::NavigationEntry; @@ -248,9 +248,8 @@ bool NativeWindow::IsDevToolsOpened() { void NativeWindow::InspectElement(int x, int y) { OpenDevTools(); - content::RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); scoped_refptr agent( - content::DevToolsAgentHost::GetOrCreateFor(rvh)); + content::DevToolsAgentHost::GetOrCreateFor(GetWebContents())); agent->InspectElement(x, y); } @@ -287,7 +286,7 @@ void NativeWindow::CapturePage(const gfx::Rect& rect, base::Bind(&NativeWindow::OnCapturePageDone, weak_factory_.GetWeakPtr(), callback), - SkBitmap::kARGB_8888_Config); + kAlpha_8_SkColorType); } void NativeWindow::DestroyWebContents() { @@ -368,7 +367,8 @@ void NativeWindow::AppendExtraCommandLineSwitches( } } -void NativeWindow::OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs) { +void NativeWindow::OverrideWebkitPrefs(const GURL& url, + content::WebPreferences* prefs) { if (web_preferences_.IsEmpty()) return; diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 929c1aabc5b..0a2abb7059c 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -23,8 +23,6 @@ #include "native_mate/persistent_dictionary.h" #include "ui/gfx/image/image_skia.h" -struct WebPreferences; - namespace base { class CommandLine; } @@ -32,6 +30,7 @@ class CommandLine; namespace content { class BrowserContext; class WebContents; +struct WebPreferences; } namespace gfx { @@ -178,7 +177,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate, // Called when renderer process is going to be started. void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id); - void OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs); + void OverrideWebkitPrefs(const GURL& url, content::WebPreferences* prefs); // Public API used by platform-dependent delegates and observers to send UI // related notifications. diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc index a66eaf57d71..9c0bab951b9 100644 --- a/atom/browser/net/asar/url_request_asar_job.cc +++ b/atom/browser/net/asar/url_request_asar_job.cc @@ -99,7 +99,7 @@ void URLRequestAsarJob::DidOpen(int result) { return; } - int rv = stream_->Seek(net::FROM_BEGIN, + int rv = stream_->Seek(base::File::FROM_BEGIN, file_info_.offset, base::Bind(&URLRequestAsarJob::DidSeek, weak_ptr_factory_.GetWeakPtr())); diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 16251e822c6..7d075ce0bde 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -91,7 +91,7 @@ bool StringToAccelerator(const std::string& description, LOG(ERROR) << "The accelerator string can only contain ASCII characters"; return false; } - std::string shortcut(StringToLowerASCII(description)); + std::string shortcut(base::StringToLowerASCII(description)); std::vector tokens; base::SplitString(shortcut, '+', &tokens); diff --git a/atom/browser/ui/message_box_views.cc b/atom/browser/ui/message_box_views.cc index a807eaac0cf..acc9533a081 100644 --- a/atom/browser/ui/message_box_views.cc +++ b/atom/browser/ui/message_box_views.cc @@ -145,7 +145,7 @@ MessageDialog::MessageDialog(NativeWindow* parent_window, views::LabelButton* button = new views::LabelButton( this, base::UTF8ToUTF16(buttons[i])); button->set_tag(i); - button->set_min_size(gfx::Size(60, 30)); + button->SetMinSize(gfx::Size(60, 30)); button->SetStyle(views::Button::STYLE_BUTTON); button->SetGroup(kButtonGroup); diff --git a/atom/browser/ui/views/menu_delegate.cc b/atom/browser/ui/views/menu_delegate.cc index 88d1b689b5c..589bc984d15 100644 --- a/atom/browser/ui/views/menu_delegate.cc +++ b/atom/browser/ui/views/menu_delegate.cc @@ -35,14 +35,13 @@ void MenuDelegate::RunMenu(ui::MenuModel* model, views::MenuButton* button) { id_ = button->tag(); views::MenuItemView* item = BuildMenu(model); - views::MenuRunner menu_runner(item); + views::MenuRunner menu_runner(item, views::MenuRunner::CONTEXT_MENU); ignore_result(menu_runner.RunMenuAt( button->GetWidget()->GetTopLevelWidget(), button, bounds, views::MENU_ANCHOR_TOPRIGHT, - ui::MENU_SOURCE_MOUSE, - views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); + ui::MENU_SOURCE_MOUSE)); } views::MenuItemView* MenuDelegate::BuildMenu(ui::MenuModel* model) { diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc index 8a372009879..b2409709e1a 100644 --- a/atom/browser/ui/win/notify_icon.cc +++ b/atom/browser/ui/win/notify_icon.cc @@ -60,14 +60,13 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos, if (!SetForegroundWindow(window_)) return; - views::MenuRunner menu_runner(menu_model_); + views::MenuRunner menu_runner(menu_model_, views::MenuRunner::CONTEXT_MENU); ignore_result(menu_runner.RunMenuAt( NULL, NULL, gfx::Rect(cursor_pos, gfx::Size()), views::MENU_ANCHOR_TOPLEFT, - ui::MENU_SOURCE_MOUSE, - views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); + ui::MENU_SOURCE_MOUSE)); } void NotifyIcon::ResetIcon() { diff --git a/atom/common/api/api_messages.h b/atom/common/api/api_messages.h index 045bceb719a..bd8bfd5a06e 100644 --- a/atom/common/api/api_messages.h +++ b/atom/common/api/api_messages.h @@ -9,6 +9,7 @@ #include "base/values.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" +#include "ui/gfx/ipc/gfx_param_traits.h" // The message starter should be declared in ipc/ipc_message_start.h. Since // we don't want to patch Chromium, we just pretend to be Content Shell. diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h index 4909ed58036..87e231eeb8f 100644 --- a/atom/common/chrome_version.h +++ b/atom/common/chrome_version.h @@ -8,7 +8,7 @@ #ifndef ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_ -#define CHROME_VERSION_STRING "37.0.2062.102" +#define CHROME_VERSION_STRING "38.0.2125.101" #define CHROME_VERSION "v" CHROME_VERSION_STRING #endif // ATOM_COMMON_CHROME_VERSION_H_ diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc index b962f45112f..df9e287cdcb 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc @@ -17,10 +17,10 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/print_messages.h" +#include "content/public/common/web_preferences.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" -#include "content/public/renderer/web_preferences.h" #include "net/base/escape.h" #include "printing/metafile.h" #include "printing/metafile_impl.h" @@ -42,7 +42,8 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebViewClient.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/common/webpreferences.h" + +using content::WebPreferences; namespace printing { @@ -547,7 +548,7 @@ void PrepareFrameAndViewForPrint::CopySelection( blink::WebView* web_view = blink::WebView::create(this); owns_web_view_ = true; - content::ApplyWebPreferences(prefs, web_view); + content::RenderView::ApplyWebPreferences(prefs, web_view); web_view->setMainFrame(blink::WebLocalFrame::create(this)); frame_.Reset(web_view->mainFrame()->toWebLocalFrame()); node_to_print_.reset(); diff --git a/package.json b/package.json index 7f2ad9c04e0..9272dde427c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "devDependencies": { - "atom-package-manager": "0.98.0", + "atom-package-manager": "0.102.0", "coffee-script": "~1.7.1", "coffeelint": "~1.3.0" }, diff --git a/script/lib/config.py b/script/lib/config.py index 8fc00c4056e..7b6bc574fd6 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -4,7 +4,7 @@ import platform import sys BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '3245ef802fbf546f1a1d206990aa9d18be6bfbfe' +LIBCHROMIUMCONTENT_COMMIT = '9f5271d31e0f32eac5a20ef6f543e3f1d43ad645' ARCH = { 'cygwin': '32bit', diff --git a/spec/modules-spec.coffee b/spec/modules-spec.coffee index 39d0181df12..881b24bf553 100644 --- a/spec/modules-spec.coffee +++ b/spec/modules-spec.coffee @@ -22,7 +22,7 @@ describe 'third-party module', -> it 'emits file events correctly', (done) -> pathwatcher = require 'pathwatcher' temp.mkdir 'dir', (err, dir) -> - assert err == null + return done() if err file = path.join dir, 'file' fs.writeFileSync file, 'content' watcher = pathwatcher.watch file, (event) -> diff --git a/vendor/brightray b/vendor/brightray index 2b5794b11e6..319c63da618 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 2b5794b11e68130aee0af7941289eab2b33d73c6 +Subproject commit 319c63da618f5fdff38f6a65c452f3802b8756d1 diff --git a/vendor/node b/vendor/node index a80a10c6a1f..94229c71b08 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit a80a10c6a1f2c668d90eda4e2c9aab38e4dcd4a2 +Subproject commit 94229c71b0879fb40bc157fe2fe346627dbe7496