mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
* chore: bump chromium in DEPS to 1f1c4d91f6eaa4a033ec8f499d63a0717f79a42a * viz: Do not apply white level scaling for RGBA fp16 HDR video https://chromium-review.googlesource.com/c/chromium/src/+/2296006 * Move WebPreferences to WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * Fix missing WeakPtr check in PreconnectManager https://chromium-review.googlesource.com/c/chromium/src/+/2309029 * Fixup swiftshader roll revision * Update patch indices * Move WebDeviceEmulationParams into common. https://chromium-review.googlesource.com/c/chromium/src/+/2303356 * Move EnableDisableDeviceEmulation to blink mojom messages https://chromium-review.googlesource.com/c/chromium/src/+/2303367 * PDF Viewer: Remove flag for two-up view https://chromium-review.googlesource.com/c/chromium/src/+/2311130 * Add mojom definition for DeviceEmulationParams. https://chromium-review.googlesource.com/c/chromium/src/+/2303491 * Remove ServiceWorkerContextWatcher from PaymentAppInstaller https://chromium-review.googlesource.com/c/chromium/src/+/2291186 * Loader: Move transferrable_url_loader.mojom into blink's mojom directory https://chromium-review.googlesource.com/c/chromium/src/+/2306123 * chore: bump chromium in DEPS to 4974f436479739025a90ebc2cc2e36d67ee1ac46 * mac: Work around Xcode 12b3 SDK bug https://chromium-review.googlesource.com/c/chromium/src/+/2315078 * Reland Update core items for macOS Big Sur. https://chromium-review.googlesource.com/c/chromium/src/+/2315162 * Update Swiftshader revision * mac/arm64: When cross-building the snapshot, use page size of the target ISA instead of the host. https://chromium-review.googlesource.com/c/v8/v8/+/2310575 * Update patch indices * Rename {,Non}ClientView::CanClose() to OnWindowCloseRequested() https://chromium-review.googlesource.com/c/chromium/src/+/2247838 * chore: bump chromium in DEPS to e9465d70d1dea539400f0fddad43358ea3c31d71 * chore: bump chromium in DEPS to bd5b71c5f20288eb26068a39ae6e0579566a51c5 * chore: bump chromium in DEPS to 786ee543048bd07d07c5ac50b7dbbdd6bdd8dcce * chore: bump chromium in DEPS to 34eb6ecbf2c5894b648900bf771a2a29de204798 * chore: bump chromium in DEPS to 567ff038d68e3adb8116a01eec863cdf34d775f5 * chore: bump chromium in DEPS to 340b45c8d4ceb2dd61969fc34e1928d3c46db48c * chore: update patches * chore: base::DeleteFile with two params is removed Should use base::DeleteFile and base::DeletePathRecursively when appropriate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2313376 * chore: add patch for NodePlatform::PostJob impl * chore: update patches * chore: extension file access is now instrumented Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2209995 * chore: implement SetWindowFrameInScreen in OSR RWHV Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2321409 * chore: NotifyUserActivation requires a type now This is just for a histogram thing and therefore it does not matter what we pass in Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2281303 * chore: update patches * chore: bump chromium in DEPS to cd570e6dd3dcb84463ac252b04e92ceb02d8400c * chore: update patches * chore: bump chromium in DEPS to 0187908a31866992b90c59719ac1d016328f6ee0 * chore: bump chromium in DEPS to 3c9df38c508f3dba26a75248beed4882ddfb98e9 * chore: bump chromium in DEPS to 1a47d3b9cee710bd3c958c4f2d8b205710df9d50 * chore: bump chromium in DEPS to baac93040d96abdab72d46dd034c60f86e108702 * chore: bump chromium in DEPS to 13836145f97299e636491de38064b78861c4fb2e * update patches * change OS_MACOSX -> OS_MAC Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=1105907 * patch: add header for ToExecutionContext in WebMessagePortConverter * chore: bump chromium in DEPS to 91ab9b6ac5d04dc034a03ad847fbfa8261328c2b * update patches * NeedToFireBeforeUnloadOrUnload -> NeedToFireBeforeUnloadOrUnloadEvents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2288711 * chore: bump chromium in DEPS to 290deb11f0e30cb1382fd8f8793d340560283c23 * update patches * add dragdrop header for autofill popup * int -> x11::Time * patch out accessibility private API use Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2330812 * remove usage of XEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2317767 * trigger recalculation of WebPreferences before renderer initialization Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * chore: bump chromium in DEPS to 6bdb484583b99c96ef3388d0c2184326581b2d5a * chore: bump chromium in DEPS to 1eb2a79cde04fd5c8ae51b4d813e6521635269e5 * chore: bump chromium in DEPS to 3dc8e3c0f400e4ca9c0a63d7a39bd910997ad4c6 * chore: update patches * fixup! trigger recalculation of WebPreferences before renderer initialization * views: Make MenuButton and RadioButton default constructible https://chromium-review.googlesource.com/c/chromium/src/+/2339586 * chore: fix code style Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
238 lines
7.6 KiB
C++
238 lines
7.6 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/strings/utf_string_conversions.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/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) {
|
|
// A WidgetDelegate should be deleted on DeleteDelegate.
|
|
set_owned_by_client();
|
|
|
|
if (shell->GetDelegate())
|
|
icon_ = shell->GetDelegate()->GetDevToolsWindowIcon();
|
|
}
|
|
~DevToolsWindowDelegate() override = default;
|
|
|
|
// views::WidgetDelegate:
|
|
void DeleteDelegate() override { delete this; }
|
|
views::View* GetInitiallyFocusedView() override { return view_; }
|
|
bool CanResize() const override { return true; }
|
|
bool CanMaximize() const override { return true; }
|
|
bool CanMinimize() const override { return true; }
|
|
base::string16 GetWindowTitle() const override { return shell_->GetTitle(); }
|
|
gfx::ImageSkia GetWindowAppIcon() override { return GetWindowIcon(); }
|
|
gfx::ImageSkia 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:
|
|
InspectableWebContentsViewViews* shell_;
|
|
views::View* view_;
|
|
views::Widget* widget_;
|
|
gfx::ImageSkia icon_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(DevToolsWindowDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
InspectableWebContentsView* CreateInspectableContentsView(
|
|
InspectableWebContents* inspectable_web_contents) {
|
|
return new InspectableWebContentsViewViews(inspectable_web_contents);
|
|
}
|
|
|
|
InspectableWebContentsViewViews::InspectableWebContentsViewViews(
|
|
InspectableWebContents* inspectable_web_contents)
|
|
: inspectable_web_contents_(inspectable_web_contents),
|
|
devtools_window_web_view_(nullptr),
|
|
contents_web_view_(nullptr),
|
|
devtools_web_view_(new views::WebView(nullptr)),
|
|
devtools_visible_(false),
|
|
devtools_window_delegate_(nullptr),
|
|
title_(base::ASCIIToUTF16("Developer Tools")) {
|
|
if (!inspectable_web_contents_->IsGuest() &&
|
|
inspectable_web_contents_->GetWebContents()->GetNativeView()) {
|
|
views::WebView* 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(base::ASCIIToUTF16("No content under offscreen mode"));
|
|
}
|
|
|
|
devtools_web_view_->SetVisible(false);
|
|
AddChildView(devtools_web_view_);
|
|
AddChildView(contents_web_view_);
|
|
}
|
|
|
|
InspectableWebContentsViewViews::~InspectableWebContentsViewViews() {
|
|
if (devtools_window_)
|
|
inspectable_web_contents()->SaveDevToolsBounds(
|
|
devtools_window_->GetWindowBoundsInScreen());
|
|
}
|
|
|
|
views::View* InspectableWebContentsViewViews::GetView() {
|
|
return this;
|
|
}
|
|
|
|
views::View* InspectableWebContentsViewViews::GetWebView() {
|
|
return contents_web_view_;
|
|
}
|
|
|
|
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()->GetDevToolsBounds());
|
|
if (activate) {
|
|
devtools_window_->Show();
|
|
} else {
|
|
devtools_window_->ShowInactive();
|
|
}
|
|
} else {
|
|
devtools_web_view_->SetVisible(true);
|
|
devtools_web_view_->SetWebContents(
|
|
inspectable_web_contents_->GetDevToolsWebContents());
|
|
devtools_web_view_->RequestFocus();
|
|
Layout();
|
|
}
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::CloseDevTools() {
|
|
if (!devtools_visible_)
|
|
return;
|
|
|
|
devtools_visible_ = false;
|
|
if (devtools_window_) {
|
|
inspectable_web_contents()->SaveDevToolsBounds(
|
|
devtools_window_->GetWindowBoundsInScreen());
|
|
devtools_window_.reset();
|
|
devtools_window_web_view_ = nullptr;
|
|
devtools_window_delegate_ = nullptr;
|
|
} else {
|
|
devtools_web_view_->SetVisible(false);
|
|
devtools_web_view_->SetWebContents(nullptr);
|
|
Layout();
|
|
}
|
|
}
|
|
|
|
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()->GetDevToolsBounds();
|
|
|
|
#if defined(USE_X11)
|
|
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();
|
|
}
|
|
|
|
ShowDevTools(activate);
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::SetContentsResizingStrategy(
|
|
const DevToolsContentsResizingStrategy& strategy) {
|
|
strategy_.CopyFrom(strategy);
|
|
Layout();
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::SetTitle(const base::string16& title) {
|
|
if (devtools_window_) {
|
|
title_ = title;
|
|
devtools_window_->UpdateWindowTitle();
|
|
}
|
|
}
|
|
|
|
void InspectableWebContentsViewViews::Layout() {
|
|
if (!devtools_web_view_->GetVisible()) {
|
|
contents_web_view_->SetBoundsRect(GetContentsBounds());
|
|
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);
|
|
}
|
|
|
|
} // namespace electron
|