github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: in electron::OffScreenRenderWidgetHostView, move empty function decls to header

Browse Source
This commit is contained in:
Charles Kerr
2024-08-09 13:16:45 -05:00
parent 155e572232
commit a732b3ef48
2 changed files with 19 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
shell/browser/osr/osr_render_widget_host_view.cc
View File

@@ -306,8 +306,6 @@ ui::TextInputClient* OffScreenRenderWidgetHostView::GetTextInputClient() {
return nullptr;
}
void OffScreenRenderWidgetHostView::Focus() {}
bool OffScreenRenderWidgetHostView::HasFocus() {
return false;
}
@@ -377,14 +375,10 @@ std::optional<SkColor> OffScreenRenderWidgetHostView::GetBackgroundColor() {
return background_color_;
}
void OffScreenRenderWidgetHostView::UpdateBackgroundColor() {}
gfx::Size OffScreenRenderWidgetHostView::GetVisibleViewportSize() {
return size_;
}
void OffScreenRenderWidgetHostView::SetInsets(const gfx::Insets& insets) {}
blink::mojom::PointerLockResult OffScreenRenderWidgetHostView::LockPointer(
bool request_unadjusted_movement) {
return blink::mojom::PointerLockResult::kUnsupportedOptions;
@@ -396,8 +390,6 @@ OffScreenRenderWidgetHostView::ChangePointerLock(
return blink::mojom::PointerLockResult::kUnsupportedOptions;
}
void OffScreenRenderWidgetHostView::UnlockPointer() {}
void OffScreenRenderWidgetHostView::TakeFallbackContentFrom(
content::RenderWidgetHostView* view) {
DCHECK(!static_cast<content::RenderWidgetHostViewBase*>(view)
@@ -447,19 +439,10 @@ void OffScreenRenderWidgetHostView::InitAsPopup(
Show();
}
void OffScreenRenderWidgetHostView::UpdateCursor(const ui::Cursor&) {}
input::CursorManager* OffScreenRenderWidgetHostView::GetCursorManager() {
return cursor_manager_.get();
}
void OffScreenRenderWidgetHostView::SetIsLoading(bool loading) {}
void OffScreenRenderWidgetHostView::TextInputStateChanged(
const ui::mojom::TextInputState& params) {}
void OffScreenRenderWidgetHostView::ImeCancelComposition() {}
void OffScreenRenderWidgetHostView::RenderProcessGone() {
Destroy();
}
@@ -492,9 +475,6 @@ void OffScreenRenderWidgetHostView::Destroy() {
delete this;
}
void OffScreenRenderWidgetHostView::UpdateTooltipUnderCursor(
const std::u16string&) {}
uint32_t OffScreenRenderWidgetHostView::GetCaptureSequenceNumber() const {
return latest_capture_sequence_number_;
}
@@ -520,9 +500,6 @@ display::ScreenInfo OffScreenRenderWidgetHostView::GetScreenInfo() const {
return screen_info;
}
void OffScreenRenderWidgetHostView::TransformPointToRootSurface(
gfx::PointF* point) {}
gfx::Rect OffScreenRenderWidgetHostView::GetBoundsInRootWindow() {
return gfx::Rect(size_);
}
@@ -532,9 +509,6 @@ OffScreenRenderWidgetHostView::GetDisplayFeature() {
return std::nullopt;
}
void OffScreenRenderWidgetHostView::SetDisplayFeatureForTesting(
const content::DisplayFeature* display_feature) {}
viz::SurfaceId OffScreenRenderWidgetHostView::GetCurrentSurfaceId() const {
return delegated_frame_host() ? delegated_frame_host()->GetCurrentSurfaceId()
: viz::SurfaceId();
@@ -546,11 +520,6 @@ OffScreenRenderWidgetHostView::CreateSyntheticGestureTarget() {
return nullptr;
}
void OffScreenRenderWidgetHostView::ImeCompositionRangeChanged(
const gfx::Range&,
const std::optional<std::vector<gfx::Rect>>& character_bounds,
const std::optional<std::vector<gfx::Rect>>& line_bounds) {}
gfx::Size OffScreenRenderWidgetHostView::GetCompositorViewportPixelSize() {
return gfx::ScaleToCeiledSize(GetRequestedRendererSize(),
GetDeviceScaleFactor());
@@ -676,22 +645,6 @@ bool OffScreenRenderWidgetHostView::InstallTransparency() {
}
#if BUILDFLAG(IS_MAC)
void OffScreenRenderWidgetHostView::SetActive(bool active) {}
void OffScreenRenderWidgetHostView::ShowDefinitionForSelection() {}
void OffScreenRenderWidgetHostView::SpeakSelection() {}
void OffScreenRenderWidgetHostView::SetWindowFrameInScreen(
const gfx::Rect& rect) {}
void OffScreenRenderWidgetHostView::ShowSharePicker(
const std::string& title,
const std::string& text,
const std::string& url,
const std::vector<std::string>& file_paths,
blink::mojom::ShareService::ShareCallback callback) {}
bool OffScreenRenderWidgetHostView::UpdateNSViewAndDisplay() {
return false;
}

37
shell/browser/osr/osr_render_widget_host_view.h
View File

@@ -90,8 +90,8 @@ class OffScreenRenderWidgetHostView
gfx::NativeView GetNativeView(void) override;
gfx::NativeViewAccessible GetNativeViewAccessible(void) override;
ui::TextInputClient* GetTextInputClient() override;
void Focus(void) override;
bool HasFocus(void) override;
void Focus() override {}
bool HasFocus() override;
uint32_t GetCaptureSequenceNumber() const override;
bool IsSurfaceAvailableForCopy(void) override;
void Hide(void) override;
@@ -99,27 +99,27 @@ class OffScreenRenderWidgetHostView
void EnsureSurfaceSynchronizedForWebTest() override;
gfx::Rect GetViewBounds(void) override;
gfx::Size GetVisibleViewportSize() override;
void SetInsets(const gfx::Insets&) override;
void SetInsets(const gfx::Insets&) override {}
void SetBackgroundColor(SkColor color) override;
std::optional<SkColor> GetBackgroundColor() override;
void UpdateBackgroundColor() override;
void UpdateBackgroundColor() override {}
blink::mojom::PointerLockResult LockPointer(
bool request_unadjusted_movement) override;
blink::mojom::PointerLockResult ChangePointerLock(
bool request_unadjusted_movement) override;
void UnlockPointer(void) override;
void UnlockPointer(void) override {}
void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
#if BUILDFLAG(IS_MAC)
void SetActive(bool active) override;
void ShowDefinitionForSelection() override;
void SpeakSelection() override;
void SetWindowFrameInScreen(const gfx::Rect& rect) override;
void SetActive(bool active) override {}
void ShowDefinitionForSelection() override {}
void SpeakSelection() override {}
void SetWindowFrameInScreen(const gfx::Rect& rect) override {}
void ShowSharePicker(
const std::string& title,
const std::string& text,
const std::string& url,
const std::vector<std::string>& file_paths,
blink::mojom::ShareService::ShareCallback callback) override;
blink::mojom::ShareService::ShareCallback callback) override {}
uint64_t GetNSViewId() const override;
bool UpdateNSViewAndDisplay();
#endif // BUILDFLAG(IS_MAC)
@@ -131,25 +131,26 @@ class OffScreenRenderWidgetHostView
void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) override;
void UpdateCursor(const ui::Cursor&) override;
void SetIsLoading(bool is_loading) override;
void TextInputStateChanged(const ui::mojom::TextInputState& params) override;
void ImeCancelComposition(void) override;
void UpdateCursor(const ui::Cursor&) override {}
void SetIsLoading(bool is_loading) override {}
void TextInputStateChanged(const ui::mojom::TextInputState& params) override {
}
void ImeCancelComposition(void) override {}
void RenderProcessGone() override;
void ShowWithVisibility(content::PageVisibilityState page_visibility) final;
void Destroy(void) override;
void UpdateTooltipUnderCursor(const std::u16string&) override;
void UpdateTooltipUnderCursor(const std::u16string&) override {}
input::CursorManager* GetCursorManager() override;
void CopyFromSurface(
const gfx::Rect& src_rect,
const gfx::Size& output_size,
base::OnceCallback<void(const SkBitmap&)> callback) override;
display::ScreenInfo GetScreenInfo() const override;
void TransformPointToRootSurface(gfx::PointF* point) override;
void TransformPointToRootSurface(gfx::PointF* point) override {}
gfx::Rect GetBoundsInRootWindow(void) override;
std::optional<content::DisplayFeature> GetDisplayFeature() override;
void SetDisplayFeatureForTesting(
const content::DisplayFeature* display_feature) override;
const content::DisplayFeature* display_feature) override {}
void NotifyHostAndDelegateOnWasShown(
blink::mojom::RecordContentToVisibleTimeRequestPtr) final;
void RequestSuccessfulPresentationTimeFromHostOrDelegate(
@@ -161,7 +162,7 @@ class OffScreenRenderWidgetHostView
void ImeCompositionRangeChanged(
const gfx::Range&,
const std::optional<std::vector<gfx::Rect>>& character_bounds,
const std::optional<std::vector<gfx::Rect>>& line_bounds) override;
const std::optional<std::vector<gfx::Rect>>& line_bounds) override {}
gfx::Size GetCompositorViewportPixelSize() override;
ui::Compositor* GetCompositor() override;