Continue converting to explicit LayoutUnit constructors

third_party/WebKit/Source/core/layout/line/LineLayoutState.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2014 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 27 matching lines @@
     LineLayoutState(bool fullLayout, LayoutUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutFlowThread* flowThread)
         : m_lastFloat(nullptr)
         , m_endLine(nullptr)
         , m_floatIndex(0)
         , m_endLineLogicalTop(0)
         , m_endLineMatched(false)
         , m_hasInlineChild(false)
         , m_isFullLayout(fullLayout)
         , m_paintInvalidationLogicalTop(paintInvalidationLogicalTop)
         , m_paintInvalidationLogicalBottom(paintInvalidationLogicalBottom)
-        , m_adjustedLogicalLineTop(0)
         , m_usesPaintInvalidationBounds(false)
         , m_flowThread(flowThread)
     { }
 
     void markForFullLayout() { m_isFullLayout = true; }
     bool isFullLayout() const { return m_isFullLayout; }
 
     bool usesPaintInvalidationBounds() const { return m_usesPaintInvalidationBounds; }
 
     void setPaintInvalidationRange(LayoutUnit logicalHeight)
     {
         m_usesPaintInvalidationBounds = true;
         m_paintInvalidationLogicalTop = m_paintInvalidationLogicalBottom = logicalHeight;
     }
 
-    void updatePaintInvalidationRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = 0)
+    void updatePaintInvalidationRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = LayoutUnit())
     {
         m_usesPaintInvalidationBounds = true;
-        m_paintInvalidationLogicalTop = std::min(m_paintInvalidationLogicalTop, box->logicalTopVisualOverflow() + std::min<LayoutUnit>(paginationDelta, 0));
-        m_paintInvalidationLogicalBottom = std::max(m_paintInvalidationLogicalBottom, box->logicalBottomVisualOverflow() + std::max<LayoutUnit>(paginationDelta, 0));
+        m_paintInvalidationLogicalTop = std::min(m_paintInvalidationLogicalTop, box->logicalTopVisualOverflow() + paginationDelta.clampPositiveToZero());
+        m_paintInvalidationLogicalBottom = std::max(m_paintInvalidationLogicalBottom, box->logicalBottomVisualOverflow() + paginationDelta.clampNegativeToZero());
     }
 
     bool endLineMatched() const { return m_endLineMatched; }
     void setEndLineMatched(bool endLineMatched) { m_endLineMatched = endLineMatched; }
 
     bool hasInlineChild() const { return m_hasInlineChild; }
     void setHasInlineChild(bool hasInlineChild) { m_hasInlineChild = hasInlineChild; }
 
 
     LineInfo& lineInfo() { return m_lineInfo; }
@@ skipping 39 matching lines @@
     LayoutUnit m_adjustedLogicalLineTop;
 
     bool m_usesPaintInvalidationBounds;
 
     LayoutFlowThread* m_flowThread;
 };
 
 } // namespace blink
 
 #endif // LineLayoutState_h