dd5b8769be
* fix: use OOIF for webview tag * fix: do not call GetNativeView for webview * fix: OOIPF webview's WebContents is managed by embedder frame * fix: guest view can not be focused * fix: clear zoom controller when guest is destroyed * fix: implement the webview resize event The webview is no longer a browser plugin with the resize event, use ResizeObserver instead. * test: disable failed tests due to OOPIF webview * fix: embedder can be destroyed earlier than guest This happens when embedder is manually destroyed. * fix: don't double attach * fix: recreate iframe when webview is reattached * fix: resize event may happen very early * test: some tests are working after OOPIF webview * chore: remove unused browser plugin webview code * fix: get embedder via closure When the "destroyed" event is emitted, the entry in guestInstances would be cleared. * chore: rename browserPluginNode to internalElement * test: make the visibilityState test more robust * chore: guestinstance can not work with OOPIF webview * fix: element could be detached before got response from browser
227 lines
7.2 KiB
C++
227 lines
7.2 KiB
C++
#include "brightray/browser/views/inspectable_web_contents_view_views.h"
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "brightray/browser/inspectable_web_contents_delegate.h"
|
|
#include "brightray/browser/inspectable_web_contents_impl.h"
|
|
#include "brightray/browser/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 brightray {
|
|
|
|
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 {}
|
|
|
|
// 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:
|
|
bool CanClose() override {
|
|
shell_->inspectable_web_contents()->CloseDevTools();
|
|
return false;
|
|
}
|
|
|
|
private:
|
|
InspectableWebContentsViewViews* shell_;
|
|
views::View* view_;
|
|
views::Widget* widget_;
|
|
gfx::ImageSkia icon_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(DevToolsWindowDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
InspectableWebContentsView* CreateInspectableContentsView(
|
|
InspectableWebContentsImpl* inspectable_web_contents) {
|
|
return new InspectableWebContentsViewViews(inspectable_web_contents);
|
|
}
|
|
|
|
InspectableWebContentsViewViews::InspectableWebContentsViewViews(
|
|
InspectableWebContentsImpl* 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")) {
|
|
set_owned_by_client();
|
|
|
|
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() {
|
|
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());
|
|
devtools_window_->Show();
|
|
} 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(NULL);
|
|
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) {
|
|
CloseDevTools();
|
|
|
|
if (!docked) {
|
|
devtools_window_.reset(new views::Widget);
|
|
devtools_window_web_view_ = new views::WebView(NULL);
|
|
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(params);
|
|
devtools_window_->UpdateWindowIcon();
|
|
}
|
|
|
|
ShowDevTools();
|
|
}
|
|
|
|
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_->visible()) {
|
|
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 brightray
|