[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit db8524260a2509e5789e74a5bc9cc1539f015666
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 23:25:37 2009 +0000

    2009-11-18  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Remove Chromium's unnecessary dependency on wtf's tcmalloc files.
    
            https://bugs.webkit.org/show_bug.cgi?id=31648
    
            * JavaScriptCore.gyp/JavaScriptCore.gyp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51144 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d0299ea..0fe6a39 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-18  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Remove Chromium's unnecessary dependency on wtf's tcmalloc files.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31648
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2009-11-18  Thiago Macieira <thiago.macieira at nokia.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index 3f6fe89..83bec5e 100644
--- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -75,7 +75,6 @@
             ],
             'include_dirs': [
               '../os-win32',
-              '<(chromium_src_dir)/webkit/build/JavaScriptCore',
             ],
           }],
           ['OS=="mac"', {
@@ -118,6 +117,7 @@
         ['exclude', '/(GOwnPtr|glib/.*)\\.(cpp|h)$'],
         ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'],
         ['exclude', 'wtf/CurrentTime\\.cpp$'],
+        ['exclude', 'wtf/TC.*\\.(cpp|h)$'],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -137,18 +137,6 @@
             ['exclude', 'ThreadingPthreads\\.cpp$'],
             ['include', 'Thread(ing|Specific)Win\\.cpp$']
           ],
-          'include_dirs': [
-            '<(chromium_src_dir)/webkit/build',
-            '../kjs',
-            '../API',
-            # These 3 do not seem to exist.
-            '../bindings',
-            '../bindings/c',
-            '../bindings/jni',
-            # FIXME: removed these - don't seem to exist
-            'pending',
-            'pending/wtf',
-          ],
           'include_dirs!': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1545dd8..db8d47a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-18  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Remove Chromium port's dependency on some dummy pthreads header
+        files that live in the Chromium repository.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31648
+
+        * DEPS: Remove reference to chromium svn's webkit/build/ directory.
+
 2009-11-18  Evan Stade  <estade at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index a034f24..70dc6ef 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -55,8 +55,6 @@ deps = {
   # build tools
   'build':
     Var('chromium_svn')+'/build@'+Var('chromium_rev'),
-  'webkit/build':
-      Var('chromium_svn')+'/webkit/build@'+Var('chromium_rev'),
   'tools/gyp':
     'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'),
 

-- 
WebKit Debian packaging