2014-02-27 20:33:09 +04:00
|
|
|
/* -*- 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/. */
|
|
|
|
|
|
|
|
#ifndef mozilla_a11y_xpcAccessibleTextRange_h_
|
|
|
|
#define mozilla_a11y_xpcAccessibleTextRange_h_
|
|
|
|
|
2020-01-20 19:18:20 +03:00
|
|
|
#include <utility>
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
|
|
|
|
#include "TextRange.h"
|
|
|
|
#include "nsIAccessibleTextRange.h"
|
2022-02-27 02:01:54 +03:00
|
|
|
#include "xpcAccessibleHyperText.h"
|
2014-02-27 20:33:09 +04:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
namespace a11y {
|
|
|
|
|
|
|
|
class TextRange;
|
|
|
|
|
2014-05-23 04:10:19 +04:00
|
|
|
#define NS_ACCESSIBLETEXTRANGE_IMPL_IID \
|
|
|
|
{ /* 133c8bf4-4913-4355-bd50-426bd1d6e1ad */ \
|
|
|
|
0xb17652d9, 0x4f54, 0x4c56, { \
|
|
|
|
0xbb, 0x62, 0x6d, 0x5b, 0xf1, 0xef, 0x91, 0x0c \
|
|
|
|
} \
|
|
|
|
}
|
2018-11-30 13:46:48 +03:00
|
|
|
|
2015-03-21 19:28:04 +03:00
|
|
|
class xpcAccessibleTextRange final : public nsIAccessibleTextRange {
|
2014-02-27 20:33:09 +04:00
|
|
|
public:
|
2022-02-27 02:01:54 +03:00
|
|
|
explicit xpcAccessibleTextRange(TextRange& aRange) { SetRange(aRange); }
|
2020-06-23 21:52:42 +03:00
|
|
|
|
2022-02-27 02:01:54 +03:00
|
|
|
NS_DECL_ISUPPORTS
|
2014-02-27 20:33:09 +04:00
|
|
|
|
2018-02-06 09:46:57 +03:00
|
|
|
NS_IMETHOD GetStartContainer(nsIAccessibleText** aAnchor) final;
|
|
|
|
NS_IMETHOD GetStartOffset(int32_t* aOffset) final;
|
|
|
|
NS_IMETHOD GetEndContainer(nsIAccessibleText** aAnchor) final;
|
|
|
|
NS_IMETHOD GetEndOffset(int32_t* aOffset) final;
|
|
|
|
NS_IMETHOD GetContainer(nsIAccessible** aContainer) final;
|
|
|
|
NS_IMETHOD Compare(nsIAccessibleTextRange* aOtherRange, bool* aResult) final;
|
2014-05-23 04:10:19 +04:00
|
|
|
NS_IMETHOD CompareEndPoints(uint32_t aEndPoint,
|
|
|
|
nsIAccessibleTextRange* aOtherRange,
|
|
|
|
uint32_t aOtherRangeEndPoint,
|
2018-02-06 09:46:57 +03:00
|
|
|
int32_t* aResult) final;
|
|
|
|
NS_IMETHOD Crop(nsIAccessible* aContainer, bool* aSuccess) final;
|
2014-05-23 04:10:19 +04:00
|
|
|
|
|
|
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ACCESSIBLETEXTRANGE_IMPL_IID)
|
2014-02-27 20:33:09 +04:00
|
|
|
|
|
|
|
private:
|
|
|
|
xpcAccessibleTextRange() {}
|
2014-06-23 23:56:09 +04:00
|
|
|
|
|
|
|
~xpcAccessibleTextRange() {}
|
|
|
|
|
2014-02-27 20:33:09 +04:00
|
|
|
friend class xpcAccessibleHyperText;
|
|
|
|
|
2015-01-07 02:35:02 +03:00
|
|
|
xpcAccessibleTextRange& operator=(const xpcAccessibleTextRange&) = delete;
|
2014-02-27 20:33:09 +04:00
|
|
|
|
2022-02-27 02:01:54 +03:00
|
|
|
void SetRange(TextRange& aRange);
|
|
|
|
|
|
|
|
TextRange Range();
|
|
|
|
|
|
|
|
// We can't hold a strong reference to an Accessible, but XPCOM needs strong
|
|
|
|
// references. Thus, instead of holding a TextRange here, we hold
|
|
|
|
// xpcAccessibleHyperText references and create the TextRange for each call
|
|
|
|
// using Range().
|
|
|
|
RefPtr<xpcAccessibleHyperText> mRoot;
|
|
|
|
RefPtr<xpcAccessibleHyperText> mStartContainer;
|
|
|
|
int32_t mStartOffset;
|
|
|
|
RefPtr<xpcAccessibleHyperText> mEndContainer;
|
|
|
|
int32_t mEndOffset;
|
2014-02-27 20:33:09 +04:00
|
|
|
};
|
|
|
|
|
2014-05-23 04:10:19 +04:00
|
|
|
NS_DEFINE_STATIC_IID_ACCESSOR(xpcAccessibleTextRange,
|
|
|
|
NS_ACCESSIBLETEXTRANGE_IMPL_IID)
|
|
|
|
|
2014-02-27 20:33:09 +04:00
|
|
|
} // namespace a11y
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif
|