Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ group("flutter") {
# embeddings are being built.
if (enable_desktop_embeddings) {
public_deps += [
"//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
"//flutter/shell/platform/common:common_cpp_core_unittests",
"//flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
]

if (!is_fuchsia) {
# These tests require the embedder and thus cannot run on fuchsia.
# TODO(): Enable when embedder works on fuchsia.
public_deps +=
[ "//flutter/shell/platform/common/cpp:common_cpp_unittests" ]
[ "//flutter/shell/platform/common:common_cpp_unittests" ]

# These tests require GLFW and thus cannot run on fuchsia.
public_deps += [ "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests" ]
Expand Down
142 changes: 71 additions & 71 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -880,77 +880,77 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc
FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h
FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc
FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h
FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.cc
FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.h
FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/core_implementations.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/engine_method_result.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_codec.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h
FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.cc
FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.h
FILE: ../../../flutter/shell/platform/common/cpp/engine_switches_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.cc
FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.h
FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/geometry.h
FILE: ../../../flutter/shell/platform/common/cpp/geometry_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.cc
FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.h
FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.cc
FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.cc
FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.h
FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/path_utils.cc
FILE: ../../../flutter/shell/platform/common/cpp/path_utils.h
FILE: ../../../flutter/shell/platform/common/cpp/path_utils_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_export.h
FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_messenger.h
FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h
FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_texture_registrar.h
FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.cc
FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.h
FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.cc
FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.h
FILE: ../../../flutter/shell/platform/common/cpp/text_input_model_unittests.cc
FILE: ../../../flutter/shell/platform/common/cpp/text_range.h
FILE: ../../../flutter/shell/platform/common/cpp/text_range_unittests.cc
FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc
FILE: ../../../flutter/shell/platform/common/accessibility_bridge.h
FILE: ../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h
FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc
FILE: ../../../flutter/shell/platform/common/engine_switches.cc
FILE: ../../../flutter/shell/platform/common/engine_switches.h
FILE: ../../../flutter/shell/platform/common/engine_switches_unittests.cc
FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc
FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc
FILE: ../../../flutter/shell/platform/common/geometry.h
FILE: ../../../flutter/shell/platform/common/geometry_unittests.cc
FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc
FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h
FILE: ../../../flutter/shell/platform/common/json_message_codec.cc
FILE: ../../../flutter/shell/platform/common/json_message_codec.h
FILE: ../../../flutter/shell/platform/common/json_message_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/json_method_codec.cc
FILE: ../../../flutter/shell/platform/common/json_method_codec.h
FILE: ../../../flutter/shell/platform/common/json_method_codec_unittests.cc
FILE: ../../../flutter/shell/platform/common/path_utils.cc
FILE: ../../../flutter/shell/platform/common/path_utils.h
FILE: ../../../flutter/shell/platform/common/path_utils_unittests.cc
FILE: ../../../flutter/shell/platform/common/public/flutter_export.h
FILE: ../../../flutter/shell/platform/common/public/flutter_messenger.h
FILE: ../../../flutter/shell/platform/common/public/flutter_plugin_registrar.h
FILE: ../../../flutter/shell/platform/common/public/flutter_texture_registrar.h
FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc
FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.h
FILE: ../../../flutter/shell/platform/common/text_input_model.cc
FILE: ../../../flutter/shell/platform/common/text_input_model.h
FILE: ../../../flutter/shell/platform/common/text_input_model_unittests.cc
FILE: ../../../flutter/shell/platform/common/text_range.h
FILE: ../../../flutter/shell/platform/common/text_range_unittests.cc
FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
FILE: ../../../flutter/shell/platform/darwin/common/command_line.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ source_set("common_cpp") {

deps = [
":common_cpp_library_headers",
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
"//flutter/shell/platform/common/client_wrapper:client_wrapper",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
]

Expand Down Expand Up @@ -175,8 +175,8 @@ if (enable_unittests) {
":common_cpp_fixtures",
":common_cpp_input",
":common_cpp_switches",
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs",
"//flutter/shell/platform/common/client_wrapper:client_wrapper",
"//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
"//flutter/testing",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ source_set("client_wrapper") {
public = core_cpp_client_wrapper_includes +
core_cpp_client_wrapper_internal_headers

deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]

configs +=
[ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
[ "//flutter/shell/platform/common:desktop_library_implementation" ]

public_configs =
[ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ]
[ "//flutter/shell/platform/common:relative_flutter_library_headers" ]
}

source_set("client_wrapper_library_stubs") {
Expand All @@ -28,8 +28,7 @@ source_set("client_wrapper_library_stubs") {

defines = [ "FLUTTER_DESKTOP_LIBRARY" ]

public_deps =
[ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
}

test_fixtures("client_wrapper_fixtures") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"

#include <memory>
#include <string>

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
#include "gtest/gtest.h"

namespace flutter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"

#include <limits>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h"

#include <memory>
#include <string>

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h"
#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
#include "gtest/gtest.h"

namespace flutter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class CustomEncodableValue {
~CustomEncodableValue() = default;

// Allow implict conversion to std::any to allow direct use of any_cast.
operator std::any &() { return value_; }
operator const std::any &() const { return value_; }
operator std::any&() { return value_; }
operator const std::any&() const { return value_; }

#if defined(FLUTTER_ENABLE_RTTI) && FLUTTER_ENABLE_RTTI
// Passthrough to std::any's type().
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h"

#include <memory>
#include <string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"

#include <memory>
#include <string>

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
#include "gtest/gtest.h"

namespace flutter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"

#include <functional>
#include <string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"

#include <memory>
#include <vector>

#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h"
#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h"
#include "gtest/gtest.h"

namespace flutter {
Expand Down
Loading