Skip to content

Commit 182b595

Browse files
authored
Finish landing missing/incorrect header guards across flutter/engine (flutter#50069)
Generated by flutter/engine#48903 (`dart ./tools/header_guard_check/bin/main.dart --fix`). As discussed with @cbracken and @jmagman, the guards are not technically needed on the Mac/iOS code, but they (a) do not hurt and (b) still provide value if for some reason `#include` is used instead of `#import` (though I suspect we could try to add that to the tool in the future as well).
1 parent ce10577 commit 182b595

File tree

70 files changed

+347
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+347
-7
lines changed

impeller/aiks/aiks_playground_inspector.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_
6+
#define FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_
7+
58
#include <functional>
69
#include <optional>
710

@@ -48,3 +51,5 @@ class AiksInspector {
4851
};
4952

5053
}; // namespace impeller
54+
55+
#endif // FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_

impeller/compiler/shader_bundle.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_
6+
#define FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_
7+
58
#include "impeller/compiler/source_options.h"
69
#include "impeller/compiler/switches.h"
710
#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
@@ -33,3 +36,5 @@ bool GenerateShaderBundle(Switches& switches);
3336

3437
} // namespace compiler
3538
} // namespace impeller
39+
40+
#endif // FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_

impeller/renderer/backend/gles/test/mock_gles.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_
6+
#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_
7+
58
#include <memory>
69
#include <optional>
710
#include "fml/macros.h"
@@ -60,3 +63,5 @@ class MockGLES final {
6063

6164
} // namespace testing
6265
} // namespace impeller
66+
67+
#endif // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_

impeller/renderer/backend/vulkan/gpu_tracer_vk.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_
6+
#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_
7+
58
#include <memory>
69
#include <thread>
710

@@ -115,3 +118,5 @@ class GPUProbe {
115118
};
116119

117120
} // namespace impeller
121+
122+
#endif // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_

impeller/renderer/texture_mipmap.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_IMPELLER_TEXTURE_MIPMAP_H_
6-
#define FLUTTER_IMPELLER_TEXTURE_MIPMAP_H_
5+
#ifndef FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_
6+
#define FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_
77

88
#include "flutter/fml/status.h"
99
#include "impeller/core/texture.h"
@@ -20,4 +20,4 @@ namespace impeller {
2020

2121
} // namespace impeller
2222

23-
#endif // FLUTTER_IMPELLER_TEXTURE_MIPMAP_H_
23+
#endif // FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_

lib/gpu/fixtures.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_LIB_GPU_FIXTURES_H_
6+
#define FLUTTER_LIB_GPU_FIXTURES_H_
7+
58
#include "impeller/core/shader_types.h"
69

710
struct FlutterGPUUnlitVertexShader {
811
struct PerVertexData {
912
impeller::Point position; // (offset 0, size 8)
10-
}; // struct PerVertexData (size 8)
13+
}; // struct PerVertexData (size 8)
1114

1215
static constexpr auto kInputPosition = impeller::ShaderStageIOSlot{
1316
// position
@@ -46,7 +49,7 @@ struct FlutterGPUTextureVertexShader {
4649
impeller::Vector3 position; // (offset 0, size 12)
4750
impeller::Point texture_coords; // (offset 12, size 8)
4851
impeller::Vector4 color; // (offset 20, size 16)
49-
}; // struct PerVertexData (size 36)
52+
}; // struct PerVertexData (size 36)
5053

5154
static constexpr auto kInputTextureCoords = impeller::ShaderStageIOSlot{
5255
// texture_coords
@@ -107,3 +110,5 @@ extern unsigned char kFlutterGPUTextureVertIPLR[];
107110

108111
constexpr unsigned int kFlutterGPUTextureFragIPLRLength = 800;
109112
extern unsigned char kFlutterGPUTextureFragIPLR[];
113+
114+
#endif // FLUTTER_LIB_GPU_FIXTURES_H_

lib/gpu/formats.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_LIB_GPU_FORMATS_H_
6+
#define FLUTTER_LIB_GPU_FORMATS_H_
7+
58
#include "fml/logging.h"
69
#include "impeller/core/formats.h"
710
#include "impeller/core/shader_types.h"
@@ -500,3 +503,5 @@ constexpr impeller::StencilOperation ToImpellerStencilOperation(int value) {
500503

501504
} // namespace gpu
502505
} // namespace flutter
506+
507+
#endif // FLUTTER_LIB_GPU_FORMATS_H_

lib/ui/painting/image_decoder_no_gl_unittests.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_
6+
#define FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_
7+
58
#include <stdint.h>
69

710
#include "flutter/impeller/core/allocator.h"
@@ -99,3 +102,5 @@ float DecodeBGR10(uint32_t x);
99102

100103
} // namespace testing
101104
} // namespace flutter
105+
106+
#endif // FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_

lib/web_ui/skwasm/skwasm_support.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_
6+
#define FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_
7+
58
#include <emscripten/threading.h>
69
#include <cinttypes>
710
#include "third_party/skia/include/core/SkPicture.h"
@@ -36,3 +39,5 @@ extern unsigned int skwasm_createGlTextureFromTextureSource(
3639
int width,
3740
int height);
3841
}
42+
43+
#endif // FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_

shell/common/vsync_waiters_test.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#define FML_USED_ON_EMBEDDER
6-
75
#ifndef FLUTTER_SHELL_COMMON_VSYNC_WAITERS_TEST_H_
86
#define FLUTTER_SHELL_COMMON_VSYNC_WAITERS_TEST_H_
97

8+
#define FML_USED_ON_EMBEDDER
9+
1010
#include <utility>
1111

1212
#include "flutter/shell/common/shell.h"

0 commit comments

Comments
 (0)