diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/JavaScriptGlue | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/JavaScriptGlue')
| -rw-r--r-- | Source/JavaScriptGlue/ChangeLog | 16 | ||||
| -rw-r--r-- | Source/JavaScriptGlue/JSUtils.h | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog index 792075a..3188ba7 100644 --- a/Source/JavaScriptGlue/ChangeLog +++ b/Source/JavaScriptGlue/ChangeLog @@ -1,3 +1,19 @@ +2011-01-17 Dan Bernstein <mitz@apple.com> + + Rubber-stamped by Mark Rowe. + + Update xcodeproj svn:ignore to include xcuserdata. + + * JavaScriptGlue.xcodeproj: Modified property svn:ignore. + +2011-01-10 Geoffrey Garen <ggaren@apple.com> + + Reviewed by Oliver Hunt. + + Moved Collector.* => Heap.*, since the file contains a class named "Heap". + + * JSUtils.h: + 2011-01-02 Dan Bernstein <mitz@apple.com> Rubber-stamped by Simon Fraser. diff --git a/Source/JavaScriptGlue/JSUtils.h b/Source/JavaScriptGlue/JSUtils.h index cbd9912..ec55254 100644 --- a/Source/JavaScriptGlue/JSUtils.h +++ b/Source/JavaScriptGlue/JSUtils.h @@ -31,7 +31,7 @@ #include "JavaScriptGlue.h" -#include <JavaScriptCore/Collector.h> +#include <JavaScriptCore/Heap.h> #include <JavaScriptCore/JSValue.h> #include <JavaScriptCore/Completion.h> #include <JavaScriptCore/Identifier.h> |