[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[japhet at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1ecf79445a56a51f689f66cdd7d77f2a975c7f7d
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 3 23:06:59 2010 +0000

    2010-02-03  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, Chromium mac build fix.
    
            [V8] Remove unused V8Proxy* variable from generated wrapping code.
    
            * bindings/scripts/CodeGeneratorV8.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88fdca5..7a388df 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-02-03  Nate Chapin  <japhet at chromium.org>
 
+        Unreviewed, Chromium mac build fix.
+
+        [V8] Remove unused V8Proxy* variable from generated wrapping code.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+
+2010-02-03  Nate Chapin  <japhet at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         [V8] Use toV8() to wrap in the custom bindings, and remove
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 1632646..3862638 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -1956,9 +1956,13 @@ sub GenerateToV8Converters
     push(@implContent, <<END);   
 
 v8::Handle<v8::Object> ${className}::wrap(${nativeType}* impl${forceNewObjectInput}) {
-  V8Proxy* proxy = 0;
   v8::Handle<v8::Object> wrapper;
 END
+    if (!NeedsWorkerContextExecutionProxyToV8($interfaceName)) {
+        push(@implContent, <<END);
+  V8Proxy* proxy = 0;
+END
+    }
 
     if (IsNodeSubType($dataNode)) {
         push(@implContent, <<END);

-- 
WebKit Debian packaging