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

Conversation

@cbracken
Copy link
Member

Eliminate Win32 suffixes in Windows embedder

Now that we've removed the UWP embedder, eliminate remaining Win32
suffixes on identifiers and _win32 suffixes from filenames.

This renames all files and types ending in _win32/Win32 that don't
require further rework/merging/simplification.

No additional tests since this is a renaming only with no semantic change.

Issue: flutter/flutter#108386

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

}

void FlutterWindowsEngine::UpdateSemanticsEnabled(bool enabled) {
using AccessibilityBridgeDelegateWindows = AccessibilityBridgeDelegateWin32;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should probably have cleaned this up when I deleted the #ifdef'ed Win32/UWP; no longer necessary either way.

@cbracken
Copy link
Member Author

The licence script will fail; I'll push an update for that once that happens :)

Copy link
Contributor

@gspencergoog gspencergoog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

32384589-a60f0e74-c078-11e7-9bc1-e5b5287aea9d

namespace flutter {

// A win32 flutter child window used as implementations for flutter view. In
// the future, there will likely be a CoreWindow-based FlutterWindow as well.
Copy link
Member

@loic-sharma loic-sharma Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CoreWindow is UWP, right? This comment seems stale, should we delete it?

#include "flutter/shell/platform/windows/event_watcher.h"

namespace flutter {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this type & file be renamed as well?

@loic-sharma
Copy link
Member

For my own knowledge (feel free to punt this for later!), should these files be updated as well? Or are their win32 suffixes not redundant for some reason?

  • keyboard_manager_win32.cc
  • keyboard_manager_win32.h
  • keyboard_win32_common.cc
  • keyboard_win32_common.h
  • keyboard_win32_common_unittests.cc
  • keyboard_win32_unittests.cc
  • platform_handler_win32.cc
  • platform_handler_win32.h
  • platform_handler_win32_unittests.cc
  • task_runner_win32.cc
  • task_runner_win32.h
  • task_runner_win32_window.cc
  • task_runner_win32_window.h

@cbracken
Copy link
Member Author

Or are their win32 suffixes not redundant for some reason?

Those need to be done, but will be done in separate one-by-one PRs since they don't fall into the "files and types ending in _win32/Win32 that don't require further rework/merging/simplification" in this PR. Sorry for not calling that out more explicitly in the PR description. I'll edit comment to clarify in the merge.

@cbracken cbracken merged commit 8f1c93d into flutter:main Jul 29, 2022
@cbracken cbracken deleted the un-win32 branch July 29, 2022 17:16
@loic-sharma
Copy link
Member

Gotcha that makes sense! :)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 29, 2022
emilyabest pushed a commit to emilyabest/engine that referenced this pull request Aug 12, 2022
Now that we've removed the UWP embedder, eliminate remaining Win32
suffixes on identifiers and _win32 suffixes from filenames.

This renames all files and types ending in _win32/Win32 that don't
require further rework/merging/simplification. All remaining files/types
ending in _win32/Win32 are less straightforward and will be submitted
class by class.

Issue: flutter/flutter#108386
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants