Skip to content

A
angle
Commit 088b1baa by Yuly Novikov Committed by Commit Bot
Options

Change uuid attributes to declspec in winrt.

Due to warning C4467: usage of ATL attributes is deprecated Bug: angleproject:3928 Change-Id: I6620acc85ae974445a2a01fc109568fac8c3b23b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2032152 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent e196bc85
Showing with 4 additions and 12 deletions
src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
...@@ -49,15 +49,11 @@ class CoreWindowNativeWindow : public InspectableNativeWindow, ...@@ -49,15 +49,11 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap; ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
}; };
// clang format would break the uuid below __declspec(uuid("7F924F66-EBAE-40E5-A10B-B8F35E245190")) class CoreWindowSizeChangedHandler
// clang-format off
[uuid(7F924F66-EBAE-40E5-A10B-B8F35E245190)] class CoreWindowSizeChangedHandler
: public Microsoft::WRL::RuntimeClass< : public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
IWindowSizeChangedEventHandler> IWindowSizeChangedEventHandler>
{ {
// clang-format on
public: public:
CoreWindowSizeChangedHandler() {} CoreWindowSizeChangedHandler() {}
HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host) HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host)
...@@ -97,6 +93,6 @@ class CoreWindowNativeWindow : public InspectableNativeWindow, ...@@ -97,6 +93,6 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWindow> &coreWindow, HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWindow> &coreWindow,
Size *windowSize); Size *windowSize);
} } // namespace rx
#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_ #endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
...@@ -43,15 +43,11 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow, ...@@ -43,15 +43,11 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
ComPtr<IDXGISwapChain1> mSwapChain; ComPtr<IDXGISwapChain1> mSwapChain;
}; };
// clang format would break the uuid below __declspec(uuid("8ACBD974-8187-4508-AD80-AEC77F93CF36")) class SwapChainPanelSizeChangedHandler
// clang-format off
[uuid(8ACBD974-8187-4508-AD80-AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
: public Microsoft::WRL::RuntimeClass< : public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
ABI::Windows::UI::Xaml::ISizeChangedEventHandler> ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
{ {
// clang-format on
public: public:
SwapChainPanelSizeChangedHandler() {} SwapChainPanelSizeChangedHandler() {}
HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host) HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host)
...@@ -96,5 +92,5 @@ HRESULT GetSwapChainPanelSize( ...@@ -96,5 +92,5 @@ HRESULT GetSwapChainPanelSize(
const ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> &swapChainPanel, const ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> &swapChainPanel,
const ComPtr<ABI::Windows::UI::Core::ICoreDispatcher> &dispatcher, const ComPtr<ABI::Windows::UI::Core::ICoreDispatcher> &dispatcher,
Size *windowSize); Size *windowSize);
} } // namespace rx
#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_ #endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment