2018-02-02 17:07:36 +00:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
2017-10-31 19:02:30 +00:00
|
|
|
* 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_gfx_2d_CaptureCommandList_h
|
|
|
|
#define mozilla_gfx_2d_CaptureCommandList_h
|
|
|
|
|
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 16:19:48 +00:00
|
|
|
#include <limits>
|
2020-01-20 16:18:20 +00:00
|
|
|
#include <utility>
|
2017-10-31 19:02:30 +00:00
|
|
|
#include <vector>
|
|
|
|
|
2018-02-02 15:59:35 +00:00
|
|
|
#include "DrawCommand.h"
|
2018-02-06 04:00:45 +00:00
|
|
|
#include "Logging.h"
|
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 16:19:48 +00:00
|
|
|
#include "mozilla/PodOperations.h"
|
2018-02-02 15:59:35 +00:00
|
|
|
|
2019-12-13 20:18:45 +00:00
|
|
|
// Command object is stored into record with header containing size and
|
|
|
|
// redundant size of whole record. Some platforms may require Command
|
|
|
|
// object to be stored on 8 bytes aligned address. Therefore we need to
|
|
|
|
// adjust size of header for these platforms.
|
|
|
|
#ifdef __sparc__
|
|
|
|
typedef uint32_t kAdvance_t;
|
|
|
|
#else
|
|
|
|
typedef uint16_t kAdvance_t;
|
|
|
|
#endif
|
|
|
|
|
2017-10-31 19:02:30 +00:00
|
|
|
namespace mozilla {
|
|
|
|
namespace gfx {
|
|
|
|
|
|
|
|
class CaptureCommandList {
|
|
|
|
public:
|
2018-02-02 15:59:35 +00:00
|
|
|
CaptureCommandList() : mLastCommand(nullptr) {}
|
2017-10-31 19:02:30 +00:00
|
|
|
CaptureCommandList(CaptureCommandList&& aOther)
|
2018-06-29 20:45:17 +00:00
|
|
|
: mStorage(std::move(aOther.mStorage)),
|
|
|
|
mLastCommand(aOther.mLastCommand) {
|
2018-02-02 15:59:35 +00:00
|
|
|
aOther.mLastCommand = nullptr;
|
|
|
|
}
|
2017-10-31 19:02:30 +00:00
|
|
|
~CaptureCommandList();
|
|
|
|
|
2018-06-29 20:45:17 +00:00
|
|
|
CaptureCommandList& operator=(CaptureCommandList&& aOther) {
|
2018-05-30 19:15:35 +00:00
|
|
|
mStorage = std::move(aOther.mStorage);
|
2018-02-02 15:59:35 +00:00
|
|
|
mLastCommand = aOther.mLastCommand;
|
|
|
|
aOther.mLastCommand = nullptr;
|
2017-10-31 19:02:30 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T* Append() {
|
2019-12-13 20:18:45 +00:00
|
|
|
static_assert(sizeof(T) + 2 * sizeof(kAdvance_t) <=
|
|
|
|
std::numeric_limits<kAdvance_t>::max(),
|
2018-11-29 15:43:05 +00:00
|
|
|
"encoding is too small to contain advance");
|
2019-12-13 20:18:45 +00:00
|
|
|
const kAdvance_t kAdvance = sizeof(T) + 2 * sizeof(kAdvance_t);
|
2018-11-29 15:43:05 +00:00
|
|
|
|
|
|
|
size_t size = mStorage.size();
|
|
|
|
mStorage.resize(size + kAdvance);
|
|
|
|
|
|
|
|
uint8_t* current = &mStorage.front() + size;
|
2019-12-13 20:18:45 +00:00
|
|
|
*(kAdvance_t*)(current) = kAdvance;
|
|
|
|
current += sizeof(kAdvance_t);
|
|
|
|
*(kAdvance_t*)(current) = ~kAdvance;
|
|
|
|
current += sizeof(kAdvance_t);
|
2018-11-29 15:43:05 +00:00
|
|
|
|
|
|
|
T* command = reinterpret_cast<T*>(current);
|
|
|
|
mLastCommand = command;
|
|
|
|
return command;
|
2018-02-02 15:59:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T* ReuseOrAppend() {
|
2018-06-29 20:45:17 +00:00
|
|
|
{ // Scope lock
|
|
|
|
if (mLastCommand != nullptr && mLastCommand->GetType() == T::Type) {
|
|
|
|
return reinterpret_cast<T*>(mLastCommand);
|
|
|
|
}
|
2018-02-02 15:59:35 +00:00
|
|
|
}
|
|
|
|
return Append<T>();
|
2017-10-31 19:02:30 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 22:47:51 +00:00
|
|
|
bool IsEmpty() const { return mStorage.empty(); }
|
|
|
|
|
2018-07-26 21:33:07 +00:00
|
|
|
template <typename T>
|
|
|
|
bool BufferWillAlloc() const {
|
2019-12-13 20:18:45 +00:00
|
|
|
const kAdvance_t kAdvance = sizeof(T) + 2 * sizeof(kAdvance_t);
|
2018-11-29 15:43:05 +00:00
|
|
|
return mStorage.size() + kAdvance > mStorage.capacity();
|
2018-07-26 21:33:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t BufferCapacity() const { return mStorage.capacity(); }
|
|
|
|
|
|
|
|
void Clear();
|
|
|
|
|
2017-10-31 19:02:30 +00:00
|
|
|
class iterator {
|
|
|
|
public:
|
|
|
|
explicit iterator(CaptureCommandList& aParent)
|
|
|
|
: mParent(aParent), mCurrent(nullptr), mEnd(nullptr) {
|
|
|
|
if (!mParent.mStorage.empty()) {
|
|
|
|
mCurrent = &mParent.mStorage.front();
|
|
|
|
mEnd = mCurrent + mParent.mStorage.size();
|
|
|
|
}
|
|
|
|
}
|
2018-06-29 20:45:17 +00:00
|
|
|
|
2017-10-31 19:02:30 +00:00
|
|
|
bool Done() const { return mCurrent >= mEnd; }
|
|
|
|
void Next() {
|
|
|
|
MOZ_ASSERT(!Done());
|
2019-12-13 20:18:45 +00:00
|
|
|
kAdvance_t advance = *reinterpret_cast<kAdvance_t*>(mCurrent);
|
|
|
|
kAdvance_t redundant =
|
|
|
|
~*reinterpret_cast<kAdvance_t*>(mCurrent + sizeof(kAdvance_t));
|
2018-11-29 15:43:05 +00:00
|
|
|
MOZ_RELEASE_ASSERT(advance == redundant);
|
|
|
|
mCurrent += advance;
|
2017-10-31 19:02:30 +00:00
|
|
|
}
|
|
|
|
DrawingCommand* Get() {
|
|
|
|
MOZ_ASSERT(!Done());
|
2019-12-13 20:18:45 +00:00
|
|
|
return reinterpret_cast<DrawingCommand*>(mCurrent +
|
|
|
|
2 * sizeof(kAdvance_t));
|
2017-10-31 19:02:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
CaptureCommandList& mParent;
|
|
|
|
uint8_t* mCurrent;
|
|
|
|
uint8_t* mEnd;
|
|
|
|
};
|
|
|
|
|
2019-03-18 18:42:04 +00:00
|
|
|
void Log(TreeLog<>& aStream) {
|
2018-02-06 04:00:45 +00:00
|
|
|
for (iterator iter(*this); !iter.Done(); iter.Next()) {
|
|
|
|
DrawingCommand* cmd = iter.Get();
|
|
|
|
cmd->Log(aStream);
|
|
|
|
aStream << "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-31 19:02:30 +00:00
|
|
|
private:
|
|
|
|
CaptureCommandList(const CaptureCommandList& aOther) = delete;
|
|
|
|
void operator=(const CaptureCommandList& aOther) = delete;
|
|
|
|
|
|
|
|
private:
|
|
|
|
std::vector<uint8_t> mStorage;
|
2018-02-02 15:59:35 +00:00
|
|
|
DrawingCommand* mLastCommand;
|
2017-10-31 19:02:30 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace gfx
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif // mozilla_gfx_2d_CaptureCommandList_h
|