diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/ForwardingHeaders | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/ForwardingHeaders')
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/collector/handles/Global.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/heap/Heap.h (renamed from Source/WebCore/ForwardingHeaders/runtime/Heap.h) | 0 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/heap/Strong.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/heap/Weak.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/runtime/JSNumberCell.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/runtime/WeakGCPtr.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/wtf/Alignment.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/ForwardingHeaders/wtf/DynamicAnnotations.h | 4 |
8 files changed, 16 insertions, 12 deletions
diff --git a/Source/WebCore/ForwardingHeaders/collector/handles/Global.h b/Source/WebCore/ForwardingHeaders/collector/handles/Global.h deleted file mode 100644 index 0ad6d56..0000000 --- a/Source/WebCore/ForwardingHeaders/collector/handles/Global.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef WebCore_FWD_Global_h -#define WebCore_FWD_Global_h -#include <JavaScriptCore/Global.h> -#endif diff --git a/Source/WebCore/ForwardingHeaders/runtime/Heap.h b/Source/WebCore/ForwardingHeaders/heap/Heap.h index 810fa3c..810fa3c 100644 --- a/Source/WebCore/ForwardingHeaders/runtime/Heap.h +++ b/Source/WebCore/ForwardingHeaders/heap/Heap.h diff --git a/Source/WebCore/ForwardingHeaders/heap/Strong.h b/Source/WebCore/ForwardingHeaders/heap/Strong.h new file mode 100644 index 0000000..31eb46d --- /dev/null +++ b/Source/WebCore/ForwardingHeaders/heap/Strong.h @@ -0,0 +1,4 @@ +#ifndef WebCore_FWD_Strong_h +#define WebCore_FWD_Strong_h +#include <JavaScriptCore/Strong.h> +#endif diff --git a/Source/WebCore/ForwardingHeaders/heap/Weak.h b/Source/WebCore/ForwardingHeaders/heap/Weak.h new file mode 100644 index 0000000..182542c --- /dev/null +++ b/Source/WebCore/ForwardingHeaders/heap/Weak.h @@ -0,0 +1,4 @@ +#ifndef WebCore_FWD_Weak_h +#define WebCore_FWD_Weak_h +#include <JavaScriptCore/Weak.h> +#endif diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSNumberCell.h b/Source/WebCore/ForwardingHeaders/runtime/JSNumberCell.h deleted file mode 100644 index e8d3227..0000000 --- a/Source/WebCore/ForwardingHeaders/runtime/JSNumberCell.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef WebCore_FWD_JSNumberCell_h -#define WebCore_FWD_JSNumberCell_h -#include <JavaScriptCore/JSNumberCell.h> -#endif diff --git a/Source/WebCore/ForwardingHeaders/runtime/WeakGCPtr.h b/Source/WebCore/ForwardingHeaders/runtime/WeakGCPtr.h deleted file mode 100644 index e87f8f2..0000000 --- a/Source/WebCore/ForwardingHeaders/runtime/WeakGCPtr.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef WebCore_FWD_WeakGCPtr_h -#define WebCore_FWD_WeakGCPtr_h -#include <JavaScriptCore/WeakGCPtr.h> -#endif diff --git a/Source/WebCore/ForwardingHeaders/wtf/Alignment.h b/Source/WebCore/ForwardingHeaders/wtf/Alignment.h new file mode 100644 index 0000000..3754945 --- /dev/null +++ b/Source/WebCore/ForwardingHeaders/wtf/Alignment.h @@ -0,0 +1,4 @@ +#ifndef WebCore_FWD_Alignment_h +#define WebCore_FWD_Alignment_h +#include <JavaScriptCore/Alignment.h> +#endif diff --git a/Source/WebCore/ForwardingHeaders/wtf/DynamicAnnotations.h b/Source/WebCore/ForwardingHeaders/wtf/DynamicAnnotations.h new file mode 100644 index 0000000..e5a2f2d --- /dev/null +++ b/Source/WebCore/ForwardingHeaders/wtf/DynamicAnnotations.h @@ -0,0 +1,4 @@ +#ifndef WebCore_FWD_DynamicAnnotations_h +#define WebCore_FWD_DynamicAnnotations_h +#include <JavaScriptCore/DynamicAnnotations.h> +#endif |