Bug 1573249 followup, clang-format nits. r=dholbert
authorJonathan Kew <jkew@mozilla.com>
Wed, 21 Aug 2019 19:37:24 +0000
changeset 489412 5b03a028f23a58feb8d549174437b473a612545c
parent 489411 151d38734b7f77e7791103d1612ba8d935676c02
child 489413 9a87c2e0fea525519d00da099ad9064faa5aff64
push id93319
push userjkew@mozilla.com
push dateThu, 22 Aug 2019 09:18:49 +0000
treeherderautoland@5b03a028f23a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1573249
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1573249 followup, clang-format nits. r=dholbert Differential Revision: https://phabricator.services.mozilla.com/D42938
gfx/thebes/gfxTextRun.cpp
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -1327,19 +1327,18 @@ void gfxTextRun::SortGlyphRuns() {
   // Now copy back, coalescing adjacent glyph runs that have the same
   // properties.
   mGlyphRunArray.Clear();
   GlyphRun* prevRun = nullptr;
   for (auto& run : runs) {
     // A GlyphRun with the same font and orientation as the previous can
     // just be skipped; the last GlyphRun will cover its character range.
     MOZ_ASSERT(run.mFont != nullptr);
-    if (!prevRun ||
-        !prevRun->Matches(run.mFont, run.mOrientation, run.mIsCJK,
-                          run.mMatchType)) {
+    if (!prevRun || !prevRun->Matches(run.mFont, run.mOrientation, run.mIsCJK,
+                                      run.mMatchType)) {
       // If two font runs have the same character offset, Sort() will have
       // randomized their order!
       MOZ_ASSERT(prevRun == nullptr ||
                      prevRun->mCharacterOffset < run.mCharacterOffset,
                  "Two fonts for the same run, glyph indices unreliable");
       prevRun = mGlyphRunArray.AppendElement(std::move(run));
     }
   }