Remove using directives ("using namespace x") from blink/renderer/core/layout/.

Also shortens some repetitive code.

Bug: 82078
Change-Id: Ib0e4946233c3bf595319ce8368e106eb1be8a041
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1868629
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#707282}

third_party/blink/renderer/core/layout/hit_test_result.cc

@@ -46,8 +46,6 @@
 
 namespace blink {
 
-using namespace html_names;
-
 HitTestResult::HitTestResult()
     : hit_test_request_(HitTestRequest::kReadOnly | HitTestRequest::kActive),
       cacheable_(true),
@@ -190,7 +188,7 @@ HTMLAreaElement* HitTestResult::ImageAreaForImage() const {
     return nullptr;
 
   HTMLMapElement* map = image_element->GetTreeScope().GetImageMap(
-      image_element->FastGetAttribute(kUsemapAttr));
+      image_element->FastGetAttribute(html_names::kUsemapAttr));
   if (!map)
     return nullptr;
 
@@ -293,7 +291,7 @@ const AtomicString& HitTestResult::AltDisplayString() const {
     return g_null_atom;
 
   if (auto* image = ToHTMLImageElementOrNull(*inner_node_or_image_map_image))
-    return image->getAttribute(kAltAttr);
+    return image->getAttribute(html_names::kAltAttr);
 
   if (auto* input = ToHTMLInputElementOrNull(*inner_node_or_image_map_image))
     return input->Alt();

third_party/blink/renderer/core/layout/layout_details_marker.cc

@@ -27,31 +27,22 @@
 
 namespace blink {
 
-using namespace html_names;
-
 LayoutDetailsMarker::LayoutDetailsMarker(Element* element)
     : LayoutBlockFlow(element) {}
 
 LayoutDetailsMarker::Orientation LayoutDetailsMarker::GetOrientation() const {
-  switch (StyleRef().GetWritingMode()) {
-    case WritingMode::kHorizontalTb:
-      if (StyleRef().IsLeftToRightDirection())
-        return IsOpen() ? kDown : kRight;
-      return IsOpen() ? kDown : kLeft;
-    case WritingMode::kVerticalRl:
-      if (StyleRef().IsLeftToRightDirection())
-        return IsOpen() ? kLeft : kDown;
-      return IsOpen() ? kLeft : kUp;
-    case WritingMode::kVerticalLr:
-      if (StyleRef().IsLeftToRightDirection())
-        return IsOpen() ? kRight : kDown;
-      return IsOpen() ? kRight : kUp;
-    // TODO(layout-dev): Sideways-lr and sideways-rl are not yet supported.
-    default:
-      break;
+  // TODO(layout-dev): Sideways-lr and sideways-rl are not yet supported.
+  const auto mode = StyleRef().GetWritingMode();
+  DCHECK(mode != WritingMode::kSidewaysRl && mode != WritingMode::kSidewaysLr);
+
+  if (IsOpen()) {
+    if (mode == WritingMode::kHorizontalTb)
+      return kDown;
+    return (mode == WritingMode::kVerticalRl) ? kLeft : kRight;
   }
-  NOTREACHED();
-  return kRight;
+  if (mode == WritingMode::kHorizontalTb)
+    return StyleRef().IsLeftToRightDirection() ? kRight : kLeft;
+  return StyleRef().IsLeftToRightDirection() ? kDown : kUp;
 }
 
 void LayoutDetailsMarker::Paint(const PaintInfo& paint_info) const {
@@ -61,13 +52,12 @@ void LayoutDetailsMarker::Paint(const PaintInfo& paint_info) const {
 bool LayoutDetailsMarker::IsOpen() const {
   for (LayoutObject* layout_object = Parent(); layout_object;
        layout_object = layout_object->Parent()) {
-    if (!layout_object->GetNode())
+    const auto* node = layout_object->GetNode();
+    if (!node)
       continue;
-    if (IsHTMLDetailsElement(*layout_object->GetNode()))
-      return !To<Element>(layout_object->GetNode())
-                  ->getAttribute(kOpenAttr)
-                  .IsNull();
-    if (IsHTMLInputElement(*layout_object->GetNode()))
+    if (IsHTMLDetailsElement(*node))
+      return !To<Element>(node)->getAttribute(html_names::kOpenAttr).IsNull();
+    if (IsHTMLInputElement(*node))
       return true;
   }
 

third_party/blink/renderer/core/layout/layout_image.cc

@@ -50,8 +50,6 @@
 
 namespace blink {
 
-using namespace html_names;
-
 LayoutImage::LayoutImage(Element* element)
     : LayoutReplaced(element, LayoutSize()),
       did_increment_visually_non_empty_pixel_count_(false),
@@ -287,7 +285,8 @@ LayoutUnit LayoutImage::MinimumReplacedHeight() const {
 
 HTMLMapElement* LayoutImage::ImageMap() const {
   HTMLImageElement* i = ToHTMLImageElementOrNull(GetNode());
-  return i ? i->GetTreeScope().GetImageMap(i->FastGetAttribute(kUsemapAttr))
+  return i ? i->GetTreeScope().GetImageMap(
+                 i->FastGetAttribute(html_names::kUsemapAttr))
            : nullptr;
 }
 

third_party/blink/renderer/core/layout/layout_table_cell.cc

@@ -43,8 +43,6 @@
 
 namespace blink {
 
-using namespace html_names;
-
 struct SameSizeAsLayoutTableCell : public LayoutBlockFlow,
                                    public LayoutNGTableCellInterface {
   unsigned bitfields;
@@ -203,7 +201,7 @@ void LayoutTableCell::ComputePreferredLogicalWidths() {
     // See if nowrap was set.
     Length w = StyleOrColLogicalWidth();
     const AtomicString& nowrap =
-        To<Element>(GetNode())->getAttribute(kNowrapAttr);
+        To<Element>(GetNode())->getAttribute(html_names::kNowrapAttr);
     if (!nowrap.IsNull() && w.IsFixed()) {
       // Nowrap is set, but we didn't actually use it because of the fixed width
       // set on the cell. Even so, it is a WinIE/Moz trait to make the minwidth

third_party/blink/renderer/core/layout/svg/svg_resources.cc

@@ -43,8 +43,6 @@
 
 namespace blink {
 
-using namespace svg_names;
-
 SVGResources::SVGResources() : linked_resource_(nullptr) {}
 
 SVGResourceClient* SVGResources::GetClient(const LayoutObject& object) {
@@ -59,26 +57,28 @@ static HashSet<AtomicString>& ClipperFilterMaskerTags() {
           // http://www.w3.org/TR/SVG11/intro.html#TermContainerElement
           // "graphics elements" :
           // http://www.w3.org/TR/SVG11/intro.html#TermGraphicsElement
-          kATag.LocalName(), kCircleTag.LocalName(), kEllipseTag.LocalName(),
-          kGTag.LocalName(), kImageTag.LocalName(), kLineTag.LocalName(),
-          kMarkerTag.LocalName(), kMaskTag.LocalName(), kPathTag.LocalName(),
-          kPolygonTag.LocalName(), kPolylineTag.LocalName(),
-          kRectTag.LocalName(), kSVGTag.LocalName(), kTextTag.LocalName(),
-          kUseTag.LocalName(),
+          svg_names::kATag.LocalName(), svg_names::kCircleTag.LocalName(),
+          svg_names::kEllipseTag.LocalName(), svg_names::kGTag.LocalName(),
+          svg_names::kImageTag.LocalName(), svg_names::kLineTag.LocalName(),
+          svg_names::kMarkerTag.LocalName(), svg_names::kMaskTag.LocalName(),
+          svg_names::kPathTag.LocalName(), svg_names::kPolygonTag.LocalName(),
+          svg_names::kPolylineTag.LocalName(), svg_names::kRectTag.LocalName(),
+          svg_names::kSVGTag.LocalName(), svg_names::kTextTag.LocalName(),
+          svg_names::kUseTag.LocalName(),
           // Not listed in the definitions is the clipPath element, the SVG spec
           // says though:
           // The "clipPath" element or any of its children can specify property
           // "clip-path".
           // So we have to add kClipPathTag here, otherwhise clip-path on
           // clipPath will fail. (Already mailed SVG WG, waiting for a solution)
-          kClipPathTag.LocalName(),
+          svg_names::kClipPathTag.LocalName(),
           // Not listed in the definitions are the text content elements, though
           // filter/clipper/masker on tspan/text/.. is allowed.
           // (Already mailed SVG WG, waiting for a solution)
-          kTextPathTag.LocalName(), kTSpanTag.LocalName(),
+          svg_names::kTextPathTag.LocalName(), svg_names::kTSpanTag.LocalName(),
           // Not listed in the definitions is the foreignObject element, but
           // clip-path is a supported attribute.
-          kForeignObjectTag.LocalName(),
+          svg_names::kForeignObjectTag.LocalName(),
           // Elements that we ignore, as it doesn't make any sense.
           // defs, pattern, switch (FIXME: Mail SVG WG about these)
           // symbol (is converted to a svg element, when referenced by use, we
@@ -90,21 +90,28 @@ static HashSet<AtomicString>& ClipperFilterMaskerTags() {
 bool SVGResources::SupportsMarkers(const SVGElement& element) {
   DEFINE_STATIC_LOCAL(HashSet<AtomicString>, tag_list,
                       ({
-                          kLineTag.LocalName(), kPathTag.LocalName(),
-                          kPolygonTag.LocalName(), kPolylineTag.LocalName(),
+                          svg_names::kLineTag.LocalName(),
+                          svg_names::kPathTag.LocalName(),
+                          svg_names::kPolygonTag.LocalName(),
+                          svg_names::kPolylineTag.LocalName(),
                       }));
   return tag_list.Contains(element.localName());
 }
 
 static HashSet<AtomicString>& FillAndStrokeTags() {
-  DEFINE_STATIC_LOCAL(
-      HashSet<AtomicString>, tag_list,
-      ({
-          kCircleTag.LocalName(), kEllipseTag.LocalName(), kLineTag.LocalName(),
-          kPathTag.LocalName(), kPolygonTag.LocalName(),
-          kPolylineTag.LocalName(), kRectTag.LocalName(), kTextTag.LocalName(),
-          kTextPathTag.LocalName(), kTSpanTag.LocalName(),
-      }));
+  DEFINE_STATIC_LOCAL(HashSet<AtomicString>, tag_list,
+                      ({
+                          svg_names::kCircleTag.LocalName(),
+                          svg_names::kEllipseTag.LocalName(),
+                          svg_names::kLineTag.LocalName(),
+                          svg_names::kPathTag.LocalName(),
+                          svg_names::kPolygonTag.LocalName(),
+                          svg_names::kPolylineTag.LocalName(),
+                          svg_names::kRectTag.LocalName(),
+                          svg_names::kTextTag.LocalName(),
+                          svg_names::kTextPathTag.LocalName(),
+                          svg_names::kTSpanTag.LocalName(),
+                      }));
   return tag_list;
 }