Diff of /accessible/src/windows/msaa/AccessibleWrap.h [453aaf] .. [d148f3] Maximize Restore

Repo status: analyzing...

  Switch to side-by-side view

--- a/accessible/src/windows/msaa/AccessibleWrap.h
+++ b/accessible/src/windows/msaa/AccessibleWrap.h
@@ -1,14 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* For documentation of the accessibility architecture, 
- * see http://lxr.mozilla.org/seamonkey/source/accessible/accessible-docs.html
- */
-
-#ifndef _AccessibleWrap_H_
-#define _AccessibleWrap_H_
+#ifndef mozilla_a11y_AccessibleWrap_h_
+#define mozilla_a11y_AccessibleWrap_h_
 
 #include "nsCOMPtr.h"
 #include "Accessible.h"
@@ -16,104 +13,6 @@
 #include "ia2AccessibleComponent.h"
 #include "ia2AccessibleHyperlink.h"
 #include "ia2AccessibleValue.h"
-
-#define DECL_IUNKNOWN                                                          \
-public:                                                                        \
-  virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**);            \
-  virtual ULONG STDMETHODCALLTYPE AddRef() MOZ_FINAL                           \
-    {  return ++mRefCnt; }                                                     \
-  virtual ULONG STDMETHODCALLTYPE Release() MOZ_FINAL                          \
-  {                                                                            \
-     mRefCnt--;                                                                \
-     if (mRefCnt)                                                              \
-       return mRefCnt;                                                         \
-                                                                               \
-     delete this;                                                              \
-     return 0;                                                                 \
-  }                                                                            \
-private:                                                                       \
-  ULONG mRefCnt;                                                               \
-public:
-
-#define DECL_IUNKNOWN_INHERITED                                                \
-public:                                                                        \
-virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**);              \
-
-#define IMPL_IUNKNOWN_QUERY_HEAD(Class)                                        \
-STDMETHODIMP                                                                   \
-Class::QueryInterface(REFIID aIID, void** aInstancePtr)                        \
-{                                                                              \
-  A11Y_TRYBLOCK_BEGIN                                                          \
-  if (!aInstancePtr)                                                           \
-    return E_INVALIDARG;                                                       \
-  *aInstancePtr = nullptr;                                                        \
-                                                                               \
-  HRESULT hr = E_NOINTERFACE;
-
-#define IMPL_IUNKNOWN_QUERY_TAIL                                               \
-  return hr;                                                                   \
-  A11Y_TRYBLOCK_END                                                            \
-}
-
-#define IMPL_IUNKNOWN_QUERY_IFACE(Iface)                                       \
-  if (aIID == IID_##Iface) {                                                   \
-    *aInstancePtr = static_cast<Iface*>(this);                                 \
-    AddRef();                                                                  \
-    return S_OK;                                                               \
-  }
-
-#define IMPL_IUNKNOWN_QUERY_IFACE_AMBIGIOUS(Iface, aResolveIface)              \
-  if (aIID == IID_##Iface) {                                                   \
-    *aInstancePtr = static_cast<Iface*>(static_cast<aResolveIface*>(this));    \
-    AddRef();                                                                  \
-    return S_OK;                                                               \
-  }
-
-#define IMPL_IUNKNOWN_QUERY_CLASS(Class)                                       \
-  hr = Class::QueryInterface(aIID, aInstancePtr);                              \
-  if (SUCCEEDED(hr))                                                           \
-    return hr;
-
-#define IMPL_IUNKNOWN_QUERY_CLASS_COND(Class, Cond)                            \
-  if (Cond) {                                                                  \
-    hr = Class::QueryInterface(aIID, aInstancePtr);                            \
-    if (SUCCEEDED(hr))                                                         \
-      return hr;                                                               \
-  }
-
-#define IMPL_IUNKNOWN_QUERY_AGGR_COND(Member, Cond)                            \
-  if (Cond) {                                                                  \
-    hr = Member->QueryInterface(aIID, aInstancePtr);                           \
-    if (SUCCEEDED(hr))                                                         \
-      return hr;                                                               \
-  }
-
-#define IMPL_IUNKNOWN1(Class, I1)                                              \
-  IMPL_IUNKNOWN_QUERY_HEAD(Class)                                              \
-  IMPL_IUNKNOWN_QUERY_IFACE(I1);                                               \
-  IMPL_IUNKNOWN_QUERY_IFACE(IUnknown);                                         \
-  IMPL_IUNKNOWN_QUERY_TAIL                                                     \
-
-#define IMPL_IUNKNOWN2(Class, I1, I2)                                          \
-  IMPL_IUNKNOWN_QUERY_HEAD(Class)                                              \
-  IMPL_IUNKNOWN_QUERY_IFACE(I1);                                               \
-  IMPL_IUNKNOWN_QUERY_IFACE(I2);                                               \
-  IMPL_IUNKNOWN_QUERY_IFACE_AMBIGIOUS(IUnknown, I1);                           \
-  IMPL_IUNKNOWN_QUERY_TAIL                                                     \
-
-#define IMPL_IUNKNOWN_INHERITED1(Class, Super0, Super1)                        \
-  IMPL_IUNKNOWN_QUERY_HEAD(Class)                                              \
-  IMPL_IUNKNOWN_QUERY_CLASS(Super1);                                           \
-  IMPL_IUNKNOWN_QUERY_CLASS(Super0)                                            \
-  IMPL_IUNKNOWN_QUERY_TAIL                                                     \
-
-#define IMPL_IUNKNOWN_INHERITED2(Class, Super0, Super1, Super2)                \
-  IMPL_IUNKNOWN_QUERY_HEAD(Class)                                              \
-  IMPL_IUNKNOWN_QUERY_CLASS(Super1);                                           \
-  IMPL_IUNKNOWN_QUERY_CLASS(Super2);                                           \
-  IMPL_IUNKNOWN_QUERY_CLASS(Super0)                                            \
-  IMPL_IUNKNOWN_QUERY_TAIL
-
 
 namespace mozilla {
 namespace a11y {