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

web_view_ => content_view_

Browse source
This commit is contained in:
Cheng Zhao 2018-04-08 19:32:10 +09:00
parent 97e8800677
commit 13473ee138
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/common_web_contents_delegate_views.cc
View file

@ -38,7 +38,7 @@ void CommonWebContentsDelegate::ShowAutofillPopup(
auto* window = static_cast<NativeWindowViews*>(owner_window()); auto* window = static_cast<NativeWindowViews*>(owner_window());
autofill_popup_->CreateView( autofill_popup_->CreateView(
frame_host, offscreen, window->web_view(), bounds); frame_host, offscreen, window->content_view(), bounds);
autofill_popup_->SetItems(values, labels); autofill_popup_->SetItems(values, labels);
} }

23
atom/browser/native_window_views.cc
View file

@ -124,7 +124,7 @@ NativeWindowViews::NativeWindowViews(
NativeWindow* parent) NativeWindow* parent)
: NativeWindow(options, parent), : NativeWindow(options, parent),
window_(new views::Widget), window_(new views::Widget),
web_view_(web_contents->GetView()->GetView()), content_view_(web_contents->GetView()->GetView()),
focused_view_(web_contents->GetView()->GetWebView()), focused_view_(web_contents->GetView()->GetWebView()),
menu_bar_autohide_(false), menu_bar_autohide_(false),
menu_bar_visible_(false), menu_bar_visible_(false),
@ -266,7 +266,7 @@ NativeWindowViews::NativeWindowViews(
SetWindowType(GetAcceleratedWidget(), window_type); SetWindowType(GetAcceleratedWidget(), window_type);
#endif #endif
AddChildView(web_view_); AddChildView(content_view_);
#if defined(OS_WIN) #if defined(OS_WIN)
if (!has_frame()) { if (!has_frame()) {
@ -544,7 +544,7 @@ gfx::Rect NativeWindowViews::GetBounds() {
} }
gfx::Rect NativeWindowViews::GetContentBounds() { gfx::Rect NativeWindowViews::GetContentBounds() {
return web_view_->GetBoundsInScreen(); return content_view_->GetBoundsInScreen();
} }
gfx::Size NativeWindowViews::GetContentSize() { gfx::Size NativeWindowViews::GetContentSize() {
@ -553,7 +553,7 @@ gfx::Size NativeWindowViews::GetContentSize() {
return NativeWindow::GetContentSize(); return NativeWindow::GetContentSize();
#endif #endif
return web_view_->size(); return content_view_->size();
} }
void NativeWindowViews::SetContentSizeConstraints( void NativeWindowViews::SetContentSizeConstraints(
@ -934,7 +934,7 @@ void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
void NativeWindowViews::SetBrowserView(NativeBrowserView* view) { void NativeWindowViews::SetBrowserView(NativeBrowserView* view) {
if (browser_view()) { if (browser_view()) {
web_view_->RemoveChildView( content_view_->RemoveChildView(
browser_view()->GetInspectableWebContentsView()->GetView()); browser_view()->GetInspectableWebContentsView()->GetView());
set_browser_view(nullptr); set_browser_view(nullptr);
} }
@ -946,7 +946,7 @@ void NativeWindowViews::SetBrowserView(NativeBrowserView* view) {
// Add as child of the main web view to avoid (0, 0) origin from overlapping // Add as child of the main web view to avoid (0, 0) origin from overlapping
// with menu bar. // with menu bar.
set_browser_view(view); set_browser_view(view);
web_view_->AddChildView(view->GetInspectableWebContentsView()->GetView()); content_view_->AddChildView(view->GetInspectableWebContentsView()->GetView());
} }
void NativeWindowViews::SetParentWindow(NativeWindow* parent) { void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
@ -1346,6 +1346,9 @@ void NativeWindowViews::HandleKeyboardEvent(
} }
void NativeWindowViews::Layout() { void NativeWindowViews::Layout() {
if (!content_view_) // Not ready yet.
return;
const auto size = GetContentsBounds().size(); const auto size = GetContentsBounds().size();
const auto menu_bar_bounds = const auto menu_bar_bounds =
menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight) menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
@ -1354,11 +1357,9 @@ void NativeWindowViews::Layout() {
menu_bar_->SetBoundsRect(menu_bar_bounds); menu_bar_->SetBoundsRect(menu_bar_bounds);
} }
if (web_view_) { content_view_->SetBoundsRect(
web_view_->SetBoundsRect( gfx::Rect(0, menu_bar_bounds.height(), size.width(),
gfx::Rect(0, menu_bar_bounds.height(), size.width(), size.height() - menu_bar_bounds.height()));
size.height() - menu_bar_bounds.height()));
}
} }
gfx::Size NativeWindowViews::GetMinimumSize() const { gfx::Size NativeWindowViews::GetMinimumSize() const {

4
atom/browser/native_window_views.h
View file

@ -142,7 +142,7 @@ class NativeWindowViews : public NativeWindow,
void SetEnabled(bool enable) override; void SetEnabled(bool enable) override;
views::Widget* widget() const { return window_.get(); } views::Widget* widget() const { return window_.get(); }
views::View* web_view() const { return web_view_; } views::View* content_view() const { return content_view_; }
SkRegion* draggable_region() const { return draggable_region_.get(); } SkRegion* draggable_region() const { return draggable_region_.get(); }
#if defined(OS_WIN) #if defined(OS_WIN)
@ -209,7 +209,7 @@ class NativeWindowViews : public NativeWindow,
ui::WindowShowState GetRestoredState(); ui::WindowShowState GetRestoredState();
std::unique_ptr<views::Widget> window_; std::unique_ptr<views::Widget> window_;
views::View* web_view_; // Managed by inspectable_web_contents_. views::View* content_view_; // Weak ref.
views::View* focused_view_; // The view should be focused by default. views::View* focused_view_; // The view should be focused by default.
std::unique_ptr<MenuBar> menu_bar_; std::unique_ptr<MenuBar> menu_bar_;