Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp

Issue 2726603002: Drop some "using namespace" in WebKit/Source/html. (Closed)
Patch Set: Updated to a newer origin/master Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp
index cc1e3ce4768ba1cd7326538de340429025198059..77a68aee031551e15f468957a2a0c339a9b42d77 100644
--- a/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp
@@ -33,8 +33,6 @@
#include "core/html/parser/HTMLParserIdioms.h"
#include "core/layout/LayoutTableCell.h"
-using namespace std;
-
namespace blink {
using namespace HTMLNames;
@@ -60,7 +58,7 @@ unsigned HTMLTableCellElement::colSpan() const {
UseCounter::count(document(),
UseCounter::HTMLTableCellElementColspanGreaterThan1000);
}
- return max(1u, min(value, maxColSpan()));
+ return std::max(1u, std::min(value, maxColSpan()));
}
unsigned HTMLTableCellElement::rowSpan() const {
@@ -69,7 +67,7 @@ unsigned HTMLTableCellElement::rowSpan() const {
if (rowSpanValue.isEmpty() ||
!parseHTMLNonNegativeInteger(rowSpanValue, value))
return 1;
- return max(1u, min(value, maxRowSpan()));
+ return std::max(1u, std::min(value, maxRowSpan()));
}
int HTMLTableCellElement::cellIndex() const {
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFontElement.cpp ('k') | third_party/WebKit/Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698