diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 23:19:37 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 23:19:37 +0000 |
| commit | e2756703a3c14d7c60c6a476f4452ae60fb0adaf (patch) | |
| tree | b15a09a7ed4b94dc6e23bb9595bfc7ac42bc8580 /webkit/webkit.gyp | |
| parent | df53c2eafb50eb3a800dc58ce2e0fbb0f4c97ccc (diff) | |
| download | chromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.zip chromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.tar.gz chromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.tar.bz2 | |
WebKit merge 41530:41559.
Minor issues:
1- WebCore::Position no longer has an offset() method. Instead, it seems
to have been replaced by a public m_offset member variable. WebCore code
now just uses that directly instead, so we need to do the same.
2- Added / removed sources from the project files.
R=eroman
Review URL: http://codereview.chromium.org/42046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 1d57683..4bf64c3 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -231,8 +231,8 @@ '../third_party/WebKit/JavaScriptCore/wtf/Assertions.h', '../third_party/WebKit/JavaScriptCore/wtf/ByteArray.cpp', '../third_party/WebKit/JavaScriptCore/wtf/ByteArray.h', - '../third_party/WebKit/JavaScriptCore/wtf/CurrentTime.cpp', '../third_party/WebKit/JavaScriptCore/wtf/CurrentTime.h', + '../third_party/WebKit/JavaScriptCore/wtf/CrossThreadRefCounted.h', '../third_party/WebKit/JavaScriptCore/wtf/Deque.h', '../third_party/WebKit/JavaScriptCore/wtf/DisallowCType.h', '../third_party/WebKit/JavaScriptCore/wtf/FastMalloc.cpp', @@ -1765,6 +1765,10 @@ '../third_party/WebKit/WebCore/loader/CachedXBLDocument.h', '../third_party/WebKit/WebCore/loader/CachedXSLStyleSheet.cpp', '../third_party/WebKit/WebCore/loader/CachedXSLStyleSheet.h', + '../third_party/WebKit/WebCore/loader/CrossOriginAccessControl.cpp', + '../third_party/WebKit/WebCore/loader/CrossOriginAccessControl.h', + '../third_party/WebKit/WebCore/loader/CrossOriginPreflightResultCache.cpp', + '../third_party/WebKit/WebCore/loader/CrossOriginPreflightResultCache.h', '../third_party/WebKit/WebCore/loader/DocLoader.cpp', '../third_party/WebKit/WebCore/loader/DocLoader.h', '../third_party/WebKit/WebCore/loader/DocumentLoader.cpp', @@ -2743,8 +2747,6 @@ '../third_party/WebKit/WebCore/platform/text/TextCodecUTF16.h', '../third_party/WebKit/WebCore/platform/text/TextCodecUserDefined.cpp', '../third_party/WebKit/WebCore/platform/text/TextCodecUserDefined.h', - '../third_party/WebKit/WebCore/platform/text/TextDecoder.cpp', - '../third_party/WebKit/WebCore/platform/text/TextDecoder.h', '../third_party/WebKit/WebCore/platform/text/TextDirection.h', '../third_party/WebKit/WebCore/platform/text/TextEncoding.cpp', '../third_party/WebKit/WebCore/platform/text/TextEncoding.h', @@ -3669,6 +3671,8 @@ '../third_party/WebKit/WebCore/workers/WorkerContext.cpp', '../third_party/WebKit/WebCore/workers/WorkerContext.h', '../third_party/WebKit/WebCore/workers/WorkerContextProxy.h', + '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.cpp', + '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.h', '../third_party/WebKit/WebCore/workers/WorkerLocation.cpp', '../third_party/WebKit/WebCore/workers/WorkerLocation.h', '../third_party/WebKit/WebCore/workers/WorkerMessagingProxy.cpp', |