[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

xan at webkit.org xan at webkit.org
Thu Feb 4 21:24:33 UTC 2010 

The following commit has been merged in the webkit-1.1 branch:
commit dcdc04ceaa4a6353d0e05c0fb2a5689a7ef5f709
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 08:42:35 2010 +0000

    2010-01-22  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            [GTK] GObject DOM bindings
            https://bugs.webkit.org/show_bug.cgi?id=33590
    
            Rename FEATURE_DEFINES_JAVASCRIPT to FEATURE_DEFINES and remove
            the hardcoded LANGUAGE_JAVASCRIPT=1, in preparation for its use by
            the GObject DOM bindings.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 78521a3..779cef7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-22  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] GObject DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=33590
+
+        Rename FEATURE_DEFINES_JAVASCRIPT to FEATURE_DEFINES and remove
+        the hardcoded LANGUAGE_JAVASCRIPT=1, in preparation for its use by
+        the GObject DOM bindings.
+
+        * GNUmakefile.am:
+
 2010-01-22  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index b933ea5..9bbc843 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1,7 +1,7 @@
 
 WebCore := $(srcdir)/WebCore
 
-FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1
+FEATURE_DEFINES :=
 SVG_FEATURES :=
 HTML_FEATURES :=
 
@@ -2094,7 +2094,7 @@ endif
 # Channel mesaging support
 # ---
 if ENABLE_CHANNEL_MESSAGING
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
+FEATURE_DEFINES += ENABLE_CHANNEL_MESSAGING=1
 
 webcore_cppflags += \
 	-DENABLE_CHANNEL_MESSAGING=1
@@ -2132,7 +2132,7 @@ endif # END USE_PANGO
 # ----
 # HTML Data Grid - disable for now.
 # ----
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=0
+FEATURE_DEFINES += ENABLE_DATAGRID=0
 
 webcore_cppflags += \
 	-DENABLE_DATAGRID=0
@@ -2141,7 +2141,7 @@ webcore_cppflags += \
 # JavaScript Debugger/Profiler
 # ----
 if ENABLE_JAVASCRIPT_DEBUGGER
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
+FEATURE_DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
 
 webcore_cppflags += \
 	-DENABLE_JAVASCRIPT_DEBUGGER=1
@@ -2156,7 +2156,7 @@ endif # END ENABLE_JAVASCRIPT_DEBUGGER
 # Offline Web Applications
 # ----
 if ENABLE_OFFLINE_WEB_APPLICATIONS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
+FEATURE_DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
 
 IDL_BINDINGS += \
 	WebCore/loader/appcache/DOMApplicationCache.idl
@@ -2187,7 +2187,7 @@ endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
 # Database Support
 # ----
 if ENABLE_DATABASE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
+FEATURE_DEFINES += ENABLE_DATABASE=1
 
 IDL_BINDINGS += \
 	WebCore/storage/Database.idl \
@@ -2267,7 +2267,7 @@ endif # END ENABLE_DATABASE
 # HTML5 datalist Support
 # ----
 if ENABLE_DATALIST
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1
+FEATURE_DEFINES += ENABLE_DATALIST=1
 HTML_FEATURES += ENABLE_DATALIST=1
 
 webcore_cppflags += -DENABLE_DATALIST=1
@@ -2282,7 +2282,7 @@ global_cppflags += -DENABLE_EVENTSOURCE=0
 endif
 
 if ENABLE_EVENTSOURCE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1
+FEATURE_DEFINES += ENABLE_EVENTSOURCE=1
 
 webcore_cppflags += \
 	-DENABLE_EVENTSOURCE=1
@@ -2292,7 +2292,7 @@ endif # ENABLE_EVENTSOURCE
 # HTML5 client-side session and persistent storage
 # ----
 if ENABLE_DOM_STORAGE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
+FEATURE_DEFINES += ENABLE_DOM_STORAGE=1
 
 IDL_BINDINGS += \
 	WebCore/storage/Storage.idl \
@@ -2356,7 +2356,7 @@ endif # END ENABLE_ICONDATABASE
 # ----
 if ENABLE_ORIENTATION_EVENTS
 
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
+FEATURE_DEFINES += ENABLE_ORIENTATION_EVENTS=1
 
 webcore_cppflags += -DENABLE_ORIENTATION_EVENTS=1
 
@@ -2366,7 +2366,7 @@ endif # END ENABLE_ORIENTATION_EVENTS
 # Video Support
 # ----
 if ENABLE_VIDEO
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
+FEATURE_DEFINES += ENABLE_VIDEO=1
 
 HTML_FEATURES += ENABLE_VIDEO=1
 webcore_cppflags += -DENABLE_VIDEO=1
@@ -2418,7 +2418,7 @@ endif # END ENABLE_VIDEO
 # XHTML-MP Support
 # ----
 if ENABLE_XHTMLMP
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
+FEATURE_DEFINES += ENABLE_XHTMLMP=1
 
 webcore_cppflags += -DENABLE_XHTMLMP=1
 
@@ -2431,7 +2431,7 @@ endif # END ENABLE_XHTMLMP
 # XPath Support
 # ----
 if ENABLE_XPATH
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
+FEATURE_DEFINES += ENABLE_XPATH=1
 
 webcore_cppflags += -DENABLE_XPATH=1
 
@@ -2501,7 +2501,7 @@ endif # END ENABLE_XPATH
 # XSLT Support
 # ----
 if ENABLE_XSLT
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
+FEATURE_DEFINES += ENABLE_XSLT=1
 
 webcore_cppflags += -DENABLE_XSLT=1
 
@@ -2525,7 +2525,7 @@ endif # END ENABLE_XSLT
 # Web Workers support
 # ----
 if ENABLE_WORKERS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1
+FEATURE_DEFINES += ENABLE_WORKERS=1
 
 webcore_cppflags += \
 	-DENABLE_WORKERS=1
@@ -2575,7 +2575,7 @@ endif
 # SharedWorker support
 # ---
 if ENABLE_SHARED_WORKERS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1
+FEATURE_DEFINES += ENABLE_SHARED_WORKERS=1
 
 webcore_cppflags += \
 	-DENABLE_SHARED_WORKERS=1
@@ -2599,7 +2599,7 @@ endif
 # WML Support
 # ----
 if ENABLE_WML
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_WML=1
+FEATURE_DEFINES += ENABLE_WML=1
 
 webcore_built_sources += \
 	DerivedSources/WMLElementFactory.cpp \
@@ -2658,7 +2658,7 @@ endif # END ENABLE_WML
 # ----
 if ENABLE_FILTERS
 
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
+FEATURE_DEFINES += ENABLE_FILTERS=1
 webcore_cppflags += -DENABLE_FILTERS=1
 
 webcore_sources += \
@@ -2693,7 +2693,7 @@ endif # END ENABLE_FILTERS
 # ----
 if ENABLE_GEOLOCATION
 
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1
+FEATURE_DEFINES += ENABLE_GEOLOCATION=1
 webcore_cppflags += \
 	-DENABLE_GEOLOCATION=1
 
@@ -2707,7 +2707,7 @@ endif # END ENABLE_GEOLOCATION
 # ----
 if ENABLE_MATHML
 
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_MATHML=1
+FEATURE_DEFINES += ENABLE_MATHML=1
 
 webcore_cppflags += \
 	-DENABLE_MATHML=1
@@ -2746,7 +2746,7 @@ endif # END ENABLE_MATHML
 # Notifications support
 # ----
 if ENABLE_NOTIFICATIONS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1
+FEATURE_DEFINES += ENABLE_NOTIFICATIONS=1
 
 webcore_cppflags += \
 	-DENABLE_NOTIFICATIONS=1
@@ -2767,7 +2767,7 @@ endif # END ENABLE_NOTIFICATIONS
 # FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature
 # ----
 if ENABLE_SVG
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
+FEATURE_DEFINES += ENABLE_SVG=1
 
 WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in 
 WEBCORE_CSS_VALUE_KEYWORDS += $(WebCore)/css/SVGCSSValueKeywords.in
@@ -3342,31 +3342,31 @@ webcore_sources += \
 
 # SVG Features
 if ENABLE_SVG_USE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_USE=1
+FEATURE_DEFINES += ENABLE_SVG_USE=1
 SVG_FEATURES += ENABLE_SVG_USE=1
 webcore_cppflags += -DENABLE_SVG_USE=1
 endif
 
 if ENABLE_SVG_FOREIGN_OBJECT
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FOREIGN_OBJECT=1
+FEATURE_DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
 SVG_FEATURES += ENABLE_SVG_FOREIGN_OBJECT=1
 webcore_cppflags += -DENABLE_SVG_FOREIGN_OBJECT=1
 endif
 
 if ENABLE_SVG_FONTS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FONTS=1
+FEATURE_DEFINES += ENABLE_SVG_FONTS=1
 SVG_FEATURES += ENABLE_SVG_FONTS=1
 webcore_cppflags += -DENABLE_SVG_FONTS=1
 endif
 
 if ENABLE_SVG_AS_IMAGE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_AS_IMAGE=1
+FEATURE_DEFINES += ENABLE_SVG_AS_IMAGE=1
 SVG_FEATURES += ENABLE_SVG_AS_IMAGE=1
 webcore_cppflags += -DENABLE_SVG_AS_IMAGE=1
 endif
 
 if ENABLE_SVG_ANIMATION
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_ANIMATION=1
+FEATURE_DEFINES += ENABLE_SVG_ANIMATION=1
 SVG_FEATURES += ENABLE_SVG_ANIMATION=1
 webcore_cppflags += -DENABLE_SVG_ANIMATION=1
 endif
@@ -3397,7 +3397,7 @@ endif # END ENABLE_SVG
 # Web Sockets Support
 # ----
 if ENABLE_WEB_SOCKETS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
+FEATURE_DEFINES += ENABLE_WEB_SOCKETS=1
 
 IDL_BINDINGS += \
 	WebCore/websockets/WebSocket.idl
@@ -3550,7 +3550,7 @@ DerivedSources/JS%.h: DerivedSources/JS%.cpp;
 
 .SECONDARY:
 DerivedSources/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
-	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES)" --defines "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS $<
+	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS $<
 
 IDL_BINDINGS_JS_PURE := \
 	WebCore/svg/ElementTimeControl.idl \

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list