diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/ForwardingHeaders | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/ForwardingHeaders')
| -rw-r--r-- | WebCore/ForwardingHeaders/runtime/UStringBuilder.h | 4 | ||||
| -rw-r--r-- | WebCore/ForwardingHeaders/wtf/StringHashFunctions.h | 4 | ||||
| -rw-r--r-- | WebCore/ForwardingHeaders/wtf/StringHasher.h | 4 | ||||
| -rw-r--r-- | WebCore/ForwardingHeaders/wtf/text/StringBuilder.h (renamed from WebCore/ForwardingHeaders/runtime/StringBuilder.h) | 0 | ||||
| -rw-r--r-- | WebCore/ForwardingHeaders/wtf/text/StringConcatenate.h | 4 |
5 files changed, 12 insertions, 4 deletions
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/runtime/StringBuilder.h b/WebCore/ForwardingHeaders/wtf/text/StringBuilder.h index 115db06..115db06 100644 --- a/WebCore/ForwardingHeaders/runtime/StringBuilder.h +++ b/WebCore/ForwardingHeaders/wtf/text/StringBuilder.h 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 |