From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 22 Oct 2010 13:02:20 +0100
Subject: Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
---
 WebCore/ForwardingHeaders/runtime/StringBuilder.h      | 4 ----
 WebCore/ForwardingHeaders/runtime/UStringBuilder.h     | 4 ++++
 WebCore/ForwardingHeaders/wtf/StringHashFunctions.h    | 4 ----
 WebCore/ForwardingHeaders/wtf/StringHasher.h           | 4 ++++
 WebCore/ForwardingHeaders/wtf/text/StringBuilder.h     | 4 ++++
 WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h | 4 ++++
 6 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 WebCore/ForwardingHeaders/runtime/StringBuilder.h
 create mode 100644 WebCore/ForwardingHeaders/runtime/UStringBuilder.h
 delete mode 100644 WebCore/ForwardingHeaders/wtf/StringHashFunctions.h
 create mode 100644 WebCore/ForwardingHeaders/wtf/StringHasher.h
 create mode 100644 WebCore/ForwardingHeaders/wtf/text/StringBuilder.h
 create mode 100644 WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h

(limited to 'WebCore/ForwardingHeaders')

diff --git a/WebCore/ForwardingHeaders/runtime/StringBuilder.h b/WebCore/ForwardingHeaders/runtime/StringBuilder.h
deleted file mode 100644
index 115db06..0000000
--- a/WebCore/ForwardingHeaders/runtime/StringBuilder.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_StringBuilder_h
-#define WebCore_FWD_StringBuilder_h
-#include <JavaScriptCore/StringBuilder.h>
-#endif
diff --git a/WebCore/ForwardingHeaders/runtime/UStringBuilder.h b/WebCore/ForwardingHeaders/runtime/UStringBuilder.h
new file mode 100644
index 0000000..592a783
--- /dev/null
+++ b/WebCore/ForwardingHeaders/runtime/UStringBuilder.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_UStringBuilder_h
+#define WebCore_FWD_UStringBuilder_h
+#include <JavaScriptCore/UStringBuilder.h>
+#endif
diff --git a/WebCore/ForwardingHeaders/wtf/StringHashFunctions.h b/WebCore/ForwardingHeaders/wtf/StringHashFunctions.h
deleted file mode 100644
index 72c1194..0000000
--- a/WebCore/ForwardingHeaders/wtf/StringHashFunctions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_StringHashFunctions_h
-#define WebCore_FWD_StringHashFunctions_h
-#include <JavaScriptCore/StringHashFunctions.h>
-#endif
diff --git a/WebCore/ForwardingHeaders/wtf/StringHasher.h b/WebCore/ForwardingHeaders/wtf/StringHasher.h
new file mode 100644
index 0000000..fbc0d8d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/StringHasher.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_StringHasher_h
+#define WebCore_FWD_StringHasher_h
+#include <JavaScriptCore/StringHasher.h>
+#endif
diff --git a/WebCore/ForwardingHeaders/wtf/text/StringBuilder.h b/WebCore/ForwardingHeaders/wtf/text/StringBuilder.h
new file mode 100644
index 0000000..115db06
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/text/StringBuilder.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_StringBuilder_h
+#define WebCore_FWD_StringBuilder_h
+#include <JavaScriptCore/StringBuilder.h>
+#endif
diff --git a/WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h b/WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h
new file mode 100644
index 0000000..666ac08
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_StringConcatenate_h
+#define WebCore_FWD_StringConcatenate_h
+#include <JavaScriptCore/StringConcatenate.h>
+#endif
-- 
cgit v1.1