refactor: inline simple getters (#41125)
This commit is contained in:
Charles Kerr
GitHub
parent
4e19321ba8
commit
ffec3127d5
17 changed files with 93 additions and 192 deletions
|
|
@ -135,7 +135,7 @@ class ElectronDelegatedFrameHostClient
|
|||
const ElectronDelegatedFrameHostClient&) = delete;
|
||||
|
||||
ui::Layer* DelegatedFrameHostGetLayer() const override {
|
||||
return view_->GetRootLayer();
|
||||
return view_->root_layer();
|
||||
}
|
||||
|
||||
bool DelegatedFrameHostIsVisible() const override {
|
||||
|
|
@ -214,8 +214,8 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
|
|||
root_layer_ = std::make_unique<ui::Layer>(ui::LAYER_SOLID_COLOR);
|
||||
|
||||
bool opaque = SkColorGetA(background_color_) == SK_AlphaOPAQUE;
|
||||
GetRootLayer()->SetFillsBoundsOpaquely(opaque);
|
||||
GetRootLayer()->SetColor(background_color_);
|
||||
root_layer()->SetFillsBoundsOpaquely(opaque);
|
||||
root_layer()->SetColor(background_color_);
|
||||
|
||||
ui::ContextFactory* context_factory = content::GetContextFactory();
|
||||
compositor_ = std::make_unique<ui::Compositor>(
|
||||
|
|
@ -234,8 +234,8 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
|
|||
video_consumer_ = std::make_unique<OffScreenVideoConsumer>(
|
||||
this, base::BindRepeating(&OffScreenRenderWidgetHostView::OnPaint,
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
video_consumer_->SetActive(IsPainting());
|
||||
video_consumer_->SetFrameRate(GetFrameRate());
|
||||
video_consumer_->SetActive(is_painting());
|
||||
video_consumer_->SetFrameRate(this->frame_rate());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ void OffScreenRenderWidgetHostView::InitAsChild(gfx::NativeView) {
|
|||
parent_host_view_->Hide();
|
||||
|
||||
ResizeRootLayer(false);
|
||||
SetPainting(parent_host_view_->IsPainting());
|
||||
SetPainting(parent_host_view_->is_painting());
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::SetSize(const gfx::Size& size) {
|
||||
|
|
@ -294,7 +294,7 @@ bool OffScreenRenderWidgetHostView::HasFocus() {
|
|||
}
|
||||
|
||||
bool OffScreenRenderWidgetHostView::IsSurfaceAvailableForCopy() {
|
||||
return GetDelegatedFrameHost()->CanCopyFromCompositingSurface();
|
||||
return delegated_frame_host()->CanCopyFromCompositingSurface();
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::ShowWithVisibility(
|
||||
|
|
@ -306,7 +306,7 @@ void OffScreenRenderWidgetHostView::ShowWithVisibility(
|
|||
|
||||
delegated_frame_host_->AttachToCompositor(compositor_.get());
|
||||
delegated_frame_host_->WasShown(GetLocalSurfaceId(),
|
||||
GetRootLayer()->bounds().size(), {});
|
||||
root_layer()->bounds().size(), {});
|
||||
|
||||
if (render_widget_host_)
|
||||
render_widget_host_->WasShown({});
|
||||
|
|
@ -320,9 +320,9 @@ void OffScreenRenderWidgetHostView::Hide() {
|
|||
render_widget_host_->WasHidden();
|
||||
|
||||
// TODO(deermichel): correct or kOther?
|
||||
GetDelegatedFrameHost()->WasHidden(
|
||||
delegated_frame_host()->WasHidden(
|
||||
content::DelegatedFrameHost::HiddenCause::kOccluded);
|
||||
GetDelegatedFrameHost()->DetachFromCompositor();
|
||||
delegated_frame_host()->DetachFromCompositor();
|
||||
|
||||
is_showing_ = false;
|
||||
}
|
||||
|
|
@ -384,9 +384,9 @@ void OffScreenRenderWidgetHostView::TakeFallbackContentFrom(
|
|||
->IsRenderWidgetHostViewChildFrame());
|
||||
auto* view_osr = static_cast<OffScreenRenderWidgetHostView*>(view);
|
||||
SetBackgroundColor(view_osr->background_color_);
|
||||
if (GetDelegatedFrameHost() && view_osr->GetDelegatedFrameHost()) {
|
||||
GetDelegatedFrameHost()->TakeFallbackContentFrom(
|
||||
view_osr->GetDelegatedFrameHost());
|
||||
if (delegated_frame_host() && view_osr->delegated_frame_host()) {
|
||||
delegated_frame_host()->TakeFallbackContentFrom(
|
||||
view_osr->delegated_frame_host());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -397,11 +397,11 @@ void OffScreenRenderWidgetHostView::
|
|||
|
||||
void OffScreenRenderWidgetHostView::UpdateFrameSinkIdRegistration() {
|
||||
RenderWidgetHostViewBase::UpdateFrameSinkIdRegistration();
|
||||
GetDelegatedFrameHost()->SetIsFrameSinkIdOwner(is_frame_sink_id_owner());
|
||||
delegated_frame_host()->SetIsFrameSinkIdOwner(is_frame_sink_id_owner());
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::ResetFallbackToFirstNavigationSurface() {
|
||||
GetDelegatedFrameHost()->ResetFallbackToFirstNavigationSurface();
|
||||
delegated_frame_host()->ResetFallbackToFirstNavigationSurface();
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::InitAsPopup(
|
||||
|
|
@ -423,7 +423,7 @@ void OffScreenRenderWidgetHostView::InitAsPopup(
|
|||
popup_position_ = bounds;
|
||||
|
||||
ResizeRootLayer(true);
|
||||
SetPainting(parent_host_view_->IsPainting());
|
||||
SetPainting(parent_host_view_->is_painting());
|
||||
Show();
|
||||
}
|
||||
|
||||
|
|
@ -483,8 +483,8 @@ void OffScreenRenderWidgetHostView::CopyFromSurface(
|
|||
const gfx::Rect& src_rect,
|
||||
const gfx::Size& output_size,
|
||||
base::OnceCallback<void(const SkBitmap&)> callback) {
|
||||
GetDelegatedFrameHost()->CopyFromCompositingSurface(src_rect, output_size,
|
||||
std::move(callback));
|
||||
delegated_frame_host()->CopyFromCompositingSurface(src_rect, output_size,
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
display::ScreenInfo OffScreenRenderWidgetHostView::GetScreenInfo() const {
|
||||
|
|
@ -516,9 +516,8 @@ void OffScreenRenderWidgetHostView::SetDisplayFeatureForTesting(
|
|||
const content::DisplayFeature* display_feature) {}
|
||||
|
||||
viz::SurfaceId OffScreenRenderWidgetHostView::GetCurrentSurfaceId() const {
|
||||
return GetDelegatedFrameHost()
|
||||
? GetDelegatedFrameHost()->GetCurrentSurfaceId()
|
||||
: viz::SurfaceId();
|
||||
return delegated_frame_host() ? delegated_frame_host()->GetCurrentSurfaceId()
|
||||
: viz::SurfaceId();
|
||||
}
|
||||
|
||||
std::unique_ptr<content::SyntheticGestureTarget>
|
||||
|
|
@ -558,12 +557,12 @@ OffScreenRenderWidgetHostView::CreateViewForWidget(
|
|||
}
|
||||
|
||||
return new OffScreenRenderWidgetHostView(
|
||||
transparent_, true, embedder_host_view->GetFrameRate(), callback_,
|
||||
transparent_, true, embedder_host_view->frame_rate(), callback_,
|
||||
render_widget_host, embedder_host_view, size());
|
||||
}
|
||||
|
||||
const viz::FrameSinkId& OffScreenRenderWidgetHostView::GetFrameSinkId() const {
|
||||
return GetDelegatedFrameHost()->frame_sink_id();
|
||||
return delegated_frame_host()->frame_sink_id();
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::DidNavigate() {
|
||||
|
|
@ -645,7 +644,7 @@ OffScreenRenderWidgetHostView::CreateHostDisplayClient(
|
|||
gfx::kNullAcceleratedWidget,
|
||||
base::BindRepeating(&OffScreenRenderWidgetHostView::OnPaint,
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
host_display_client_->SetActive(IsPainting());
|
||||
host_display_client_->SetActive(is_painting());
|
||||
return base::WrapUnique(host_display_client_.get());
|
||||
}
|
||||
|
||||
|
|
@ -727,10 +726,10 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
|
|||
}
|
||||
|
||||
for (auto* proxy_view : proxy_views_) {
|
||||
gfx::Rect rect = proxy_view->GetBounds();
|
||||
gfx::Rect rect = proxy_view->bounds();
|
||||
gfx::Point origin_in_pixels =
|
||||
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(rect.origin(), sf));
|
||||
canvas.writePixels(*proxy_view->GetBitmap(), origin_in_pixels.x(),
|
||||
canvas.writePixels(*proxy_view->bitmap(), origin_in_pixels.x(),
|
||||
origin_in_pixels.y());
|
||||
}
|
||||
}
|
||||
|
|
@ -786,7 +785,7 @@ void OffScreenRenderWidgetHostView::SynchronizeVisualProperties() {
|
|||
void OffScreenRenderWidgetHostView::SendMouseEvent(
|
||||
const blink::WebMouseEvent& event) {
|
||||
for (auto* proxy_view : proxy_views_) {
|
||||
gfx::Rect bounds = proxy_view->GetBounds();
|
||||
gfx::Rect bounds = proxy_view->bounds();
|
||||
if (bounds.Contains(event.PositionInWidget().x(),
|
||||
event.PositionInWidget().y())) {
|
||||
blink::WebMouseEvent proxy_event(event);
|
||||
|
|
@ -824,7 +823,7 @@ void OffScreenRenderWidgetHostView::SendMouseEvent(
|
|||
void OffScreenRenderWidgetHostView::SendMouseWheelEvent(
|
||||
const blink::WebMouseWheelEvent& event) {
|
||||
for (auto* proxy_view : proxy_views_) {
|
||||
gfx::Rect bounds = proxy_view->GetBounds();
|
||||
gfx::Rect bounds = proxy_view->bounds();
|
||||
if (bounds.Contains(event.PositionInWidget().x(),
|
||||
event.PositionInWidget().y())) {
|
||||
blink::WebMouseWheelEvent proxy_event(event);
|
||||
|
|
@ -915,22 +914,18 @@ void OffScreenRenderWidgetHostView::SetPainting(bool painting) {
|
|||
guest_host_view->SetPainting(painting);
|
||||
|
||||
if (video_consumer_) {
|
||||
video_consumer_->SetActive(IsPainting());
|
||||
video_consumer_->SetActive(is_painting());
|
||||
} else if (host_display_client_) {
|
||||
host_display_client_->SetActive(IsPainting());
|
||||
host_display_client_->SetActive(is_painting());
|
||||
}
|
||||
}
|
||||
|
||||
bool OffScreenRenderWidgetHostView::IsPainting() const {
|
||||
return painting_;
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::SetFrameRate(int frame_rate) {
|
||||
if (parent_host_view_) {
|
||||
if (parent_host_view_->GetFrameRate() == GetFrameRate())
|
||||
if (parent_host_view_->frame_rate() == this->frame_rate())
|
||||
return;
|
||||
|
||||
frame_rate_ = parent_host_view_->GetFrameRate();
|
||||
frame_rate_ = parent_host_view_->frame_rate();
|
||||
} else {
|
||||
if (frame_rate <= 0)
|
||||
frame_rate = 1;
|
||||
|
|
@ -943,31 +938,18 @@ void OffScreenRenderWidgetHostView::SetFrameRate(int frame_rate) {
|
|||
SetupFrameRate(true);
|
||||
|
||||
if (video_consumer_) {
|
||||
video_consumer_->SetFrameRate(GetFrameRate());
|
||||
video_consumer_->SetFrameRate(this->frame_rate());
|
||||
}
|
||||
|
||||
for (auto* guest_host_view : guest_host_views_)
|
||||
guest_host_view->SetFrameRate(frame_rate);
|
||||
}
|
||||
|
||||
int OffScreenRenderWidgetHostView::GetFrameRate() const {
|
||||
return frame_rate_;
|
||||
}
|
||||
|
||||
ui::Layer* OffScreenRenderWidgetHostView::GetRootLayer() const {
|
||||
return root_layer_.get();
|
||||
}
|
||||
|
||||
const viz::LocalSurfaceId& OffScreenRenderWidgetHostView::GetLocalSurfaceId()
|
||||
const {
|
||||
return delegated_frame_host_surface_id_;
|
||||
}
|
||||
|
||||
content::DelegatedFrameHost*
|
||||
OffScreenRenderWidgetHostView::GetDelegatedFrameHost() const {
|
||||
return delegated_frame_host_.get();
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::SetupFrameRate(bool force) {
|
||||
if (!force && frame_rate_threshold_us_ != 0)
|
||||
return;
|
||||
|
|
@ -1005,10 +987,10 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
|
|||
|
||||
gfx::Size size = GetViewBounds().size();
|
||||
|
||||
if (!force && !sf_did_change && size == GetRootLayer()->bounds().size())
|
||||
if (!force && !sf_did_change && size == root_layer()->bounds().size())
|
||||
return;
|
||||
|
||||
GetRootLayer()->SetBounds(gfx::Rect(size));
|
||||
root_layer()->SetBounds(gfx::Rect(size));
|
||||
|
||||
const gfx::Size& size_in_pixels =
|
||||
gfx::ToFlooredSize(gfx::ConvertSizeToPixels(size, sf));
|
||||
|
|
@ -1023,7 +1005,7 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
|
|||
delegated_frame_host_surface_id_ =
|
||||
delegated_frame_host_allocator_.GetCurrentLocalSurfaceId();
|
||||
|
||||
GetDelegatedFrameHost()->EmbedSurface(
|
||||
delegated_frame_host()->EmbedSurface(
|
||||
delegated_frame_host_surface_id_, size,
|
||||
cc::DeadlinePolicy::UseDefaultDeadline());
|
||||
|
||||
|
|
@ -1048,8 +1030,8 @@ void OffScreenRenderWidgetHostView::UpdateBackgroundColorFromRenderer(
|
|||
background_color_ = color;
|
||||
|
||||
bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
|
||||
GetRootLayer()->SetFillsBoundsOpaquely(opaque);
|
||||
GetRootLayer()->SetColor(color);
|
||||
root_layer()->SetFillsBoundsOpaquely(opaque);
|
||||
root_layer()->SetColor(color);
|
||||
}
|
||||
|
||||
void OffScreenRenderWidgetHostView::NotifyHostAndDelegateOnWasShown(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue