Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make lib/ui/{text|window}/... compatible with .clang_tidy. #48000

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Make lib/ui/{text|window}/... compatible with .clang_tidy. #48000

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
342a8e5
Make `lib/ui/{text|window}/...` compatible with `.clang_tidy`.
matanlurey Nov 13, 2023
c9ce0dd
++
matanlurey Nov 13, 2023
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
2 changes: 0 additions & 2 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3741,7 +3741,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
Expand Down Expand Up @@ -6505,7 +6504,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
Expand Down
1 change: 0 additions & 1 deletion lib/ui/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion lib/ui/text/paragraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
28 changes: 0 additions & 28 deletions lib/ui/text/text_box.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions lib/ui/window/platform_message.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/window/platform_message.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand All @@ -36,7 +36,7 @@ class PlatformMessage {
private:
std::string channel_;
fml::MallocMapping data_;
bool hasData_;
bool has_data_;
fml::RefPtr<PlatformMessageResponse> response_;
};

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/window/pointer_data_packet_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down