diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 23:55:44 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 23:55:44 +0000 |
| commit | cc4bc3ef34e0914eab32c694f7bccf2d8db999ce (patch) | |
| tree | 736355e8a2ada6337607ef714209aeec83d94db6 /webkit | |
| parent | 8d6fe0fbee3589e1cc6eb64a442a6a795854bb8d (diff) | |
| download | chromium_src-cc4bc3ef34e0914eab32c694f7bccf2d8db999ce.zip chromium_src-cc4bc3ef34e0914eab32c694f7bccf2d8db999ce.tar.gz chromium_src-cc4bc3ef34e0914eab32c694f7bccf2d8db999ce.tar.bz2 | |
Land http://codereview.chromium.org/155575 for atwilson.
BUG=15880
TEST=none
Review URL: http://codereview.chromium.org/149722
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/webkit.gyp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 32d1433..9760266 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -14,6 +14,7 @@ 'ENABLE_ICONDATABASE=0', 'ENABLE_XSLT=1', 'ENABLE_XPATH=1', + 'ENABLE_SHARED_WORKERS=0', 'ENABLE_SVG=1', 'ENABLE_SVG_ANIMATION=1', 'ENABLE_SVG_AS_IMAGE=1', @@ -542,6 +543,7 @@ '--include', '../third_party/WebKit/WebCore/page', '--include', '../third_party/WebKit/WebCore/plugins', '--include', '../third_party/WebKit/WebCore/svg', + '--include', '../third_party/WebKit/WebCore/workers', '--include', '../third_party/WebKit/WebCore/xml', ], }, @@ -676,16 +678,6 @@ '../third_party/WebKit/WebCore/storage/StorageArea.cpp', '../third_party/WebKit/WebCore/storage/StorageNamespace.cpp', - # ENABLE_SHARED_WORKES only. - '../third_party/WebKit/WebCore/workers/AbstractWorker.idl', - '../third_party/WebKit/WebCore/workers/SharedWorker.idl', - '../third_party/WebKit/WebCore/workers/AbstractWorker.cpp', - '../third_party/WebKit/WebCore/workers/AbstractWorker.h', - '../third_party/WebKit/WebCore/workers/SharedWorker.cpp', - '../third_party/WebKit/WebCore/workers/SharedWorker.h', - '../third_party/WebKit/WebCore/custom/V8AbstractWorkerCustom.cpp', - '../third_party/WebKit/WebCore/custom/V8SharedWorkerCustom.cpp', - # Use history/BackForwardListChromium.cpp instead. '../third_party/WebKit/WebCore/history/BackForwardList.cpp', |