Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 3 insertions, 3 deletions

diff --git a/JavaScriptCore/pcre/pcre_exec.cpp b/JavaScriptCore/pcre/pcre_exec.cpp
index 994ec57..f4899f2 100644
--- a/JavaScriptCore/pcre/pcre_exec.cpp
+++ b/JavaScriptCore/pcre/pcre_exec.cpp
@@ -88,7 +88,7 @@ public:
     void add(const JSRegExp*, double);
 
 private:
-    typedef HashMap<RefPtr<UString::Rep>, double> Map;
+    typedef HashMap<RefPtr<StringImpl>, double> Map;
     Map times;
 };
 
@@ -2143,7 +2143,7 @@ Histogram::~Histogram()
     size_t size = values.size();
     printf("Regular Expressions, sorted by time spent evaluating them:\n");
     for (size_t i = 0; i < size; ++i)
-        printf("    %f - %s\n", values[size - i - 1].second, values[size - i - 1].first.UTF8String().c_str());
+        printf("    %f - %s\n", values[size - i - 1].second, values[size - i - 1].first.utf8().c_str());
 }
 
 void Histogram::add(const JSRegExp* re, double elapsedTime)
@@ -2157,7 +2157,7 @@ void Histogram::add(const JSRegExp* re, double elapsedTime)
         if (re->options & MatchAcrossMultipleLinesOption)
             string += " (multi-line)";
     }
-    pair<Map::iterator, bool> result = times.add(string.rep(), elapsedTime);
+    pair<Map::iterator, bool> result = times.add(string.impl(), elapsedTime);
     if (!result.second)
         result.first->second += elapsedTime;
 }