Rename ValueToString<*>::string to ValueToType<*>::toString

This should avoid a collision between Blink and Chromium.

Review URL: https://codereview.chromium.org/1742653002

Cr-Commit-Position: refs/heads/master@{#377958}

8 files changed, 21 insertions, 21 deletions

diff --git a/third_party/WebKit/Source/core/html/track/CueTimeline.h b/third_party/WebKit/Source/core/html/track/CueTimeline.h
index 09cc811..9fd9c41 100644
--- a/third_party/WebKit/Source/core/html/track/CueTimeline.h
+++ b/third_party/WebKit/Source/core/html/track/CueTimeline.h
@@ -88,7 +88,7 @@ private:
 // Template specializations required by PodIntervalTree in debug mode.
 template <>
 struct ValueToString<double> {
-    static String string(const double value)
+    static String toString(const double value)
     {
         return String::number(value);
     }
@@ -96,7 +96,7 @@ struct ValueToString<double> {
 
 template <>
 struct ValueToString<TextTrackCue*> {
-    static String string(TextTrackCue* const& cue)
+    static String toString(TextTrackCue* const& cue)
     {
         return cue->toString();
     }
diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
index 5e4051c..81f8079 100644
--- a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
@@ -616,12 +616,12 @@ inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>::
 
 #ifndef NDEBUG
 // These helpers are only used by the PODIntervalTree for debugging purposes.
-String ValueToString<LayoutUnit>::string(const LayoutUnit value)
+String ValueToString<LayoutUnit>::toString(const LayoutUnit value)
 {
     return String::number(value.toFloat());
 }
 
-String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObject)
+String ValueToString<FloatingObject*>::toString(const FloatingObject* floatingObject)
 {
     return String::format("%p (%gx%g %gx%g)", floatingObject, floatingObject->frameRect().x().toFloat(), floatingObject->frameRect().y().toFloat(), floatingObject->frameRect().maxX().toFloat(), floatingObject->frameRect().maxY().toFloat());
 }
diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.h b/third_party/WebKit/Source/core/layout/FloatingObjects.h
index 3c9c4ff..a7ff1f6 100644
--- a/third_party/WebKit/Source/core/layout/FloatingObjects.h
+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.h
@@ -201,10 +201,10 @@ private:
 #ifndef NDEBUG
 // These structures are used by PODIntervalTree for debugging purposes.
 template <> struct ValueToString<LayoutUnit> {
-    static String string(const LayoutUnit value);
+    static String toString(const LayoutUnit value);
 };
 template<> struct ValueToString<FloatingObject*> {
-    static String string(const FloatingObject*);
+    static String toString(const FloatingObject*);
 };
 #endif
 
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlowThread.h b/third_party/WebKit/Source/core/layout/LayoutFlowThread.h
index 6313db8..eec35e9 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlowThread.h
+++ b/third_party/WebKit/Source/core/layout/LayoutFlowThread.h
@@ -156,7 +156,7 @@ DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFlowThread, isLayoutFlowThread());
 // These structures are used by PODIntervalTree for debugging.
 #ifndef NDEBUG
 template <> struct ValueToString<LayoutMultiColumnSet*> {
-    static String string(const LayoutMultiColumnSet* value) { return String::format("%p", value); }
+    static String toString(const LayoutMultiColumnSet* value) { return String::format("%p", value); }
 };
 #endif
 
diff --git a/third_party/WebKit/Source/platform/PODInterval.h b/third_party/WebKit/Source/platform/PODInterval.h
index 0304735..aea24efa 100644
--- a/third_party/WebKit/Source/platform/PODInterval.h
+++ b/third_party/WebKit/Source/platform/PODInterval.h
@@ -143,13 +143,13 @@ public:
     {
         StringBuilder builder;
         builder.appendLiteral("[PODInterval (");
-        builder.append(ValueToString<T>::string(low()));
+        builder.append(ValueToString<T>::toString(low()));
         builder.appendLiteral(", ");
-        builder.append(ValueToString<T>::string(high()));
+        builder.append(ValueToString<T>::toString(high()));
         builder.appendLiteral("), data=");
-        builder.append(ValueToString<UserData>::string(data()));
+        builder.append(ValueToString<UserData>::toString(data()));
         builder.appendLiteral(", maxHigh=");
-        builder.append(ValueToString<T>::string(maxHigh()));
+        builder.append(ValueToString<T>::toString(maxHigh()));
         builder.append(']');
         return builder.toString();
     }
diff --git a/third_party/WebKit/Source/platform/PODIntervalTree.h b/third_party/WebKit/Source/platform/PODIntervalTree.h
index e1de084..59a46dd 100644
--- a/third_party/WebKit/Source/platform/PODIntervalTree.h
+++ b/third_party/WebKit/Source/platform/PODIntervalTree.h
@@ -240,7 +240,7 @@ private:
             localMaxValue = node->data().high();
         if (!(localMaxValue == node->data().maxHigh())) {
 #ifndef NDEBUG
-            String localMaxValueString = ValueToString<T>::string(localMaxValue);
+            String localMaxValueString = ValueToString<T>::toString(localMaxValue);
             WTF_LOG_ERROR("PODIntervalTree verification failed at node 0x%p: localMaxValue=%s and data=%s",
                 node, localMaxValueString.utf8().data(), node->data().toString().utf8().data());
 #endif
@@ -256,7 +256,7 @@ private:
 // Support for printing PODIntervals at the PODRedBlackTree level.
 template<class T, class UserData>
 struct ValueToString<PODInterval<T, UserData>> {
-    static String string(const PODInterval<T, UserData>& interval)
+    static String toString(const PODInterval<T, UserData>& interval)
     {
         return interval.toString();
     }
diff --git a/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp b/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp
index cc9b662..dcc041f 100644
--- a/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp
+++ b/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp
@@ -41,12 +41,12 @@ using TreeTestHelpers::nextRandom;
 #ifndef NDEBUG
 template<>
 struct ValueToString<float> {
-    static String string(const float& value) { return String::number(value); }
+    static String toString(const float& value) { return String::number(value); }
 };
 
 template<>
 struct ValueToString<void*> {
-    static String string(void* const& value)
+    static String toString(void* const& value)
     {
         return String::format("0x%p", value);
     }
@@ -87,7 +87,7 @@ TEST(PODIntervalTreeTest, TestQueryAgainstZeroSizeInterval)
 #ifndef NDEBUG
 template<>
 struct ValueToString<int*> {
-    static String string(int* const& value)
+    static String toString(int* const& value)
     {
         return String::format("0x%p", value);
     }
@@ -130,7 +130,7 @@ public:
 #ifndef NDEBUG
 template<>
 struct ValueToString<UserData1> {
-    static String string(const UserData1& value)
+    static String toString(const UserData1& value)
     {
         return String("[UserData1 a=") + String::number(value.a) + " b=" + String::number(value.b) + "]";
     }
@@ -187,7 +187,7 @@ private:
 #ifndef NDEBUG
 template<>
 struct ValueToString<EndpointType1> {
-    static String string(const EndpointType1& value)
+    static String toString(const EndpointType1& value)
     {
         return String("[EndpointType1 value=") + String::number(value.value()) + "]";
     }
@@ -208,7 +208,7 @@ TEST(PODIntervalTreeTest, TestTreeDoesNotRequireMostOperators)
 #ifndef NDEBUG
 template<>
 struct ValueToString<int> {
-    static String string(const int& value) { return String::number(value); }
+    static String toString(const int& value) { return String::number(value); }
 };
 #endif
 
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPolygon.h b/third_party/WebKit/Source/platform/geometry/FloatPolygon.h
index 070dfa5..0799fa6 100644
--- a/third_party/WebKit/Source/platform/geometry/FloatPolygon.h
+++ b/third_party/WebKit/Source/platform/geometry/FloatPolygon.h
@@ -144,12 +144,12 @@ private:
 #ifndef NDEBUG
 template <> struct ValueToString<float> {
     STATIC_ONLY(ValueToString);
-    static String string(const float value) { return String::number(value); }
+    static String toString(const float value) { return String::number(value); }
 };
 
 template<> struct ValueToString<FloatPolygonEdge*> {
     STATIC_ONLY(ValueToString);
-    static String string(const FloatPolygonEdge* edge) { return String::format("%p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2().x(), edge->vertex2().y()); }
+    static String toString(const FloatPolygonEdge* edge) { return String::format("%p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2().x(), edge->vertex2().y()); }
 };
 #endif