gecko-dev/gfx/2d/Triangle.h

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

62 строки
1.7 KiB
C
Исходник Обычный вид История

/* -*- 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
* 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_TRIANGLE_H
#define MOZILLA_GFX_TRIANGLE_H
#include <algorithm>
#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 "Point.h"
#include "Rect.h"
namespace mozilla {
namespace gfx {
/**
* A simple triangle data structure.
*/
template <class Units, class F = Float>
struct TriangleTyped {
PointTyped<Units, F> p1, p2, p3;
TriangleTyped() : p1(), p2(), p3() {}
TriangleTyped(PointTyped<Units, F> aP1, PointTyped<Units, F> aP2,
PointTyped<Units, F> aP3)
: p1(aP1), p2(aP2), p3(aP3) {}
RectTyped<Units, F> BoundingBox() const {
F minX = std::min(std::min(p1.x, p2.x), p3.x);
F maxX = std::max(std::max(p1.x, p2.x), p3.x);
F minY = std::min(std::min(p1.y, p2.y), p3.y);
F maxY = std::max(std::max(p1.y, p2.y), p3.y);
return RectTyped<Units, F>(minX, minY, maxX - minX, maxY - minY);
}
};
typedef TriangleTyped<UnknownUnits, Float> Triangle;
template <class Units, class F = Float>
struct TexturedTriangleTyped : public TriangleTyped<Units, F> {
explicit TexturedTriangleTyped(const TriangleTyped<Units, F>& aTriangle)
: TriangleTyped<Units, F>(aTriangle) {}
explicit TexturedTriangleTyped(TriangleTyped<Units, F>&& aTriangle)
: TriangleTyped<Units, F>(std::move(aTriangle)) {}
TriangleTyped<Units, F> textureCoords;
};
typedef TexturedTriangleTyped<UnknownUnits, Float> TexturedTriangle;
} // namespace gfx
} // namespace mozilla
#endif /* MOZILLA_GFX_TRIANGLE_H */