Skip to content

Commit 7b76fb3

Browse files
rogerwangrogerwang
committed
rebase to Chromium 75
1 parent c10b24b commit 7b76fb3

File tree

8 files changed

+20
-24
lines changed

8 files changed

+20
-24
lines changed

‎patch/patch.cfg

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@ patches = [
1010
{
1111
'name': 'icu',
1212
'path': 'third_party/icu/',
13-
},
14-
{
15-
'name': 'buildtools',
16-
'path': 'buildtools',
17-
},
13+
}
1814
]

‎src/api/menu/menu_views.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void Menu::Popup(int x, int y, content::RenderFrameHost* rfh) {
139139
menu_runner_->RunMenuAt(top_level_widget,
140140
nullptr,
141141
gfx::Rect(screen_point, gfx::Size()),
142-
views::MENU_ANCHOR_TOPRIGHT,
142+
views::MenuAnchorPosition::kTopRight,
143143
ui::MENU_SOURCE_NONE);
144144
// It is possible for the same MenuMessageLoopAura to start a nested
145145
// message-loop while it is already running a nested loop. So make

‎src/api/nw_app_api.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,10 @@ bool NwAppClearAppCacheFunction::RunNWSync(base::ListValue* response, std::strin
141141

142142
GURL manifest_url(manifest);
143143
scoped_refptr<CannedBrowsingDataAppCacheHelper> helper(
144-
new CannedBrowsingDataAppCacheHelper(Profile::FromBrowserContext(context_)));
144+
new CannedBrowsingDataAppCacheHelper(content::BrowserContext::GetDefaultStoragePartition(context_)
145+
->GetAppCacheService()));
145146

146-
helper->DeleteAppCacheGroup(manifest_url);
147+
helper->DeleteAppCaches(url::Origin::Create(manifest_url));
147148
return true;
148149
}
149150

‎src/browser/browser_view_layout.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ BrowserViewLayout::BrowserViewLayout()
1919
BrowserViewLayout::~BrowserViewLayout() {}
2020

2121
void BrowserViewLayout::Layout(View* host) {
22-
if (!host->has_children())
22+
if (host->children().empty())
2323
return;
2424

2525
int y = 0;
@@ -40,7 +40,7 @@ void BrowserViewLayout::Layout(View* host) {
4040
}
4141

4242
gfx::Size BrowserViewLayout::GetPreferredSize(const View* host) const {
43-
if (!host->has_children())
43+
if (host->children().empty())
4444
return gfx::Size();
4545

4646
gfx::Rect rect(web_view_->GetPreferredSize());
@@ -55,7 +55,7 @@ gfx::Size BrowserViewLayout::GetPreferredSize(const View* host) const {
5555
}
5656

5757
int BrowserViewLayout::GetPreferredHeightForWidth(const View* host, int width) const {
58-
if (!host->has_children())
58+
if (host->children().empty())
5959
return 0;
6060

6161
const gfx::Insets insets = host->GetInsets();

‎src/browser/menubar_controller.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ views::MenuItemView* MenuBarController::GetSiblingMenu(
5151
return NULL;
5252

5353
*has_mnemonics = false;
54-
*anchor = views::MENU_ANCHOR_TOPLEFT;
54+
*anchor = views::MenuAnchorPosition::kTopLeft;
5555
master_->active_menu_model_ = model;
5656
if (!model_to_menu_map_[model]) {
5757
MenuBarController* controller = new MenuBarController(menubar_, model, master_);
@@ -106,12 +106,12 @@ void MenuBarController::RunMenuAt(views::View* view, const gfx::Point& point) {
106106
menu_runner_->RunMenuAt(view->GetWidget()->GetTopLevelWidget(),
107107
menu_button,
108108
bounds,
109-
views::MENU_ANCHOR_TOPLEFT,
109+
views::MenuAnchorPosition::kTopLeft,
110110
ui::MENU_SOURCE_NONE);
111111
{
112112
base::AutoReset<base::Closure> reset_quit_closure(&message_loop_quit_,
113113
base::Closure());
114-
114+
115115
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
116116
base::RunLoop run_loop;
117117
message_loop_quit_ = run_loop.QuitClosure();

‎src/browser/menubar_view.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ class MenuBarButton : public views::MenuButton {
4040
SetElideBehavior(kElideBehavior);
4141
}
4242

43-
bool GetTooltipText(const gfx::Point& p,
44-
base::string16* tooltip) const override {
43+
base::string16 GetTooltipText(const gfx::Point& p) const override {
4544
if (label()->GetPreferredSize().width() > label()->size().width())
46-
*tooltip = GetText();
47-
return !tooltip->empty();
45+
return GetText();
46+
return base::string16();
4847
}
4948

5049
void OnNativeThemeChanged(const ui::NativeTheme* theme) override {

‎src/nw_custom_bindings.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ using namespace blink;
8585
#include "third_party/blink/renderer/platform/heap/handle.h"
8686
#include "third_party/blink/renderer/core/script/modulator.h"
8787
#include "third_party/blink/renderer/core/script/module_script.h"
88-
#include "third_party/blink/renderer/core/script/script_module_resolver.h"
88+
#include "third_party/blink/renderer/core/script/module_record_resolver.h"
8989

9090
//#include "third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h"
9191
//#include "third_party/WebKit/Source/core/inspector/InspectorResourceAgent.h"
@@ -309,7 +309,7 @@ void NWCustomBindings::EvalNWBin(
309309
url = url.Resolve(*file);
310310
// LOG(WARNING) << "registering module as: " << url;
311311
KURL kurl(WTF::String(url.spec().c_str()));
312-
blink::ScriptModule script_module(isolate, module, kurl);
312+
blink::ModuleRecord script_module(isolate, module, kurl);
313313
blink::ModuleScript* module_script =
314314
blink::ModuleScript::CreateForTest(modulator, script_module, kurl);
315315
modulator->AddToMap(kurl, module_script);

‎src/nw_version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#define NW_VERSION_H
2323

2424
#define NW_MAJOR_VERSION 0
25-
#define NW_MINOR_VERSION 38
26-
#define NW_PATCH_VERSION 5
25+
#define NW_MINOR_VERSION 39
26+
#define NW_PATCH_VERSION 0
2727

28-
#define NW_VERSION_IS_RELEASE 1
28+
#define NW_VERSION_IS_RELEASE 0
2929

3030
#ifndef NW_STRINGIFY
3131
#define NW_STRINGIFY(n) NW_STRINGIFY_HELPER(n)
@@ -39,7 +39,7 @@
3939
#else
4040
# define NW_VERSION_STRING NW_STRINGIFY(NW_MAJOR_VERSION) "." \
4141
NW_STRINGIFY(NW_MINOR_VERSION) "." \
42-
NW_STRINGIFY(NW_PATCH_VERSION) "-beta1"
42+
NW_STRINGIFY(NW_PATCH_VERSION) "-alpha1"
4343
#endif
4444

4545
#define NW_VERSION "v" NW_VERSION_STRING

0 commit comments

Comments
 (0)