From 05e6c9cfd9ae784ba96e64252e3e52fe374e8381 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 17 May 2022 17:42:27 +0100
Subject: [PATCH] remove redundant api GetFrameSize.

---
 native/Avalonia.Native/src/OSX/WindowBaseImpl.h |  2 --
 .../Avalonia.Native/src/OSX/WindowBaseImpl.mm   | 17 +----------------
 src/Avalonia.Native/avn.idl                     |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index eff13bcb23..379bb227a8 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -72,8 +72,6 @@ BEGIN_INTERFACE_MAP()
 
     virtual HRESULT GetClientSize(AvnSize *ret) override;
 
-    virtual HRESULT GetFrameSize(AvnSize *ret) override;
-
     virtual HRESULT GetScaling(double *ret) override;
 
     virtual HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize) override;
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index db5eb54e3f..f27aa01eb7 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -191,22 +191,7 @@ HRESULT WindowBaseImpl::GetClientSize(AvnSize *ret) {
         if (ret == nullptr)
             return E_POINTER;
 
-        auto frame = [View frame];
-        ret->Width = frame.size.width;
-        ret->Height = frame.size.height;
-
-        return S_OK;
-    }
-}
-
-HRESULT WindowBaseImpl::GetFrameSize(AvnSize *ret) {
-    START_COM_CALL;
-
-    @autoreleasepool {
-        if (ret == nullptr)
-            return E_POINTER;
-
-        auto frame = [Window frame];
+        auto frame = [View.frame];
         ret->Width = frame.size.width;
         ret->Height = frame.size.height;
 
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index d6ef0f8918..a28bd06cd0 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -504,7 +504,6 @@ interface IAvnWindowBase : IUnknown
      HRESULT Close();
      HRESULT Activate();
      HRESULT GetClientSize(AvnSize*ret);
-     HRESULT GetFrameSize(AvnSize*ret);
      HRESULT GetScaling(double*ret);
      HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
      HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);