[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

dumi at chromium.org dumi at chromium.org
Wed Dec 22 11:46:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f27da1460add307aabb759b1b8d53bc89ec6242e
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 12:25:50 2010 +0000

    Unreviewed, fix the "GTK Linux 64-bit Debug" bot.
    
    CodeGeneratorGObject.pm doesn't know yet how to auto-generate
    callbacks, so we should not auto-generate functions that take
    callbacks as parameters. This shouldn't break anything, because
    all these functions were marked as ["Custom"] until now, and this
    code generator skipped those functions anyway.
    
    * bindings/scripts/CodeGeneratorGObject.pm:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a04c53f..e301e38 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-08-06  Dumitru Daniliuc  <dumi at chromium.org>
 
+        Unreviewed, fix the "GTK Linux 64-bit Debug" bot.
+
+        CodeGeneratorGObject.pm doesn't know yet how to auto-generate
+        callbacks, so we should not auto-generate functions that take
+        callbacks as parameters. This shouldn't break anything, because
+        all these functions were marked as ["Custom"] until now, and this
+        code generator skipped those functions anyway.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+
+2010-08-06  Dumitru Daniliuc  <dumi at chromium.org>
+
         Unreviewed, "Qt Linux Realese minimal" build fix.
 
         * bindings/scripts/CodeGeneratorJS.pm:
diff --git a/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/WebCore/bindings/scripts/CodeGeneratorGObject.pm
index f6a9419..651a9cf 100644
--- a/WebCore/bindings/scripts/CodeGeneratorGObject.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorGObject.pm
@@ -208,6 +208,14 @@ sub SkipFunction {
         return 1;
     }
 
+    # Skip functions that take ["Callback"] parameters, since this
+    # code generator doesn't know yet how to auto-generate callbacks.
+    foreach my $param (@{$function->parameters}) {
+        if ($param->extendedAttributes->{"Callback"}) {
+            return 1;
+        }
+    }
+
     return 0;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list