Commit f6714781 authored by Jeremy Roman's avatar Jeremy Roman Committed by Commit Bot

Merge identical branches in TextEncoding::IsNonByteBasedEncoding.

They have been identical since UTF-32 support was removed three years
ago:
  https://chromium-review.googlesource.com/c/chromium/src/+/559995/

Bug: 417850
Change-Id: I9db2a9a8a94d18732e8c45caaaffc443ab387f71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401341
Auto-Submit: Jeremy Roman <jbroman@chromium.org>
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Reviewed-by: default avatarJoshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806417}
parent d0916ed6
...@@ -82,11 +82,6 @@ bool TextEncoding::UsesVisualOrdering() const { ...@@ -82,11 +82,6 @@ bool TextEncoding::UsesVisualOrdering() const {
} }
bool TextEncoding::IsNonByteBasedEncoding() const { bool TextEncoding::IsNonByteBasedEncoding() const {
if (NoExtendedTextEncodingNameUsed()) {
return *this == UTF16LittleEndianEncoding() ||
*this == UTF16BigEndianEncoding();
}
return *this == UTF16LittleEndianEncoding() || return *this == UTF16LittleEndianEncoding() ||
*this == UTF16BigEndianEncoding(); *this == UTF16BigEndianEncoding();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment