2015-07-01 04:57:03 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* 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/. */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* LookupResult is the return type of SurfaceCache's Lookup*() functions. It
|
|
|
|
* combines a surface with relevant metadata tracked by SurfaceCache.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef mozilla_image_LookupResult_h
|
|
|
|
#define mozilla_image_LookupResult_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
|
|
|
|
2016-08-18 03:50:31 +03:00
|
|
|
#include "ISurfaceProvider.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 19:19:48 +03:00
|
|
|
#include "mozilla/Attributes.h"
|
|
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
2015-07-01 04:57:03 +03:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
namespace image {
|
|
|
|
|
2015-07-20 04:39:40 +03:00
|
|
|
enum class MatchType : uint8_t {
|
|
|
|
NOT_FOUND, // No matching surface and no placeholder.
|
|
|
|
PENDING, // Found a matching placeholder, but no surface.
|
|
|
|
EXACT, // Found a surface that matches exactly.
|
|
|
|
SUBSTITUTE_BECAUSE_NOT_FOUND, // No exact match, but found a similar one.
|
2017-09-05 14:58:45 +03:00
|
|
|
SUBSTITUTE_BECAUSE_PENDING, // Found a similar surface and a placeholder
|
2015-07-20 04:39:40 +03:00
|
|
|
// for an exact match.
|
2017-09-05 14:58:45 +03:00
|
|
|
|
|
|
|
/* No exact match, but this should be considered an exact match for purposes
|
|
|
|
* of deciding whether or not to request a new decode. This is because the
|
|
|
|
* cache has determined that callers require too many size variants of this
|
|
|
|
* image. It determines the set of sizes which best represent the image, and
|
|
|
|
* will only suggest decoding of unavailable sizes from that set. */
|
|
|
|
SUBSTITUTE_BECAUSE_BEST
|
2015-07-20 04:39:40 +03:00
|
|
|
};
|
|
|
|
|
2015-07-01 04:57:03 +03:00
|
|
|
/**
|
|
|
|
* LookupResult is the return type of SurfaceCache's Lookup*() functions. It
|
2016-08-16 03:58:35 +03:00
|
|
|
* combines a surface with relevant metadata tracked by SurfaceCache.
|
2015-07-01 04:57:03 +03:00
|
|
|
*/
|
|
|
|
class MOZ_STACK_CLASS LookupResult {
|
|
|
|
public:
|
2015-07-20 04:39:40 +03:00
|
|
|
explicit LookupResult(MatchType aMatchType) : mMatchType(aMatchType) {
|
|
|
|
MOZ_ASSERT(
|
|
|
|
mMatchType == MatchType::NOT_FOUND || mMatchType == MatchType::PENDING,
|
|
|
|
"Only NOT_FOUND or PENDING make sense with no surface");
|
|
|
|
}
|
2015-07-01 04:57:03 +03:00
|
|
|
|
|
|
|
LookupResult(LookupResult&& aOther)
|
2018-05-30 22:15:35 +03:00
|
|
|
: mSurface(std::move(aOther.mSurface)),
|
2015-07-20 04:39:40 +03:00
|
|
|
mMatchType(aOther.mMatchType),
|
2017-11-17 14:45:28 +03:00
|
|
|
mSuggestedSize(aOther.mSuggestedSize) {}
|
2015-07-01 04:57:03 +03:00
|
|
|
|
2016-08-18 03:50:31 +03:00
|
|
|
LookupResult(DrawableSurface&& aSurface, MatchType aMatchType)
|
2018-05-30 22:15:35 +03:00
|
|
|
: mSurface(std::move(aSurface)), mMatchType(aMatchType) {
|
2016-08-18 03:50:31 +03:00
|
|
|
MOZ_ASSERT(!mSurface || !(mMatchType == MatchType::NOT_FOUND ||
|
|
|
|
mMatchType == MatchType::PENDING),
|
2015-07-20 04:39:40 +03:00
|
|
|
"Only NOT_FOUND or PENDING make sense with no surface");
|
2016-08-18 03:50:31 +03:00
|
|
|
MOZ_ASSERT(mSurface || mMatchType == MatchType::NOT_FOUND ||
|
|
|
|
mMatchType == MatchType::PENDING,
|
2015-07-20 04:39:40 +03:00
|
|
|
"NOT_FOUND or PENDING do not make sense with a surface");
|
|
|
|
}
|
2015-07-01 04:57:03 +03:00
|
|
|
|
2019-04-11 22:30:48 +03:00
|
|
|
LookupResult(MatchType aMatchType, const gfx::IntSize& aSuggestedSize)
|
|
|
|
: mMatchType(aMatchType), mSuggestedSize(aSuggestedSize) {
|
|
|
|
MOZ_ASSERT(
|
|
|
|
mMatchType == MatchType::NOT_FOUND || mMatchType == MatchType::PENDING,
|
|
|
|
"Only NOT_FOUND or PENDING make sense with no surface");
|
|
|
|
}
|
|
|
|
|
2017-09-05 14:58:45 +03:00
|
|
|
LookupResult(DrawableSurface&& aSurface, MatchType aMatchType,
|
|
|
|
const gfx::IntSize& aSuggestedSize)
|
2018-05-30 22:15:35 +03:00
|
|
|
: mSurface(std::move(aSurface)),
|
2017-09-05 14:58:45 +03:00
|
|
|
mMatchType(aMatchType),
|
|
|
|
mSuggestedSize(aSuggestedSize) {
|
2017-11-17 14:45:28 +03:00
|
|
|
MOZ_ASSERT(!mSurface || !(mMatchType == MatchType::NOT_FOUND ||
|
|
|
|
mMatchType == MatchType::PENDING),
|
|
|
|
"Only NOT_FOUND or PENDING make sense with no surface");
|
|
|
|
MOZ_ASSERT(mSurface || mMatchType == MatchType::NOT_FOUND ||
|
|
|
|
mMatchType == MatchType::PENDING,
|
|
|
|
"NOT_FOUND or PENDING do not make sense with a surface");
|
2017-09-05 14:58:45 +03:00
|
|
|
}
|
|
|
|
|
2015-07-01 04:57:03 +03:00
|
|
|
LookupResult& operator=(LookupResult&& aOther) {
|
|
|
|
MOZ_ASSERT(&aOther != this, "Self-move-assignment is not supported");
|
2018-05-30 22:15:35 +03:00
|
|
|
mSurface = std::move(aOther.mSurface);
|
2015-07-20 04:39:40 +03:00
|
|
|
mMatchType = aOther.mMatchType;
|
2017-09-05 14:58:45 +03:00
|
|
|
mSuggestedSize = aOther.mSuggestedSize;
|
2015-07-01 04:57:03 +03:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2016-08-18 03:50:31 +03:00
|
|
|
DrawableSurface& Surface() { return mSurface; }
|
|
|
|
const DrawableSurface& Surface() const { return mSurface; }
|
2017-09-05 14:58:45 +03:00
|
|
|
const gfx::IntSize& SuggestedSize() const { return mSuggestedSize; }
|
2015-07-01 04:57:03 +03:00
|
|
|
|
2016-08-16 03:58:35 +03:00
|
|
|
/// @return true if this LookupResult contains a surface.
|
2016-08-18 03:50:31 +03:00
|
|
|
explicit operator bool() const { return bool(mSurface); }
|
2015-07-01 04:57:03 +03:00
|
|
|
|
2015-07-20 04:39:40 +03:00
|
|
|
/// @return what kind of match this is (exact, substitute, etc.)
|
|
|
|
MatchType Type() const { return mMatchType; }
|
2015-07-01 04:57:03 +03:00
|
|
|
|
|
|
|
private:
|
|
|
|
LookupResult(const LookupResult&) = delete;
|
2017-11-17 14:45:27 +03:00
|
|
|
LookupResult& operator=(const LookupResult& aOther) = delete;
|
2015-07-01 04:57:03 +03:00
|
|
|
|
2016-08-18 03:50:31 +03:00
|
|
|
DrawableSurface mSurface;
|
2015-07-20 04:39:40 +03:00
|
|
|
MatchType mMatchType;
|
2017-09-05 14:58:45 +03:00
|
|
|
|
2018-09-21 03:22:06 +03:00
|
|
|
/// mSuggestedSize will be the size of the returned surface if the result is
|
|
|
|
/// SUBSTITUTE_BECAUSE_BEST. It will be empty for EXACT, and can contain a
|
|
|
|
/// non-empty size possibly different from the returned surface (if any) for
|
|
|
|
/// all other results. If non-empty, it will always be the size the caller
|
|
|
|
/// should request any decodes at.
|
2017-09-05 14:58:45 +03:00
|
|
|
gfx::IntSize mSuggestedSize;
|
2015-07-01 04:57:03 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace image
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif // mozilla_image_LookupResult_h
|