summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
commitf460ef7d1e7e9421be4e7f868b2629fc64060ade (patch)
treefb86d8ea685f04a2bd84307a17bba172a2e07f1f /webkit/build
parent0a93350fc146cd0ecf360b704f4934817e9c6be0 (diff)
downloadchromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.zip
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.gz
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.bz2
Chrome side of webkit merge to r40164.
One file added between r40124 and r40164, however, all the worker files didn't seem to be in the xcode project so I added all of them. Review URL: http://codereview.chromium.org/18733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index f901c90..fa4d730 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -178,6 +178,7 @@ input_files = [
'$WEBCORE_DIR/dom/WorkerContext.cpp',
'$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',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 2888166..0e5d893 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4867,6 +4867,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerTask.cpp"
>
</File>