commit 6cb6a07116c986719bb9acb5125b92bd9f3e068a
author Ben Wagner <bungeman@google.com> Mon Aug 12 18:30:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 14 17:14:03 2019 +0000
tree e75d7dd951461a15940a7e27f5aaee42a028a721
parent 735f1d2f0208cf14b8235f25f70005fd8b46aa71

Use COM_DECLSPEC_NOTHROW STDMETHODIMP

Use STDMETHODIMP because it's the right thing to do, use
COM_DECLSPEC_NOTHROW because STDMETHOD uses it but STDMETHODIMP does
not, leading to warnings from clang and maybe also from msvc, see
https://developercommunity.visualstudio.com/content/problem/325764/msvc-1582-generates-warning-c4986-in-atl-header-fi.html

This also removes SkBlockComRef, since even WRL has abandoned the
similar RemoveIUnknown. These classes were helpful in the transition to
using smart pointers, but are incompatible with final implementations.

Change-Id: I53a618ee629af638d9d8625ccd5acb0db6529950
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/233988
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/utils/win/SkDWriteGeometrySink.h

diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
index 30b337f..019539b 100644
--- a/src/utils/win/SkDWriteGeometrySink.h
+++ b/src/utils/win/SkDWriteGeometrySink.h
@@ -9,6 +9,7 @@
 #define SkDWriteToPath_DEFINED
 
 #include "include/core/SkTypes.h"
+#include "src/utils/win/SkObjBase.h"
 
 class SkPath;
 
@@ -20,25 +21,22 @@
     LONG fRefCount;
     SkPath* fPath;
 
-    SkDWriteGeometrySink(const SkDWriteGeometrySink&);
-    SkDWriteGeometrySink& operator=(const SkDWriteGeometrySink&);
-
 protected:
     explicit SkDWriteGeometrySink(SkPath* path);
     virtual ~SkDWriteGeometrySink();
 
 public:
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) override;
-    ULONG STDMETHODCALLTYPE AddRef(void) override;
-    ULONG STDMETHODCALLTYPE Release(void) override;
+    SK_STDMETHODIMP QueryInterface(REFIID iid, void **object) override;
+    SK_STDMETHODIMP_(ULONG) AddRef() override;
+    SK_STDMETHODIMP_(ULONG) Release() override;
 
-    void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) override;
-    void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) override;
-    void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) override;
-    void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) override;
-    void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) override;
-    void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) override;
-    HRESULT STDMETHODCALLTYPE Close() override;
+    SK_STDMETHODIMP_(void) SetFillMode(D2D1_FILL_MODE fillMode) override;
+    SK_STDMETHODIMP_(void) SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) override;
+    SK_STDMETHODIMP_(void) BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) override;
+    SK_STDMETHODIMP_(void) AddLines(const D2D1_POINT_2F *points, UINT pointsCount) override;
+    SK_STDMETHODIMP_(void) AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) override;
+    SK_STDMETHODIMP_(void) EndFigure(D2D1_FIGURE_END figureEnd) override;
+    SK_STDMETHODIMP Close() override;
 
     static HRESULT Create(SkPath* path, IDWriteGeometrySink** geometryToPath);
 };