DO NOT COMMIT: Results of running new (proposed) clang-format on Blink

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 619 matching lines @@
                                        segment.renderOrientation);
 
     CaseMapIntend caseMapIntend = CaseMapIntend::KeepSameCase;
     if (needsCapsHandling)
       caseMapIntend = capsSupport.needsCaseChange(smallCapsBehavior);
 
     // Clamp the start and end offsets of the queue item to the offsets
     // representing the shaping window.
     unsigned shapeStart =
         std::max(rangeData->start, currentQueueItem.m_startIndex);
-    unsigned shapeEnd =
-        std::min(rangeData->end, currentQueueItem.m_startIndex +
-                                     currentQueueItem.m_numCharacters);
+    unsigned shapeEnd = std::min(
+        rangeData->end,
+        currentQueueItem.m_startIndex + currentQueueItem.m_numCharacters);
 
     CaseMappingHarfBuzzBufferFiller(
         caseMapIntend, fontDescription.localeOrDefault(), rangeData->buffer,
         m_text, m_textLength, shapeStart, shapeEnd - shapeStart);
 
     CapsFeatureSettingsScopedOverlay capsOverlay(
         &rangeData->fontFeatures,
         capsSupport.fontFeatureToUse(smallCapsBehavior));
     hb_direction_t direction =
         rangeData->harfBuzzDirection(directionAndSmallCapsAdjustedFont);
 
-    if (!shapeRange(rangeData->buffer, rangeData->fontFeatures.isEmpty()
-                                           ? 0
-                                           : rangeData->fontFeatures.data(),
-                    rangeData->fontFeatures.size(),
-                    directionAndSmallCapsAdjustedFont,
-                    currentFontDataForRangeSet->ranges(), segment.script,
-                    direction, language))
+    if (!shapeRange(
+            rangeData->buffer,
+            rangeData->fontFeatures.isEmpty() ? 0
+                                              : rangeData->fontFeatures.data(),
+            rangeData->fontFeatures.size(), directionAndSmallCapsAdjustedFont,
+            currentFontDataForRangeSet->ranges(), segment.script, direction,
+            language))
       DLOG(ERROR) << "Shaping range failed.";
 
     if (!extractShapeResults(rangeData, fontCycleQueued, currentQueueItem,
                              directionAndSmallCapsAdjustedFont, segment.script,
                              !fallbackIterator->hasNext(), result))
       DLOG(ERROR) << "Shape result extraction failed.";
 
     hb_buffer_reset(rangeData->buffer);
   }
 }
@@ skipping 30 matching lines @@
       shapeSegment(&rangeData, segmentRange, result.get());
   }
   return result.release();
 }
 
 PassRefPtr<ShapeResult> HarfBuzzShaper::shape(const Font* font,
                                               TextDirection direction) const {
   return shape(font, direction, 0, m_textLength);
 }
 }  // namespace blink