diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 08:24:22 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 08:24:22 +0000 |
| commit | 9193185e11c562ad867007376f71ef9cefc08b17 (patch) | |
| tree | 1dda8cc14d49f1c393f716ee585478ce55b10ba3 /webkit/build | |
| parent | 087795bdecb90e52a52d9c69a2f0fad5477e3d4f (diff) | |
| download | chromium_src-9193185e11c562ad867007376f71ef9cefc08b17.zip chromium_src-9193185e11c562ad867007376f71ef9cefc08b17.tar.gz chromium_src-9193185e11c562ad867007376f71ef9cefc08b17.tar.bz2 | |
WebKit merge 40500:40539 [Chromium side]
All code fix ups were due to r40508 which "Track redirects in global history."
Review URL: http://codereview.chromium.org/20077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 28 |
2 files changed, 22 insertions, 9 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index fe3afb9..e2ca4f7 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -113,6 +113,7 @@ input_files = [ '$WEBCORE_DIR/dom/ClipboardEvent.cpp', '$WEBCORE_DIR/dom/Comment.cpp', '$WEBCORE_DIR/dom/ContainerNode.cpp', + '$WEBCORE_DIR/dom/CrossThreadCopier.cpp', '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp', '$WEBCORE_DIR/dom/Document.cpp', '$WEBCORE_DIR/dom/DocumentFragment.cpp', @@ -180,7 +181,6 @@ input_files = [ '$WEBCORE_DIR/dom/WorkerLocation.cpp', '$WEBCORE_DIR/dom/WorkerMessagingProxy.cpp', '$WEBCORE_DIR/dom/WorkerRunLoop.cpp', - '$WEBCORE_DIR/dom/WorkerTask.cpp', '$WEBCORE_DIR/dom/WorkerThread.cpp', '$WEBCORE_DIR/dom/XMLTokenizer.cpp', '$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp', @@ -366,6 +366,7 @@ input_files = [ '$WEBCORE_DIR/loader/TextDocument.cpp', '$WEBCORE_DIR/loader/TextResourceDecoder.cpp', '$WEBCORE_DIR/loader/ThreadableLoader.cpp', + '$WEBCORE_DIR/loader/WorkerThreadableLoader.cpp', '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp', '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 5e891c6..554b618 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -848,6 +848,18 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoaderClient.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoaderClientWrapper.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\WorkerThreadableLoader.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\WorkerThreadableLoader.h" + > + </File> <Filter Name="archive" > @@ -4281,6 +4293,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CrossThreadCopier.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CrossThreadCopier.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CSSMappedAttributeDeclaration.cpp" > </File> @@ -4837,14 +4857,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerTask.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerTask.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerThread.cpp" > </File> |