Removing using declarations that import names in the C++ Standard library.

Removing using declarations that import names in the C++ Standard library.

According to the coding guidelines for blink, we should not use
"using" declarations of any kind to import names in the C++ Standard
library. This patch removes all those "using" declarations.

Effected folder: Source/core/rendering

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=176608

[harpreet.sk, 2014-06-18 07:46:16]

PTAL...

[harpreet.sk, 2014-06-20 04:58:17]

PING

[esprehn, 2014-06-20 07:41:21]

lgtm

[harpreet.sk, 2014-06-20 07:54:07]

The CQ bit was checked by harpreet.sk@samsung.com

[commit-bot: I haz the power, 2014-06-20 07:54:49]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/harpreet.sk@samsung.com/339333002/1

[commit-bot: I haz the power, 2014-06-20 07:55:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-20 07:55:16]

Failed to apply patch for Source/core/rendering/InlineFlowBox.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/InlineFlowBox.cpp
  Hunk #6 FAILED at 694.
  Hunk #7 FAILED at 717.
  Hunk #8 succeeded at 741 (offset 3 lines).
  Hunk #9 succeeded at 784 (offset 3 lines).
  Hunk #10 succeeded at 820 (offset 3 lines).
  Hunk #11 succeeded at 872 (offset 3 lines).
  Hunk #12 succeeded at 1067 (offset 3 lines).
  Hunk #13 succeeded at 1234 (offset 3 lines).
  Hunk #14 succeeded at 1493 (offset 3 lines).
  Hunk #15 succeeded at 1506 (offset 3 lines).
  Hunk #16 succeeded at 1522 (offset 3 lines).
  Hunk #17 succeeded at 1541 (offset 3 lines).
  Hunk #18 succeeded at 1554 (offset 3 lines).
  Hunk #19 succeeded at 1569 (offset 3 lines).
  Hunk #20 succeeded at 1591 (offset 3 lines).
  2 out of 20 hunks FAILED -- saving rejects to file
Source/core/rendering/InlineFlowBox.cpp.rej

Patch:       Source/core/rendering/InlineFlowBox.cpp
Index: Source/core/rendering/InlineFlowBox.cpp
diff --git a/Source/core/rendering/InlineFlowBox.cpp
b/Source/core/rendering/InlineFlowBox.cpp
index
23a96ab2fa953521d336002ae387b4e1279448af..90d966525aae34490e9c7138c2da5c6a563f025f
100644
--- a/Source/core/rendering/InlineFlowBox.cpp
+++ b/Source/core/rendering/InlineFlowBox.cpp
@@ -38,8 +38,6 @@
 
 #include <math.h>
 
-using namespace std;
-
 namespace WebCore {
 
 struct SameSizeAsInlineFlowBox : public InlineBox {
@@ -389,10 +387,10 @@ float
InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, Inlin
             }
             text->setLogicalLeft(logicalLeft);
             if (knownToHaveNoOverflow())
-                minLogicalLeft = min(logicalLeft, minLogicalLeft);
+                minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
             logicalLeft += text->logicalWidth();
             if (knownToHaveNoOverflow())
-                maxLogicalRight = max(logicalLeft, maxLogicalRight);
+                maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
         } else {
             if (curr->renderer().isOutOfFlowPositioned()) {
                 if
(curr->renderer().parent()->style()->isLeftToRightDirection()) {
@@ -409,10 +407,10 @@ float
InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, Inlin
                 InlineFlowBox* flow = toInlineFlowBox(curr);
                 logicalLeft += flow->marginLogicalLeft();
                 if (knownToHaveNoOverflow())
-                    minLogicalLeft = min(logicalLeft, minLogicalLeft);
+                    minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
                 logicalLeft = flow->placeBoxesInInlineDirection(logicalLeft,
needsWordSpacing, textBoxDataMap);
                 if (knownToHaveNoOverflow())
-                    maxLogicalRight = max(logicalLeft, maxLogicalRight);
+                    maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
                 logicalLeft += flow->marginLogicalRight();
             } else if (!curr->renderer().isListMarker() ||
toRenderListMarker(curr->renderer()).isInside()) {
                 // The box can have a different writing-mode than the overall
line, so this is a bit complicated.
@@ -423,10 +421,10 @@ float
InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, Inlin
                 logicalLeft += logicalLeftMargin;
                 curr->setLogicalLeft(logicalLeft);
                 if (knownToHaveNoOverflow())
-                    minLogicalLeft = min(logicalLeft, minLogicalLeft);
+                    minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
                 logicalLeft += curr->logicalWidth();
                 if (knownToHaveNoOverflow())
-                    maxLogicalRight = max(logicalLeft, maxLogicalRight);
+                    maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
                 logicalLeft += logicalRightMargin;
                 // If we encounter any space after this inline block then
ensure it is treated as the space between two words.
                 needsWordSpacing = true;
@@ -492,7 +490,7 @@ void InlineFlowBox::adjustMaxAscentAndDescent(int&
maxAscent, int& maxDescent, i
                     maxAscent = lineHeight - maxDescent;
             }
 
-            if (maxAscent + maxDescent >= max(maxPositionTop,
maxPositionBottom))
+            if (maxAscent + maxDescent >= std::max(maxPositionTop,
maxPositionBottom))
                 break;
         }
 
@@ -696,13 +694,13 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit
top, LayoutUnit maxHei
             if (!setLineTop) {
                 setLineTop = true;
                 lineTop = newLogicalTop;
-                lineTopIncludingMargins = min(lineTop,
newLogicalTopIncludingMargins);
+                lineTopIncludingMargins = std::min(lineTop,
newLogicalTopIncludingMargins);
             } else {
-                lineTop = min(lineTop, newLogicalTop);
-                lineTopIncludingMargins = min(lineTop,
min(lineTopIncludingMargins, newLogicalTopIncludingMargins));
+                lineTop = std::min(lineTop, newLogicalTop);
+                lineTopIncludingMargins = std::min(lineTop,
std::min(lineTopIncludingMargins, newLogicalTopIncludingMargins));
             }
-            lineBottom = max(lineBottom, newLogicalTop + boxHeight);
-            lineBottomIncludingMargins = max(lineBottom,
max(lineBottomIncludingMargins, newLogicalTopIncludingMargins +
boxHeightIncludingMargins));
+            lineBottom = std::max(lineBottom, newLogicalTop + boxHeight);
+            lineBottomIncludingMargins = std::max(lineBottom,
std::max(lineBottomIncludingMargins, newLogicalTopIncludingMargins +
boxHeightIncludingMargins));
         }
 
         // Adjust boxes to use their real box y/height and not the logical
height (as dictated by
@@ -719,11 +717,11 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit
top, LayoutUnit maxHei
                 lineTop = pixelSnappedLogicalTop();
                 lineTopIncludingMargins = lineTop;
             } else {
-                lineTop = min<LayoutUnit>(lineTop, pixelSnappedLogicalTop());
-                lineTopIncludingMargins = min(lineTop,
lineTopIncludingMargins);
+                lineTop = std::min<LayoutUnit>(lineTop,
pixelSnappedLogicalTop());
+                lineTopIncludingMargins = std::min(lineTop,
lineTopIncludingMargins);
             }
-            lineBottom = max<LayoutUnit>(lineBottom,
pixelSnappedLogicalBottom());
-            lineBottomIncludingMargins = max(lineBottom,
lineBottomIncludingMargins);
+            lineBottom = std::max<LayoutUnit>(lineBottom,
pixelSnappedLogicalBottom());
+            lineBottomIncludingMargins = std::max(lineBottom,
lineBottomIncludingMargins);
         }
 
         if (renderer().style()->isFlippedLinesWritingMode())
@@ -740,11 +738,11 @@ void InlineFlowBox::computeMaxLogicalTop(float&
maxLogicalTop) const
         if (descendantsHaveSameLineHeightAndBaseline())
             continue;
 
-        maxLogicalTop = max<float>(maxLogicalTop, curr->y());
+        maxLogicalTop = std::max<float>(maxLogicalTop, curr->y());
         float localMaxLogicalTop = 0;
         if (curr->isInlineFlowBox())
             toInlineFlowBox(curr)->computeMaxLogicalTop(localMaxLogicalTop);
-        maxLogicalTop = max<float>(maxLogicalTop, localMaxLogicalTop);
+        maxLogicalTop = std::max<float>(maxLogicalTop, localMaxLogicalTop);
     }
 }
 
@@ -783,15 +781,15 @@ inline void
InlineFlowBox::addBoxShadowVisualOverflow(LayoutRect& logicalVisualO
     LayoutUnit shadowLogicalTop = style->isFlippedLinesWritingMode() ?
-boxShadowLogicalBottom : boxShadowLogicalTop;
     LayoutUnit shadowLogicalBottom = style->isFlippedLinesWritingMode() ?
-boxShadowLogicalTop : boxShadowLogicalBottom;
 
-    LayoutUnit logicalTopVisualOverflow = min(pixelSnappedLogicalTop() +
shadowLogicalTop, logicalVisualOverflow.y());
-    LayoutUnit logicalBottomVisualOverflow = max(pixelSnappedLogicalBottom() +
shadowLogicalBottom, logicalVisualOverflow.maxY());
+    LayoutUnit logicalTopVisualOverflow = std::min(pixelSnappedLogicalTop() +
shadowLogicalTop, logicalVisualOverflow.y());
+    LayoutUnit logicalBottomVisualOverflow =
std::max(pixelSnappedLogicalBottom() + shadowLogicalBottom,
logicalVisualOverflow.maxY());
 
     LayoutUnit boxShadowLogicalLeft;
     LayoutUnit boxShadowLogicalRight;
     style->getBoxShadowInlineDirectionExtent(boxShadowLogicalLeft,
boxShadowLogicalRight);
 
-    LayoutUnit logicalLeftVisualOverflow = min(pixelSnappedLogicalLeft() +
boxShadowLogicalLeft, logicalVisualOverflow.x());
-    LayoutUnit logicalRightVisualOverflow = max(pixelSnappedLogicalRight() +
boxShadowLogicalRight, logicalVisualOverflow.maxX());
+    LayoutUnit logicalLeftVisualOverflow = std::min(pixelSnappedLogicalLeft() +
boxShadowLogicalLeft, logicalVisualOverflow.x());
+    LayoutUnit logicalRightVisualOverflow = std::max(pixelSnappedLogicalRight()
+ boxShadowLogicalRight, logicalVisualOverflow.maxX());
 
     logicalVisualOverflow = LayoutRect(logicalLeftVisualOverflow,
logicalTopVisualOverflow,
                                        logicalRightVisualOverflow -
logicalLeftVisualOverflow, logicalBottomVisualOverflow -
logicalTopVisualOverflow);
@@ -819,14 +817,14 @@ inline void
InlineFlowBox::addBorderOutsetVisualOverflow(LayoutRect& logicalVisu
     LayoutUnit outsetLogicalTop = style->isFlippedLinesWritingMode() ?
borderOutsetLogicalBottom : borderOutsetLogicalTop;
     LayoutUnit outsetLogicalBottom = style->isFlippedLinesWritingMode() ?
borderOutsetLogicalTop : borderOutsetLogicalBottom;
 
-    LayoutUnit logicalTopVisualOverflow = min(pixelSnappedLogicalTop() -
outsetLogicalTop, logicalVisualOverflow.y());
-    LayoutUnit logicalBottomVisualOverflow = max(pixelSnappedLogicalBottom() +
outsetLogicalBottom, logicalVisualOverflow.maxY());
+    LayoutUnit logicalTopVisualOverflow = std::min(pixelSnappedLogicalTop() -
ou…
(message too large)

[harpreet.sk, 2014-06-20 10:59:45]

The CQ bit was checked by harpreet.sk@samsung.com

[commit-bot: I haz the power, 2014-06-20 11:00:31]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/harpreet.sk@samsung.com/339333002/40001

[harpreet.sk, 2014-06-20 12:03:36]

The CQ bit was unchecked by harpreet.sk@samsung.com

[harpreet.sk, 2014-06-20 12:05:42]

The CQ bit was checked by harpreet.sk@samsung.com

[commit-bot: I haz the power, 2014-06-20 12:07:06]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/harpreet.sk@samsung.com/339333002/60001

[commit-bot: I haz the power, 2014-06-20 13:10:16]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/12876)

[commit-bot: I haz the power, 2014-06-20 13:48:38]

Change committed as 176608