Merge Webkit at r70209: StringBuilder.h moved to WTF.

See http://trac.webkit.org/changeset/69594

Change-Id: I17d01eae838c03ac198dd8b0df3717d058806aca

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index f0cf62b..e0f32f1 100644 (file)
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -75,7 +75,6 @@
 #include "SecurityOrigin.h"
 #include "SelectionController.h"
 #include "Settings.h"
-#include "StringBuilder.h"
 #include "SubstituteData.h"
 #include "UserGestureIndicator.h"
 #include "WebCache.h"
@@ -100,6 +99,7 @@
 #include <wtf/Platform.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
 
 #if USE(JSC)
 #include "GCController.h"