diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-22 16:58:26 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 9f8811ec084be6ba9380c41abf6e2a080b6d9b91 (patch) | |
| tree | 94cfc7394dc50d1e505c50ac8390360934511b4d /WebCore/loader | |
| parent | 3983c1de0a42b77648fc30d85f25496c772c148f (diff) | |
| download | external_webkit-9f8811ec084be6ba9380c41abf6e2a080b6d9b91.zip external_webkit-9f8811ec084be6ba9380c41abf6e2a080b6d9b91.tar.gz external_webkit-9f8811ec084be6ba9380c41abf6e2a080b6d9b91.tar.bz2 | |
Merge WebKit at r72274: Fix CodeGeneratorV8.pm
Some of the script-generation code puts include statements in source files when
they need to be in headers.
Cherry-picked from webkit:
http://trac.webkit.org/changeset/72948
Change-Id: I07d425bcb97abcdda25b5ff2ea7af887a925f489
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/ResourceLoadScheduler.cpp | 1 | ||||
| -rw-r--r-- | WebCore/loader/cache/MemoryCache.cpp | 1 | ||||
| -rw-r--r-- | WebCore/loader/loader.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/loader/ResourceLoadScheduler.cpp b/WebCore/loader/ResourceLoadScheduler.cpp index 80bea97..ca85ff4 100644 --- a/WebCore/loader/ResourceLoadScheduler.cpp +++ b/WebCore/loader/ResourceLoadScheduler.cpp @@ -35,6 +35,7 @@ #include "ResourceLoader.h" #include "ResourceRequest.h" #include "SubresourceLoader.h" +#include <wtf/text/CString.h> #define REQUEST_MANAGEMENT_ENABLED 1 diff --git a/WebCore/loader/cache/MemoryCache.cpp b/WebCore/loader/cache/MemoryCache.cpp index 25af774..bd42e5f 100644 --- a/WebCore/loader/cache/MemoryCache.cpp +++ b/WebCore/loader/cache/MemoryCache.cpp @@ -39,6 +39,7 @@ #include "SecurityOrigin.h" #include <stdio.h> #include <wtf/CurrentTime.h> +#include <wtf/text/CString.h> using namespace std; diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp index 1d32f82..e1313d6 100644 --- a/WebCore/loader/loader.cpp +++ b/WebCore/loader/loader.cpp @@ -39,6 +39,7 @@ #include "SharedBuffer.h" #include <wtf/Assertions.h> #include <wtf/Vector.h> +#include <wtf/text/CString.h> namespace WebCore { |