| Index: Source/core/rendering/RenderInline.cpp
|
| diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
|
| index 80664b5e3b1ad0ba9a917d967316600a1de84671..6fba9640d7c062d5f77310715731a72ce9a785fe 100644
|
| --- a/Source/core/rendering/RenderInline.cpp
|
| +++ b/Source/core/rendering/RenderInline.cpp
|
| @@ -41,8 +41,6 @@
|
| #include "platform/geometry/TransformState.h"
|
| #include "platform/graphics/GraphicsContext.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| RenderInline::RenderInline(Element* element)
|
| @@ -692,7 +690,7 @@ static LayoutUnit computeMargin(const RenderInline* renderer, const Length& marg
|
| if (margin.isFixed())
|
| return margin.value();
|
| if (margin.isPercent())
|
| - return minimumValueForLength(margin, max<LayoutUnit>(0, renderer->containingBlock()->availableLogicalWidth()));
|
| + return minimumValueForLength(margin, std::max<LayoutUnit>(0, renderer->containingBlock()->availableLogicalWidth()));
|
| return 0;
|
| }
|
|
|
| @@ -975,8 +973,8 @@ LayoutRect RenderInline::linesVisualOverflowBoundingBox() const
|
| LayoutUnit logicalLeftSide = LayoutUnit::max();
|
| LayoutUnit logicalRightSide = LayoutUnit::min();
|
| for (InlineFlowBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
|
| - logicalLeftSide = min(logicalLeftSide, curr->logicalLeftVisualOverflow());
|
| - logicalRightSide = max(logicalRightSide, curr->logicalRightVisualOverflow());
|
| + logicalLeftSide = std::min(logicalLeftSide, curr->logicalLeftVisualOverflow());
|
| + logicalRightSide = std::max(logicalRightSide, curr->logicalRightVisualOverflow());
|
| }
|
|
|
| RootInlineBox& firstRootBox = firstLineBox()->root();
|
| @@ -1417,8 +1415,8 @@ void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOf
|
| rects.append(LayoutRect());
|
| for (InlineFlowBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
|
| RootInlineBox& root = curr->root();
|
| - LayoutUnit top = max<LayoutUnit>(root.lineTop(), curr->logicalTop());
|
| - LayoutUnit bottom = min<LayoutUnit>(root.lineBottom(), curr->logicalBottom());
|
| + LayoutUnit top = std::max<LayoutUnit>(root.lineTop(), curr->logicalTop());
|
| + LayoutUnit bottom = std::min<LayoutUnit>(root.lineBottom(), curr->logicalBottom());
|
| rects.append(LayoutRect(curr->x(), top, curr->logicalWidth(), bottom - top));
|
| }
|
| rects.append(LayoutRect());
|
| @@ -1486,7 +1484,7 @@ void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L
|
| drawLineForBoxSide(graphicsContext,
|
| pixelSnappedBox.x() - outlineWidth,
|
| pixelSnappedBox.y() - outlineWidth,
|
| - min(pixelSnappedBox.maxX() + outlineWidth, (lastline.isEmpty() ? 1000000 : pixelSnappedLastLine.x())),
|
| + std::min(pixelSnappedBox.maxX() + outlineWidth, (lastline.isEmpty() ? 1000000 : pixelSnappedLastLine.x())),
|
| pixelSnappedBox.y(),
|
| BSTop, outlineColor, outlineStyle,
|
| outlineWidth,
|
| @@ -1495,7 +1493,7 @@ void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L
|
|
|
| if (lastline.maxX() < thisline.maxX())
|
| drawLineForBoxSide(graphicsContext,
|
| - max(lastline.isEmpty() ? -1000000 : pixelSnappedLastLine.maxX(), pixelSnappedBox.x() - outlineWidth),
|
| + std::max(lastline.isEmpty() ? -1000000 : pixelSnappedLastLine.maxX(), pixelSnappedBox.x() - outlineWidth),
|
| pixelSnappedBox.y() - outlineWidth,
|
| pixelSnappedBox.maxX() + outlineWidth,
|
| pixelSnappedBox.y(),
|
| @@ -1519,7 +1517,7 @@ void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L
|
| drawLineForBoxSide(graphicsContext,
|
| pixelSnappedBox.x() - outlineWidth,
|
| pixelSnappedBox.maxY(),
|
| - min(pixelSnappedBox.maxX() + outlineWidth, !nextline.isEmpty() ? pixelSnappedNextLine.x() + 1 : 1000000),
|
| + std::min(pixelSnappedBox.maxX() + outlineWidth, !nextline.isEmpty() ? pixelSnappedNextLine.x() + 1 : 1000000),
|
| pixelSnappedBox.maxY() + outlineWidth,
|
| BSBottom, outlineColor, outlineStyle,
|
| outlineWidth,
|
| @@ -1528,7 +1526,7 @@ void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L
|
|
|
| if (nextline.maxX() < thisline.maxX())
|
| drawLineForBoxSide(graphicsContext,
|
| - max(!nextline.isEmpty() ? pixelSnappedNextLine.maxX() : -1000000, pixelSnappedBox.x() - outlineWidth),
|
| + std::max(!nextline.isEmpty() ? pixelSnappedNextLine.maxX() : -1000000, pixelSnappedBox.x() - outlineWidth),
|
| pixelSnappedBox.maxY(),
|
| pixelSnappedBox.maxX() + outlineWidth,
|
| pixelSnappedBox.maxY() + outlineWidth,
|
|
|