mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
* chore: bump chromium in DEPS to 123.0.6273.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6274.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6276.0 * chore: update patches * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * chore: bump chromium in DEPS to 123.0.6278.0 * chore: bump chromium in DEPS to 123.0.6280.0 * chore: update patches * chore: use net::CanonicalCookie::SecureAttribute() renamed from IsSecure() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5245913 * refactor: handle multiple requested device ids Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5132210 * refactor: trigger View layouts async with View::InvalidateLayout() Upstream has introduced a PassKey to restrict who can call Layout() directly. I've opted for calling `InvalidateLayout()` which is the approach that upstream recommends. If for some reason this approach doesn't work for us, we could use `DeprecatedLayoutImmediately()` as a stopgap. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5239586 Xref: https://chromium.googlesource.com/chromium/src/+/main/ui/views/view.h#809 Xref: https://chromium.googlesource.com/chromium/src/+/main/docs/ui/learn/bestpractices/layout.md?pli=1#don_t-invoke-layout_directly * chore: bump chromium in DEPS to 123.0.6282.0 * chore: bump chromium in DEPS to 123.0.6284.0 * chore: update patches * refactor: remove use of blink::MainThreadIsolate() pt 1/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 2/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 3/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * chore: update enum name to ui::AXMode::kPDFPrinting Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5270301 * chore: rebuild filenames.libcxx.gni * chore: sync with upstream rename of PortProvider.TaskForHandle() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5259103 * chore: bump chromium in DEPS to 123.0.6286.0 * chore: bump chromium in DEPS to 123.0.6288.0 * WebPreferences: Initialize in declaration. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5277099 * chore: update webview_fullscreen.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5053508 Simple update to fix patch shear * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5254861 Simple update to fix patch shear * chore: add IWC::Delegate::RecordResize() stub to fix FTBFS https://chromium-review.googlesource.com/c/chromium/src/+/5268963 * chore: add FormControlType::kButtonPopover to the FormControlType converter Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5230929 * chore: e patches all * chore: node script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 123.0.6290.0 * chore: bump chromium in DEPS to 123.0.6291.0 * chore: bump chromium in DEPS to 123.0.6292.0 * chore: bump chromium in DEPS to 123.0.6294.0 * chore: update fix_aspect_ratio_with_max_size.patch Xref: fix_aspect_ratio_with_max_size.patch note: simple absl::optional -> std::optional conversion * chore: update feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5272337 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; just adjusting line patch offsets Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5258688 * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5281322 * chore: update fix_select_The_first_menu_item_when_opened_via_keyboard.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5279376 note: simple absl::optional -> std::optional conversion * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5268792 * chore: script/export_all_patches.py * chore: bump chromium in DEPS to 123.0.6296.0 * chore: update patches * fixup! chore: update feat_allow_code_cache_in_custom_schemes.patch * fix: restore MessagePort close event * spec: fix CORB testing Refs https://chromium-review.googlesource.com/c/chromium/src/+/5231506 * fix: use sync layout when content view changes * fixup! chore: update feat_configure_launch_options_for_service_process.patch * Add remote-cocoa support for context menus. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5259806 * Rename //net/base/mac directory to //net/base/apple (1/n) Refs https://chromium-review.googlesource.com/c/chromium/src/+/5211389 * fixup! Add remote-cocoa support for context menus. * [Clipboard] Don't add meta charset tag for async write() method on Mac. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5187335 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
248 lines
8.1 KiB
C++
248 lines
8.1 KiB
C++
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#include "shell/browser/ui/views/inspectable_web_contents_view_views.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/ui/drag_util.h"
|
|
#include "shell/browser/ui/inspectable_web_contents.h"
|
|
#include "shell/browser/ui/inspectable_web_contents_delegate.h"
|
|
#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
|
|
#include "ui/base/models/image_model.h"
|
|
#include "ui/views/controls/label.h"
|
|
#include "ui/views/controls/webview/webview.h"
|
|
#include "ui/views/widget/widget.h"
|
|
#include "ui/views/widget/widget_delegate.h"
|
|
#include "ui/views/window/client_view.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
class DevToolsWindowDelegate : public views::ClientView,
|
|
public views::WidgetDelegate {
|
|
public:
|
|
DevToolsWindowDelegate(InspectableWebContentsViewViews* shell,
|
|
views::View* view,
|
|
views::Widget* widget)
|
|
: views::ClientView(widget, view),
|
|
shell_(shell),
|
|
view_(view),
|
|
widget_(widget) {
|
|
SetOwnedByWidget(true);
|
|
set_owned_by_client();
|
|
|
|
if (shell->GetDelegate())
|
|
icon_ = shell->GetDelegate()->GetDevToolsWindowIcon();
|
|
}
|
|
~DevToolsWindowDelegate() override = default;
|
|
|
|
// disable copy
|
|
DevToolsWindowDelegate(const DevToolsWindowDelegate&) = delete;
|
|
DevToolsWindowDelegate& operator=(const DevToolsWindowDelegate&) = delete;
|
|
|
|
// views::WidgetDelegate:
|
|
views::View* GetInitiallyFocusedView() override { return view_; }
|
|
std::u16string GetWindowTitle() const override { return shell_->GetTitle(); }
|
|
ui::ImageModel GetWindowAppIcon() override { return GetWindowIcon(); }
|
|
ui::ImageModel GetWindowIcon() override { return icon_; }
|
|
views::Widget* GetWidget() override { return widget_; }
|
|
const views::Widget* GetWidget() const override { return widget_; }
|
|
views::View* GetContentsView() override { return view_; }
|
|
views::ClientView* CreateClientView(views::Widget* widget) override {
|
|
return this;
|
|
}
|
|
|
|
// views::ClientView:
|
|
views::CloseRequestResult OnWindowCloseRequested() override {
|
|
shell_->inspectable_web_contents()->CloseDevTools();
|
|
return views::CloseRequestResult::kCannotClose;
|
|
}
|
|
|
|
private:
|
|
raw_ptr<InspectableWebContentsViewViews> shell_;
|
|
raw_ptr<views::View> view_;
|
|
raw_ptr<views::Widget> widget_;
|
|
ui::ImageModel icon_;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
InspectableWebContentsView* CreateInspectableContentsView(
|
|
InspectableWebContents* inspectable_web_contents) {
|
|
return new InspectableWebContentsViewViews(inspectable_web_contents);
|
|
}
|
|
|
|
InspectableWebContentsViewViews::InspectableWebContentsViewViews(
|
|
InspectableWebContents* inspectable_web_contents)
|
|
: InspectableWebContentsView(inspectable_web_contents),
|
|
devtools_web_view_(new views::WebView(nullptr)),
|
|
title_(u"Developer Tools") {
|
|
if (!inspectable_web_contents_->is_guest() &&
|
|
inspectable_web_contents_->GetWebContents()->GetNativeView()) {
|
|
auto* contents_web_view = new views::WebView(nullptr);
|
|
contents_web_view->SetWebContents(
|
|
inspectable_web_contents_->GetWebContents());
|
|
contents_web_view_ = contents_web_view;
|
|
} else {
|
|
contents_web_view_ = new views::Label(u"No content under offscreen mode");
|
|
}
|
|
|
|
devtools_web_view_->SetVisible(false);
|
|
AddChildView(devtools_web_view_.get());
|
|
AddChildView(contents_web_view_.get());
|
|
}
|
|
|
|
InspectableWebContentsViewViews::~InspectableWebContentsViewViews() {
|
|
if (devtools_window_)
|
|
inspectable_web_contents()->SaveDevToolsBounds(
|
|
devtools_window_->GetWindowBoundsInScreen());
|
|
}
|
|
|
|
views::View* InspectableWebContentsViewViews::GetView() {
|
|
return this;
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::ShowDevTools(bool activate) {
|
|
if (devtools_visible_)
|
|
return;
|
|
|
|
devtools_visible_ = true;
|
|
if (devtools_window_) {
|
|
devtools_window_web_view_->SetWebContents(
|
|
inspectable_web_contents_->GetDevToolsWebContents());
|
|
devtools_window_->SetBounds(inspectable_web_contents()->dev_tools_bounds());
|
|
if (activate) {
|
|
devtools_window_->Show();
|
|
} else {
|
|
devtools_window_->ShowInactive();
|
|
}
|
|
|
|
// Update draggable regions to account for the new dock position.
|
|
if (GetDelegate())
|
|
GetDelegate()->DevToolsResized();
|
|
} else {
|
|
devtools_web_view_->SetVisible(true);
|
|
devtools_web_view_->SetWebContents(
|
|
inspectable_web_contents_->GetDevToolsWebContents());
|
|
devtools_web_view_->RequestFocus();
|
|
DeprecatedLayoutImmediately();
|
|
}
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::CloseDevTools() {
|
|
if (!devtools_visible_)
|
|
return;
|
|
|
|
devtools_visible_ = false;
|
|
if (devtools_window_) {
|
|
auto save_bounds = devtools_window_->IsMinimized()
|
|
? devtools_window_->GetRestoredBounds()
|
|
: devtools_window_->GetWindowBoundsInScreen();
|
|
inspectable_web_contents()->SaveDevToolsBounds(save_bounds);
|
|
|
|
devtools_window_.reset();
|
|
devtools_window_web_view_ = nullptr;
|
|
devtools_window_delegate_ = nullptr;
|
|
} else {
|
|
devtools_web_view_->SetVisible(false);
|
|
devtools_web_view_->SetWebContents(nullptr);
|
|
DeprecatedLayoutImmediately();
|
|
}
|
|
}
|
|
|
|
bool InspectableWebContentsViewViews::IsDevToolsViewShowing() {
|
|
return devtools_visible_;
|
|
}
|
|
|
|
bool InspectableWebContentsViewViews::IsDevToolsViewFocused() {
|
|
if (devtools_window_web_view_)
|
|
return devtools_window_web_view_->HasFocus();
|
|
else if (devtools_web_view_)
|
|
return devtools_web_view_->HasFocus();
|
|
else
|
|
return false;
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::SetIsDocked(bool docked, bool activate) {
|
|
CloseDevTools();
|
|
|
|
if (!docked) {
|
|
devtools_window_ = std::make_unique<views::Widget>();
|
|
devtools_window_web_view_ = new views::WebView(nullptr);
|
|
devtools_window_delegate_ = new DevToolsWindowDelegate(
|
|
this, devtools_window_web_view_, devtools_window_.get());
|
|
|
|
views::Widget::InitParams params;
|
|
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
|
params.delegate = devtools_window_delegate_;
|
|
params.bounds = inspectable_web_contents()->dev_tools_bounds();
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
params.wm_role_name = "devtools";
|
|
if (GetDelegate())
|
|
GetDelegate()->GetDevToolsWindowWMClass(¶ms.wm_class_name,
|
|
¶ms.wm_class_class);
|
|
#endif
|
|
|
|
devtools_window_->Init(std::move(params));
|
|
devtools_window_->UpdateWindowIcon();
|
|
devtools_window_->widget_delegate()->SetHasWindowSizeControls(true);
|
|
}
|
|
|
|
ShowDevTools(activate);
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::SetContentsResizingStrategy(
|
|
const DevToolsContentsResizingStrategy& strategy) {
|
|
strategy_.CopyFrom(strategy);
|
|
DeprecatedLayoutImmediately();
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::SetTitle(const std::u16string& title) {
|
|
if (devtools_window_) {
|
|
title_ = title;
|
|
devtools_window_->UpdateWindowTitle();
|
|
}
|
|
}
|
|
|
|
const std::u16string InspectableWebContentsViewViews::GetTitle() {
|
|
return title_;
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::Layout(PassKey) {
|
|
if (!devtools_web_view_->GetVisible()) {
|
|
contents_web_view_->SetBoundsRect(GetContentsBounds());
|
|
// Propagate layout call to all children, for example browser views.
|
|
LayoutSuperclass<View>(this);
|
|
return;
|
|
}
|
|
|
|
gfx::Size container_size(width(), height());
|
|
gfx::Rect new_devtools_bounds;
|
|
gfx::Rect new_contents_bounds;
|
|
ApplyDevToolsContentsResizingStrategy(
|
|
strategy_, container_size, &new_devtools_bounds, &new_contents_bounds);
|
|
|
|
// DevTools cares about the specific position, so we have to compensate RTL
|
|
// layout here.
|
|
new_devtools_bounds.set_x(GetMirroredXForRect(new_devtools_bounds));
|
|
new_contents_bounds.set_x(GetMirroredXForRect(new_contents_bounds));
|
|
|
|
devtools_web_view_->SetBoundsRect(new_devtools_bounds);
|
|
contents_web_view_->SetBoundsRect(new_contents_bounds);
|
|
|
|
// Propagate layout call to all children, for example browser views.
|
|
LayoutSuperclass<View>(this);
|
|
|
|
if (GetDelegate())
|
|
GetDelegate()->DevToolsResized();
|
|
}
|
|
|
|
} // namespace electron
|