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

alex at webkit.org alex at webkit.org
Wed Dec 22 11:57:34 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a1c97d0623dc2c3a7b69644aa02102aa839ec321
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 08:06:57 2010 +0000

    2010-08-12  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by David Levin.
    
            The #if clause enabling a feature should avoid the all includes of
            the feature
            https://bugs.webkit.org/show_bug.cgi?id=43866
    
            Modified the position of the guard to avoid including all the
            headers if the feature controlling the guard is not enabled.
    
            * dom/make_names.pl:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65223 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0efb01b..0c13fa2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-12  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by David Levin.
+
+        The #if clause enabling a feature should avoid the all includes of
+        the feature
+        https://bugs.webkit.org/show_bug.cgi?id=43866
+
+        Modified the position of the guard to avoid including all the
+        headers if the feature controlling the guard is not enabled.
+
+        * dom/make_names.pl:
+
 2010-08-12  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r65221.
diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
index 4b4c7e3..e111eb7 100755
--- a/WebCore/dom/make_names.pl
+++ b/WebCore/dom/make_names.pl
@@ -647,13 +647,17 @@ printLicenseHeader($F);
 
 print F <<END
 #include "config.h"
-#include "$parameters{namespace}ElementFactory.h"
-#include "$parameters{namespace}Names.h"
 END
 ;
 
 print F "\n#if $parameters{guardFactoryWith}\n\n" if $parameters{guardFactoryWith};
 
+print F <<END
+#include "$parameters{namespace}ElementFactory.h"
+#include "$parameters{namespace}Names.h"
+END
+;
+
 printElementIncludes($F);
 
 print F <<END

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list