| Index: Source/core/editing/Editor.cpp
|
| diff --git a/Source/core/editing/Editor.cpp b/Source/core/editing/Editor.cpp
|
| index 5b04cb33cdf112779164a6815135e91844b9f933..47aa4d1fd1e0f348332f246ad41a9558fd7e0c7e 100644
|
| --- a/Source/core/editing/Editor.cpp
|
| +++ b/Source/core/editing/Editor.cpp
|
| @@ -88,7 +88,6 @@
|
|
|
| namespace WebCore {
|
|
|
| -using namespace std;
|
| using namespace HTMLNames;
|
| using namespace WTF;
|
| using namespace Unicode;
|
| @@ -1131,10 +1130,10 @@ IntRect Editor::firstRectForRange(Range* range) const
|
|
|
| if (startCaretRect.y() == endCaretRect.y()) {
|
| // start and end are on the same line
|
| - return IntRect(min(startCaretRect.x(), endCaretRect.x()),
|
| + return IntRect(std::min(startCaretRect.x(), endCaretRect.x()),
|
| startCaretRect.y(),
|
| abs(endCaretRect.x() - startCaretRect.x()),
|
| - max(startCaretRect.height(), endCaretRect.height()));
|
| + std::max(startCaretRect.height(), endCaretRect.height()));
|
| }
|
|
|
| // start and end aren't on the same line, so go from start to the end of its line
|
|
|