diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /Source/JavaScriptGlue/ForwardingHeaders/wtf/text | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'Source/JavaScriptGlue/ForwardingHeaders/wtf/text')
6 files changed, 6 insertions, 0 deletions
diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/CString.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/CString.h new file mode 100644 index 0000000..50e766b --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/CString.h @@ -0,0 +1 @@ +#include <JavaScriptCore/CString.h> diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringHash.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringHash.h new file mode 100644 index 0000000..902082f --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringHash.h @@ -0,0 +1 @@ +#include <JavaScriptCore/StringHash.h> diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImpl.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImpl.h new file mode 100644 index 0000000..029ea84 --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImpl.h @@ -0,0 +1 @@ +#include <JavaScriptCore/StringImpl.h> diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImplBase.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImplBase.h new file mode 100644 index 0000000..7e0597b --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/StringImplBase.h @@ -0,0 +1 @@ +#include <JavaScriptCore/StringImplBase.h> diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/TextPosition.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/TextPosition.h new file mode 100644 index 0000000..bd4f09b --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/TextPosition.h @@ -0,0 +1 @@ +#include <JavaScriptCore/TextPosition.h> diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/WTFString.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/WTFString.h new file mode 100644 index 0000000..8addade --- /dev/null +++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/text/WTFString.h @@ -0,0 +1 @@ +#include <JavaScriptCore/WTFString.h> |