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

chore: bump chromium to bc8f70ed4cfe2262ea833750eaddb (master) (#22649)

Browse source 
* chore: bump chromium in DEPS to 9321f32fb1b3af8fdfce55c7bbfacf3f75118dca

* Update patches

* Update electron_swiftshader_binaries deps

2056931

* Use Promise with RequestPointerLock calls

2069199

* Replace content::CursorInfo with ui::Cursor

1999201

* Convert MaterialDesignController to a true singleton.

2090877

* Drop WebContentsView::RenderViewCreated hook

2093535

* chore: bump chromium in DEPS to 6478123cfa0102ed754c70eb9bbdd391d676a4dd

* Splitting context_menu_params.h into separate browser VS common parts.

2097468

* Fix DCHECK on OnThemeChanged()

2090713

* chore: bump chromium in DEPS to b0269bb003f699bc8ea7dcba8b0795ef963696d7

* Remove no longer needed patch

* Check PointerLock requests for new options and update accordingly

2071788

* Address issues from review

* Fixup compile error

* Add additional library files

* chore: bump chromium in DEPS to a41285fb8aebc8f70ed4cfe2262ea833750eaddb

* Update patches

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-03-14 13:54:14 -07:00 • committed by GitHub
parent a4c4c86b9d
commit d8737734bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 267 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/osr/osr_render_widget_host_view.cc
View file

@ -370,9 +370,14 @@ gfx::Size OffScreenRenderWidgetHostView::GetVisibleViewportSize() {
void OffScreenRenderWidgetHostView::SetInsets(const gfx::Insets& insets) {}
bool OffScreenRenderWidgetHostView::LockMouse(
blink::mojom::PointerLockResult OffScreenRenderWidgetHostView::LockMouse(
bool request_unadjusted_movement) {
return false;
return blink::mojom::PointerLockResult::kUnsupportedOptions;
}
blink::mojom::PointerLockResult OffScreenRenderWidgetHostView::ChangeMouseLock(
bool request_unadjusted_movement) {
return blink::mojom::PointerLockResult::kUnsupportedOptions;
}
void OffScreenRenderWidgetHostView::UnlockMouse() {}

5
shell/browser/osr/osr_render_widget_host_view.h
View file

@ -93,7 +93,10 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
void SetBackgroundColor(SkColor color) override;
base::Optional<SkColor> GetBackgroundColor() override;
void UpdateBackgroundColor() override;
bool LockMouse(bool request_unadjusted_movement) override;
blink::mojom::PointerLockResult LockMouse(
bool request_unadjusted_movement) override;
blink::mojom::PointerLockResult ChangeMouseLock(
bool request_unadjusted_movement) override;
void UnlockMouse(void) override;
void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
#if defined(OS_MACOSX)

9
shell/browser/osr/osr_web_contents_view.cc
View file

@ -33,7 +33,8 @@ void OffScreenWebContentsView::SetWebContents(
content::WebContents* web_contents) {
web_contents_ = web_contents;
RenderViewCreated(web_contents_->GetRenderViewHost());
if (GetView())
GetView()->InstallTransparency();
}
void OffScreenWebContentsView::SetNativeWindow(NativeWindow* window) {
@ -144,12 +145,6 @@ OffScreenWebContentsView::CreateViewForChildWidget(
void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
void OffScreenWebContentsView::RenderViewCreated(
content::RenderViewHost* host) {
if (GetView())
GetView()->InstallTransparency();
}
void OffScreenWebContentsView::RenderViewReady() {}
void OffScreenWebContentsView::RenderViewHostChanged(

1
shell/browser/osr/osr_web_contents_view.h
View file

@ -58,7 +58,6 @@ class OffScreenWebContentsView : public content::WebContentsView,
content::RenderWidgetHostViewBase* CreateViewForChildWidget(
content::RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(content::RenderViewHost* host) override;
void RenderViewReady() override;
void RenderViewHostChanged(content::RenderViewHost* old_host,
content::RenderViewHost* new_host) override;