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

Revert PRs to unblock David and Jim's work #14088

Merged
merged 2 commits into from
Dec 3, 2019
Merged

Revert PRs to unblock David and Jim's work #14088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69ac8a7
Revert "Add flow test fixtures and tests (#13986)"
liyuqian Dec 3, 2019
4b3c7a7
Revert "Dynamically determine whether to use offscreen surface based …
liyuqian Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ group("flutter") {

# Fuchsia currently only supports a subset of our unit tests
if (is_fuchsia) {
public_deps += [
"$flutter_root/flow:flow_tests",
"$flutter_root/fml:fml_tests",
]
public_deps += [ "$flutter_root/fml:fml_tests" ]
}
}

Expand Down
14 changes: 0 additions & 14 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,24 @@ FILE: ../../../flutter/flow/instrumentation.cc
FILE: ../../../flutter/flow/instrumentation.h
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
FILE: ../../../flutter/flow/layers/backdrop_filter_layer_unittests.cc
FILE: ../../../flutter/flow/layers/child_scene_layer.cc
FILE: ../../../flutter/flow/layers/child_scene_layer.h
FILE: ../../../flutter/flow/layers/clip_path_layer.cc
FILE: ../../../flutter/flow/layers/clip_path_layer.h
FILE: ../../../flutter/flow/layers/clip_path_layer_unittests.cc
FILE: ../../../flutter/flow/layers/clip_rect_layer.cc
FILE: ../../../flutter/flow/layers/clip_rect_layer.h
FILE: ../../../flutter/flow/layers/clip_rect_layer_unittests.cc
FILE: ../../../flutter/flow/layers/clip_rrect_layer.cc
FILE: ../../../flutter/flow/layers/clip_rrect_layer.h
FILE: ../../../flutter/flow/layers/clip_rrect_layer_unittests.cc
FILE: ../../../flutter/flow/layers/color_filter_layer.cc
FILE: ../../../flutter/flow/layers/color_filter_layer.h
FILE: ../../../flutter/flow/layers/color_filter_layer_unittests.cc
FILE: ../../../flutter/flow/layers/container_layer.cc
FILE: ../../../flutter/flow/layers/container_layer.h
FILE: ../../../flutter/flow/layers/container_layer_unittests.cc
FILE: ../../../flutter/flow/layers/layer.cc
FILE: ../../../flutter/flow/layers/layer.h
FILE: ../../../flutter/flow/layers/layer_tree.cc
FILE: ../../../flutter/flow/layers/layer_tree.h
FILE: ../../../flutter/flow/layers/layer_tree_unittests.cc
FILE: ../../../flutter/flow/layers/layer_unittests.cc
FILE: ../../../flutter/flow/layers/opacity_layer.cc
FILE: ../../../flutter/flow/layers/opacity_layer.h
FILE: ../../../flutter/flow/layers/opacity_layer_unittests.cc
FILE: ../../../flutter/flow/layers/performance_overlay_layer.cc
FILE: ../../../flutter/flow/layers/performance_overlay_layer.h
FILE: ../../../flutter/flow/layers/performance_overlay_layer_unittests.cc
Expand All @@ -65,19 +56,14 @@ FILE: ../../../flutter/flow/layers/physical_shape_layer.h
FILE: ../../../flutter/flow/layers/physical_shape_layer_unittests.cc
FILE: ../../../flutter/flow/layers/picture_layer.cc
FILE: ../../../flutter/flow/layers/picture_layer.h
FILE: ../../../flutter/flow/layers/picture_layer_unittests.cc
FILE: ../../../flutter/flow/layers/platform_view_layer.cc
FILE: ../../../flutter/flow/layers/platform_view_layer.h
FILE: ../../../flutter/flow/layers/platform_view_layer_unittests.cc
FILE: ../../../flutter/flow/layers/shader_mask_layer.cc
FILE: ../../../flutter/flow/layers/shader_mask_layer.h
FILE: ../../../flutter/flow/layers/shader_mask_layer_unittests.cc
FILE: ../../../flutter/flow/layers/texture_layer.cc
FILE: ../../../flutter/flow/layers/texture_layer.h
FILE: ../../../flutter/flow/layers/texture_layer_unittests.cc
FILE: ../../../flutter/flow/layers/transform_layer.cc
FILE: ../../../flutter/flow/layers/transform_layer.h
FILE: ../../../flutter/flow/layers/transform_layer_unittests.cc
FILE: ../../../flutter/flow/matrix_decomposition.cc
FILE: ../../../flutter/flow/matrix_decomposition.h
FILE: ../../../flutter/flow/matrix_decomposition_unittests.cc
Expand Down
75 changes: 1 addition & 74 deletions flow/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

if (is_fuchsia) {
import("//build/fuchsia/sdk.gni")
import("$flutter_root/tools/fuchsia/fuchsia_archive.gni")
}

import("$flutter_root/testing/testing.gni")

source_set("flow") {
Expand Down Expand Up @@ -102,102 +102,29 @@ test_fixtures("flow_fixtures") {
fixtures = []
}

source_set("flow_testing") {
testonly = true

sources = [
"testing/layer_test.h",
"testing/mock_layer.cc",
"testing/mock_layer.h",
"testing/mock_texture.cc",
"testing/mock_texture.h",
"testing/skia_gpu_object_layer_test.cc",
"testing/skia_gpu_object_layer_test.h",
]

public_deps = [
":flow",
"$flutter_root/testing:skia",
"//third_party/googletest:gtest",
]
}

executable("flow_unittests") {
testonly = true

sources = [
"flow_run_all_unittests.cc",
"flow_test_utils.cc",
"flow_test_utils.h",
"layers/backdrop_filter_layer_unittests.cc",
"layers/clip_path_layer_unittests.cc",
"layers/clip_rect_layer_unittests.cc",
"layers/clip_rrect_layer_unittests.cc",
"layers/color_filter_layer_unittests.cc",
"layers/container_layer_unittests.cc",
"layers/layer_tree_unittests.cc",
"layers/layer_unittests.cc",
"layers/opacity_layer_unittests.cc",
"layers/performance_overlay_layer_unittests.cc",
"layers/physical_shape_layer_unittests.cc",
"layers/picture_layer_unittests.cc",
"layers/platform_view_layer_unittests.cc",
"layers/shader_mask_layer_unittests.cc",
"layers/texture_layer_unittests.cc",
"layers/transform_layer_unittests.cc",
"matrix_decomposition_unittests.cc",
"mutators_stack_unittests.cc",
"raster_cache_unittests.cc",
"skia_gpu_object_unittests.cc",
"testing/mock_layer_unittests.cc",
"testing/mock_texture_unittests.cc",
"texture_unittests.cc",
]

deps = [
":flow",
":flow_fixtures",
":flow_testing",
"$flutter_root/fml",
"$flutter_root/testing:skia",
"$flutter_root/testing:testing_lib",
"//third_party/dart/runtime:libdart_jit", # for tracing
"//third_party/googletest:gtest",
"//third_party/skia",
]
}

if (is_fuchsia) {
fuchsia_archive("flow_tests") {
testonly = true

deps = [
":flow_unittests",
]

binary = "flow_unittests"

libraries = common_libs

meta_dir = "$flutter_root/testing/fuchsia/meta"
cmx_file = "$meta_dir/fuchsia_test.cmx"

resources = [
{
path = rebase_path(
"$flutter_root/testing/resources/performance_overlay_gold_60fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_60fps.png"
},
{
path = rebase_path(
"$flutter_root/testing/resources/performance_overlay_gold_90fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_90fps.png"
},
{
path = rebase_path(
"$flutter_root/testing/resources/performance_overlay_gold_120fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_120fps.png"
},
]
}
}
17 changes: 0 additions & 17 deletions flow/embedded_views.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ class MutatorsStack {
// Returns an iterator pointing to the bottom of the stack.
const std::vector<std::shared_ptr<Mutator>>::const_reverse_iterator Bottom()
const;
bool is_empty() const { return vector_.empty(); }

bool operator==(const MutatorsStack& other) const {
if (vector_.size() != other.vector_.size()) {
Expand All @@ -157,26 +156,10 @@ class MutatorsStack {
return true;
}

bool operator==(const std::vector<Mutator>& other) const {
if (vector_.size() != other.size()) {
return false;
}
for (size_t i = 0; i < vector_.size(); i++) {
if (*vector_[i] != other[i]) {
return false;
}
}
return true;
}

bool operator!=(const MutatorsStack& other) const {
return !operator==(other);
}

bool operator!=(const std::vector<Mutator>& other) const {
return !operator==(other);
}

private:
std::vector<std::shared_ptr<Mutator>> vector_;
}; // MutatorsStack
Expand Down
7 changes: 0 additions & 7 deletions flow/flow_run_all_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

#include "flutter/fml/build_config.h"
#include "flutter/fml/command_line.h"
#include "flutter/fml/logging.h"
#include "gtest/gtest.h"
Expand All @@ -24,14 +23,8 @@
int main(int argc, char** argv) {
testing::InitGoogleTest(&argc, argv);
fml::CommandLine cmd = fml::CommandLineFromArgcArgv(argc, argv);

#if defined(OS_FUCHSIA)
flutter::SetGoldenDir(cmd.GetOptionValueWithDefault(
"golden-dir", "/pkg/data/flutter/testing/resources"));
#else
flutter::SetGoldenDir(
cmd.GetOptionValueWithDefault("golden-dir", "flutter/testing/resources"));
#endif
flutter::SetFontFile(cmd.GetOptionValueWithDefault(
"font-file",
"flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf"));
Expand Down
6 changes: 3 additions & 3 deletions flow/layers/backdrop_filter_layer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
namespace flutter {

BackdropFilterLayer::BackdropFilterLayer(sk_sp<SkImageFilter> filter)
: filter_(std::move(filter)) {
set_layer_reads_surface(filter_.get() != nullptr);
}
: filter_(std::move(filter)) {}

BackdropFilterLayer::~BackdropFilterLayer() = default;

void BackdropFilterLayer::Paint(PaintContext& context) const {
TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint");
Expand Down
1 change: 1 addition & 0 deletions flow/layers/backdrop_filter_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace flutter {
class BackdropFilterLayer : public ContainerLayer {
public:
BackdropFilterLayer(sk_sp<SkImageFilter> filter);
~BackdropFilterLayer() override;

void Paint(PaintContext& context) const override;

Expand Down
Loading