chrome side of merge from r41181 to r41217

webkit/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 Import(['env'])
 
 env = env.Clone()
 env_res = env.Clone()
@@ skipping 151 matching lines @@
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/sql',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/text',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/plugins',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering/style',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/storage',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/style',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg/animation',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg/graphics',
+        '$CHROME_SRC_DIR/third_party/WebKit/WebCore/workers',
         '$CHROME_SRC_DIR/third_party/WebKit/WebCore/xml',
 
         '$CHROME_SRC_DIR',
     ]],
 )
 
 env.Append(
     CPPDEFINES = [
       'U_STATIC_IMPLEMENTATION',
       '_SCL_SECURE_NO_DEPRECATE',
@@ skipping 94 matching lines @@
 # add their own individual targets to the 'webkit' Alias.
 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll'])
 if env.Bit('windows'):
   env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll'])
 
 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
                       ['$WEBCORE_DIR/Configurations/Version.xcconfig',
                        '$CHROME_SRC_DIR/webkit/build/webkit_version.py'],
                       "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
 env.AlwaysBuild(version)