![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
250 lines
8.3 KiB
C++
250 lines
8.3 KiB
C++
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
// Copyright (c) 2013 Adam Roben <adam@roben.org>. 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/inspectable_web_contents_view.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 {
|
|
|
|
class DevToolsWindowDelegate : public views::ClientView,
|
|
public views::WidgetDelegate {
|
|
public:
|
|
DevToolsWindowDelegate(InspectableWebContentsView* shell,
|
|
views::View* view,
|
|
views::Widget* widget)
|
|
: views::ClientView(widget, view),
|
|
shell_(shell),
|
|
view_(view),
|
|
widget_(widget) {
|
|
SetOwnedByWidget(OwnedByWidgetPassKey{});
|
|
set_owned_by_client(OwnedByClientPassKey{});
|
|
|
|
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<InspectableWebContentsView> shell_;
|
|
raw_ptr<views::View> view_;
|
|
raw_ptr<views::Widget> widget_;
|
|
ui::ImageModel icon_;
|
|
};
|
|
|
|
InspectableWebContentsView::InspectableWebContentsView(
|
|
InspectableWebContents* inspectable_web_contents)
|
|
: inspectable_web_contents_(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 {
|
|
no_contents_view_ = new views::Label(u"No content under offscreen mode");
|
|
}
|
|
|
|
devtools_web_view_->SetVisible(false);
|
|
AddChildViewRaw(devtools_web_view_.get());
|
|
AddChildViewRaw(GetContentsView());
|
|
}
|
|
|
|
InspectableWebContentsView::~InspectableWebContentsView() {
|
|
if (devtools_window_)
|
|
inspectable_web_contents()->SaveDevToolsBounds(
|
|
devtools_window_->GetWindowBoundsInScreen());
|
|
}
|
|
|
|
void InspectableWebContentsView::SetCornerRadii(
|
|
const gfx::RoundedCornersF& corner_radii) {
|
|
// WebView won't exist for offscreen rendering.
|
|
if (contents_web_view_) {
|
|
contents_web_view_->holder()->SetCornerRadii(corner_radii);
|
|
}
|
|
}
|
|
|
|
void InspectableWebContentsView::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 InspectableWebContentsView::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 InspectableWebContentsView::IsDevToolsViewShowing() {
|
|
return devtools_visible_;
|
|
}
|
|
|
|
bool InspectableWebContentsView::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 InspectableWebContentsView::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(
|
|
views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET,
|
|
views::Widget::InitParams::TYPE_WINDOW);
|
|
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 InspectableWebContentsView::SetContentsResizingStrategy(
|
|
const DevToolsContentsResizingStrategy& strategy) {
|
|
strategy_.CopyFrom(strategy);
|
|
DeprecatedLayoutImmediately();
|
|
}
|
|
|
|
void InspectableWebContentsView::SetTitle(const std::u16string& title) {
|
|
if (devtools_window_) {
|
|
title_ = title;
|
|
devtools_window_->UpdateWindowTitle();
|
|
}
|
|
}
|
|
|
|
const std::u16string InspectableWebContentsView::GetTitle() {
|
|
return title_;
|
|
}
|
|
|
|
void InspectableWebContentsView::Layout(PassKey) {
|
|
if (!devtools_web_view_->GetVisible()) {
|
|
GetContentsView()->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);
|
|
GetContentsView()->SetBoundsRect(new_contents_bounds);
|
|
|
|
// Propagate layout call to all children, for example browser views.
|
|
LayoutSuperclass<View>(this);
|
|
|
|
if (GetDelegate())
|
|
GetDelegate()->DevToolsResized();
|
|
}
|
|
|
|
views::View* InspectableWebContentsView::GetContentsView() const {
|
|
DCHECK(contents_web_view_ || no_contents_view_);
|
|
|
|
return contents_web_view_ ? contents_web_view_ : no_contents_view_;
|
|
}
|
|
|
|
} // namespace electron
|