Index: third_party/WebKit/Source/core/html/HTMLTableElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp |
index 642ed2356db485b02efa7d47bff59e847e8c597b..b1920650eb226779df62cb2795b6ae73ee1e6f88 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp |
@@ -43,7 +43,6 @@ |
#include "core/html/HTMLTableRowsCollection.h" |
#include "core/html/HTMLTableSectionElement.h" |
#include "core/html/parser/HTMLParserIdioms.h" |
-#include "core/layout/LayoutTable.h" |
#include "platform/weborigin/Referrer.h" |
#include "wtf/StdLibExtras.h" |
@@ -376,7 +375,7 @@ void HTMLTableElement::parseAttribute(const QualifiedName& name, const AtomicStr |
m_rulesAttr = AllRules; |
} else if (name == cellpaddingAttr) { |
if (!value.isEmpty()) |
- m_padding = max(0, value.toInt()); |
+ m_padding = std::max(0, value.toInt()); |
else |
m_padding = 1; |
} else if (name == colsAttr) { |