DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-land "Make lib/ui/{text|window}/... compatible with .ci.yaml" (flutter/engine#48097)

Browse Source 
Reverts https://github.com/flutter/engine/pull/48083.
This commit is contained in:
Matan Lurey 2023-11-16 08:40:19 -08:00 committed by GitHub
parent a7cb9573ca
commit 4638f4fc85
8 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -3746,7 +3746,6 @@ ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/text/text_box.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/ui.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/ui_benchmarks.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/ui_dart_state.cc + ../../../flutter/LICENSE
@ -6517,7 +6516,6 @@ FILE: ../../../flutter/lib/ui/text/paragraph.cc
FILE: ../../../flutter/lib/ui/text/paragraph.h
FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
FILE: ../../../flutter/lib/ui/text/paragraph_builder.h
FILE: ../../../flutter/lib/ui/text/text_box.h
FILE: ../../../flutter/lib/ui/ui.dart
FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
FILE: ../../../flutter/lib/ui/ui_dart_state.cc

1
engine/src/flutter/lib/ui/BUILD.gn
View File

@ -128,7 +128,6 @@ source_set("ui") {
"text/paragraph.h",
"text/paragraph_builder.cc",
"text/paragraph_builder.h",
"text/text_box.h",
"ui_dart_state.cc",
"ui_dart_state.h",
"volatile_path_tracker.cc",

1
engine/src/flutter/lib/ui/text/paragraph.h
View File

@ -9,7 +9,6 @@
#include "flutter/lib/ui/dart_wrapper.h"
#include "flutter/lib/ui/painting/canvas.h"
#include "flutter/lib/ui/text/line_metrics.h"
#include "flutter/lib/ui/text/text_box.h"
#include "flutter/third_party/txt/src/txt/paragraph.h"
namespace flutter {

28
engine/src/flutter/lib/ui/text/text_box.h
View File

@ -1,28 +0,0 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
#define FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
#include "third_party/dart/runtime/include/dart_api.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/tonic/converter/dart_converter.h"
namespace flutter {
enum class TextDirection {
rtl,
ltr,
};
struct TextBox {
SkRect rect;
TextDirection direction;
TextBox(SkRect r, TextDirection d) : rect(r), direction(d) {}
};
} // namespace flutter
#endif // FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_

4
engine/src/flutter/lib/ui/window/platform_message.cc
View File

@ -13,13 +13,13 @@ PlatformMessage::PlatformMessage(std::string channel,
fml::RefPtr<PlatformMessageResponse> response)
: channel_(std::move(channel)),
data_(std::move(data)),
hasData_(true),
has_data_(true),
response_(std::move(response)) {}
PlatformMessage::PlatformMessage(std::string channel,
fml::RefPtr<PlatformMessageResponse> response)
: channel_(std::move(channel)),
data_(),
hasData_(false),
has_data_(false),
response_(std::move(response)) {}
PlatformMessage::~PlatformMessage() = default;

4
engine/src/flutter/lib/ui/window/platform_message.h
View File

@ -25,7 +25,7 @@ class PlatformMessage {
const std::string& channel() const { return channel_; }
const fml::MallocMapping& data() const { return data_; }
bool hasData() { return hasData_; }
bool hasData() { return has_data_; }
const fml::RefPtr<PlatformMessageResponse>& response() const {
return response_;
@ -36,7 +36,7 @@ class PlatformMessage {
private:
std::string channel_;
fml::MallocMapping data_;
bool hasData_;
bool has_data_;
fml::RefPtr<PlatformMessageResponse> response_;
};

2
engine/src/flutter/lib/ui/window/pointer_data_packet_converter.cc
View File

@ -11,7 +11,7 @@
namespace flutter {
PointerDataPacketConverter::PointerDataPacketConverter() : pointer_(0) {}
PointerDataPacketConverter::PointerDataPacketConverter() {}
PointerDataPacketConverter::~PointerDataPacketConverter() = default;

2
engine/src/flutter/lib/ui/window/pointer_data_packet_converter.h
View File

@ -99,7 +99,7 @@ class PointerDataPacketConverter {
private:
std::map<int64_t, PointerState> states_;
int64_t pointer_;
int64_t pointer_ = 0;
void ConvertPointerData(PointerData pointer_data,
std::vector<PointerData>& converted_pointers);