Lists: Minor code style revisions.

third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * 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
@@ skipping 18 matching lines @@
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/TextRunConstructor.h"
 #include "core/paint/ListMarkerPainter.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/fonts/Font.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-const int cMarkerPadding = 7;
+const int cMarkerPaddingPx = 7;
 
 enum SequenceType { NumericSequence, AlphabeticSequence };
 
 static String toRoman(int number, bool upper)
 {
     // FIXME: CSS3 describes how to make this work for much larger numbers,
     // using overbars and special characters. It also specifies the characters
     // in the range U+2160 to U+217F instead of standard ASCII ones.
     ASSERT(number >= 1 && number <= 3999);
 
@@ skipping 977 matching lines @@
 {
     return m_image && !m_image->errorOccurred();
 }
 
 LayoutRect LayoutListMarker::localSelectionRect() const
 {
     InlineBox* box = inlineBoxWrapper();
     if (!box)
         return LayoutRect(LayoutPoint(), size());
     RootInlineBox& root = inlineBoxWrapper()->root();
-    LayoutUnit newLogicalTop = root.block().style()->isFlippedBlocksWritingMode() ? inlineBoxWrapper()->logicalBottom() - root.selectionBottom() : root.selectionTop() - inlineBoxWrapper()->logicalTop();
-    if (root.block().style()->isHorizontalWritingMode())
-        return LayoutRect(0, newLogicalTop, size().width(), root.selectionHeight());
-    return LayoutRect(newLogicalTop, 0, root.selectionHeight(), size().height());
+    const ComputedStyle* blockStyle = root.block().style();
+    LayoutUnit newLogicalTop = blockStyle->isFlippedBlocksWritingMode()
+        ? inlineBoxWrapper()->logicalBottom() - root.selectionBottom()
+        : root.selectionTop() - inlineBoxWrapper()->logicalTop();
+    return blockStyle->isHorizontalWritingMode()
+        ? LayoutRect(0, newLogicalTop, size().width(), root.selectionHeight())
+        : LayoutRect(newLogicalTop, 0, root.selectionHeight(), size().height());
 }
 
 void LayoutListMarker::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     ListMarkerPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void LayoutListMarker::layout()
 {
     ASSERT(needsLayout());
@@ skipping 121 matching lines @@
 
 void LayoutListMarker::updateMargins()
 {
     const FontMetrics& fontMetrics = style()->fontMetrics();
 
     LayoutUnit marginStart = 0;
     LayoutUnit marginEnd = 0;
 
     if (isInside()) {
         if (isImage()) {
-            marginEnd = cMarkerPadding;
+            marginEnd = cMarkerPaddingPx;
         } else {
             switch (listStyleCategory()) {
             case ListStyleCategory::Symbol:
                 marginStart = -1;
                 marginEnd = fontMetrics.ascent() - minPreferredLogicalWidth() + 1;
                 break;
             default:
                 break;
             }
         }
     } else {
         if (style()->isLeftToRightDirection()) {
             if (isImage()) {
-                marginStart = -minPreferredLogicalWidth() - cMarkerPadding;
+                marginStart = -minPreferredLogicalWidth() - cMarkerPaddingPx;
             } else {
                 int offset = fontMetrics.ascent() * 2 / 3;
                 switch (listStyleCategory()) {
                 case ListStyleCategory::None:
                     break;
                 case ListStyleCategory::Symbol:
-                    marginStart = -offset - cMarkerPadding - 1;
+                    marginStart = -offset - cMarkerPaddingPx - 1;
                     break;
                 default:
                     marginStart = m_text.isEmpty() ? LayoutUnit() : -minPreferredLogicalWidth();
                 }
             }
             marginEnd = -marginStart - minPreferredLogicalWidth();
         } else {
             if (isImage()) {
-                marginEnd = cMarkerPadding;
+                marginEnd = cMarkerPaddingPx;
             } else {
                 int offset = fontMetrics.ascent() * 2 / 3;
                 switch (listStyleCategory()) {
                 case ListStyleCategory::None:
                     break;
                 case ListStyleCategory::Symbol:
-                    marginEnd = offset + cMarkerPadding + 1 - minPreferredLogicalWidth();
+                    marginEnd = offset + cMarkerPaddingPx + 1 - minPreferredLogicalWidth();
                     break;
                 default:
                     marginEnd = 0;
                 }
             }
             marginStart = -marginEnd - minPreferredLogicalWidth();
         }
 
     }
 
@@ skipping 154 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink