| Index: Source/core/editing/CompositeEditCommand.cpp
|
| diff --git a/Source/core/editing/CompositeEditCommand.cpp b/Source/core/editing/CompositeEditCommand.cpp
|
| index f450f39a50e55eebb6626fb0c77c8c62a4e63225..4f08e61c364d2b4b9364a00163d6d75e069aa8ec 100644
|
| --- a/Source/core/editing/CompositeEditCommand.cpp
|
| +++ b/Source/core/editing/CompositeEditCommand.cpp
|
| @@ -69,8 +69,6 @@
|
| #include "core/rendering/RenderListItem.h"
|
| #include "core/rendering/RenderText.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| using namespace HTMLNames;
|
| @@ -762,7 +760,7 @@ void CompositeEditCommand::deleteInsignificantText(PassRefPtrWillBeRawPtr<Text>
|
| bool indicesIntersect = start <= gapEnd && end >= gapStart;
|
| int gapLen = gapEnd - gapStart;
|
| if (indicesIntersect && gapLen > 0) {
|
| - gapStart = max(gapStart, start);
|
| + gapStart = std::max(gapStart, start);
|
| if (str.isNull())
|
| str = textNode->data().substring(start, end - start);
|
| // remove text in the gap
|
|
|