Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 190272f

Browse files
author
George Wright
committed
formatting
1 parent 41c1017 commit 190272f

File tree

10 files changed

+25
-31
lines changed

10 files changed

+25
-31
lines changed

shell/common/BUILD.gn

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ template("shell_host_executable") {
160160
"//third_party/skia",
161161
]
162162

163-
public_configs = [
164-
"//flutter:export_dynamic_symbols",
165-
]
163+
public_configs = [ "//flutter:export_dynamic_symbols" ]
166164
}
167165
}
168166

@@ -226,9 +224,7 @@ if (enable_unittests) {
226224
"shell_test_platform_view_gl.h",
227225
]
228226

229-
deps += [
230-
"//flutter/testing:opengl",
231-
]
227+
deps += [ "//flutter/testing:opengl" ]
232228

233229
defines += [ "SHELL_ENABLE_GL" ]
234230
}
@@ -284,4 +280,4 @@ if (enable_unittests) {
284280
"//flutter/testing:testing_lib",
285281
]
286282
}
287-
}
283+
}

shell/common/animator_unittests.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ TEST_F(ShellTest, VSyncTargetTime) {
5252
shell = Shell::Create(
5353
task_runners, settings,
5454
[vsync_clock, &create_vsync_waiter](Shell& shell) {
55-
return ShellTestPlatformView::Create(shell, shell.GetTaskRunners(),
56-
vsync_clock,
57-
std::move(create_vsync_waiter),
58-
ShellTestPlatformView::BackendType::kDefaultBackend);
55+
return ShellTestPlatformView::Create(
56+
shell, shell.GetTaskRunners(), vsync_clock,
57+
std::move(create_vsync_waiter),
58+
ShellTestPlatformView::BackendType::kDefaultBackend);
5959
},
6060
[](Shell& shell) {
6161
return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());

shell/common/shell_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ std::unique_ptr<Shell> ShellTest::CreateShell(Settings settings,
254254
return Shell::Create(
255255
task_runners, settings,
256256
[vsync_clock, &create_vsync_waiter](Shell& shell) {
257-
return ShellTestPlatformView::Create(shell, shell.GetTaskRunners(),
258-
vsync_clock,
259-
std::move(create_vsync_waiter),
260-
ShellTestPlatformView::BackendType::kDefaultBackend);
257+
return ShellTestPlatformView::Create(
258+
shell, shell.GetTaskRunners(), vsync_clock,
259+
std::move(create_vsync_waiter),
260+
ShellTestPlatformView::BackendType::kDefaultBackend);
261261
},
262262
[](Shell& shell) {
263263
return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());

shell/common/shell_test_platform_view.cc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
#ifdef SHELL_ENABLE_GL
88
#include "flutter/shell/common/shell_test_platform_view_gl.h"
9-
#endif // SHELL_ENABLE_GL
9+
#endif // SHELL_ENABLE_GL
1010
#ifdef SHELL_ENABLE_VULKAN
1111
#include "flutter/shell/common/shell_test_platform_view_vulkan.h"
12-
#endif // SHELL_ENABLE_VULKAN
12+
#endif // SHELL_ENABLE_VULKAN
1313

1414
namespace flutter {
1515
namespace testing {
@@ -20,20 +20,19 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
2020
std::shared_ptr<ShellTestVsyncClock> vsync_clock,
2121
CreateVsyncWaiter create_vsync_waiter,
2222
BackendType backend) {
23-
2423
// TODO(gw280): Make this fully runtime configurable
2524
switch (backend) {
2625
case BackendType::kDefaultBackend:
2726
#ifdef SHELL_ENABLE_GL
2827
case BackendType::kGLBackend:
2928
return std::make_unique<ShellTestPlatformViewGL>(
30-
delegate, task_runners, vsync_clock, create_vsync_waiter);
31-
#endif // SHELL_ENABLE_GL
29+
delegate, task_runners, vsync_clock, create_vsync_waiter);
30+
#endif // SHELL_ENABLE_GL
3231
#ifdef SHELL_ENABLE_VULKAN
3332
case BackendType::kVulkanBackend:
3433
return std::make_unique<ShellTestPlatformViewVulkan>(
35-
delegate, task_runners, vsync_clock, create_vsync_waiter);
36-
#endif // SHELL_ENABLE_VULKAN
34+
delegate, task_runners, vsync_clock, create_vsync_waiter);
35+
#endif // SHELL_ENABLE_VULKAN
3736
default:
3837
FML_LOG(FATAL) << "No backends supported for ShellTestPlatformView";
3938
return nullptr;

shell/common/shell_test_platform_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace testing {
1414
class ShellTestPlatformView : public PlatformView {
1515
public:
1616
enum class BackendType {
17-
kGLBackend,
18-
kVulkanBackend,
19-
kDefaultBackend,
17+
kGLBackend,
18+
kVulkanBackend,
19+
kDefaultBackend,
2020
};
2121

2222
static std::unique_ptr<ShellTestPlatformView> Create(

shell/common/shell_test_platform_view_vulkan.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace flutter {
1212
namespace testing {
1313

1414
class ShellTestPlatformViewVulkan : public ShellTestPlatformView,
15-
public GPUSurfaceVulkanDelegate {
15+
public GPUSurfaceVulkanDelegate {
1616
public:
1717
ShellTestPlatformViewVulkan(PlatformView::Delegate& delegate,
1818
TaskRunners task_runners,

shell/common/shell_unittests.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ TEST_F(ShellTest,
135135
[task_runners = shell.GetTaskRunners()]() {
136136
return static_cast<std::unique_ptr<VsyncWaiter>>(
137137
std::make_unique<VsyncWaiterFallback>(task_runners));
138-
}, ShellTestPlatformView::BackendType::kDefaultBackend);
138+
},
139+
ShellTestPlatformView::BackendType::kDefaultBackend);
139140
},
140141
[](Shell& shell) {
141142
return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());

shell/config.gni

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ declare_args() {
77
shell_enable_metal = false
88
stripped_symbols = true
99
}
10-

testing/elf_loader.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ELFAOTSymbols LoadELFSymbolFromFixturesIfNeccessary() {
4646
&symbols.vm_isolate_data, // vm isolate data (out)
4747
&symbols.vm_isolate_instrs // vm isolate instr (out)
4848
);
49-
#endif // defined(OS_FUCHSIA)
49+
#endif // defined(OS_FUCHSIA)
5050

5151
if (loaded_elf == nullptr) {
5252
FML_LOG(ERROR)

testing/testing.gni

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ is_aot_test =
1111

1212
# Unit tests targets are only enabled for host machines and Fuchsia right now
1313
declare_args() {
14-
enable_unittests =
15-
(current_toolchain == host_toolchain) || is_fuchsia
14+
enable_unittests = current_toolchain == host_toolchain || is_fuchsia
1615
}
1716

1817
# Creates a translation unit that defines the flutter::testing::GetFixturesPath

0 commit comments

Comments
 (0)