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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 58aef0fb2b203ea8d4860623aaf910c4ba49e9ea
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 13:08:19 2010 +0000

    2010-08-25  Zaheer Ahmad <zaheer.mot at gmail.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] GTK port doesnt compile with video turned off
            https://bugs.webkit.org/show_bug.cgi?id=44236
    
            Generate the audio GObject DOM bindings only if video enabled
            * WebCore/GNUMakefile.am
            * WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp:
            Make the audio code invocation conditional
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 4c09c92..6496c0c 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -385,7 +385,6 @@ webkitgtk_built_h_api += \
 	DerivedSources/webkit/WebKitDOMHTMLAnchorElement.h \
 	DerivedSources/webkit/WebKitDOMHTMLAppletElement.h \
 	DerivedSources/webkit/WebKitDOMHTMLAreaElement.h \
-	DerivedSources/webkit/WebKitDOMHTMLAudioElement.h \
 	DerivedSources/webkit/WebKitDOMHTMLBaseElement.h \
 	DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.h \
 	DerivedSources/webkit/WebKitDOMHTMLBlockquoteElement.h \
@@ -549,8 +548,6 @@ webkitgtk_gdom_built_sources += \
 	DerivedSources/webkit/WebKitDOMHTMLAppletElementPrivate.h \
 	DerivedSources/webkit/WebKitDOMHTMLAreaElement.cpp \
 	DerivedSources/webkit/WebKitDOMHTMLAreaElementPrivate.h \
-	DerivedSources/webkit/WebKitDOMHTMLAudioElement.cpp \
-	DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h \
 	DerivedSources/webkit/WebKitDOMHTMLBaseElement.cpp \
 	DerivedSources/webkit/WebKitDOMHTMLBaseElementPrivate.h \
 	DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.cpp \
@@ -733,6 +730,15 @@ webkitgtk_gdom_built_sources += \
 	DerivedSources/webkit/WebKitDOMGeolocationPrivate.h
 endif
 
+if ENABLE_VIDEO
+webkitgtk_built_h_api += \
+	$(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLAudioElement.h
+
+webkitgtk_gdom_built_sources += \
+	DerivedSources/webkit/WebKitDOMHTMLAudioElement.cpp \
+	DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h
+endif
+
 # webkitenumtypes.{h,cpp} cannot be in webkitgtk_built_h_api, because
 # the rule that builds it depends on webkitgtk_built_h_api (circular dependency).
 webkitgtk_built_sources += \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 56db3b4..f8a1653 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Zaheer Ahmad <zaheer.mot at gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] GTK port doesnt compile with video turned off
+        https://bugs.webkit.org/show_bug.cgi?id=44236
+
+        Generate the audio GObject DOM bindings only if video enabled
+        * WebCore/GNUMakefile.am
+        * WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp:
+        Make the audio code invocation conditional
+
+
 2010-08-24  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp b/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp
index 4c57946..da420ae 100644
--- a/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp
+++ b/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp
@@ -96,7 +96,6 @@
 #include "webkit/WebKitDOMHTMLAnchorElementPrivate.h"
 #include "webkit/WebKitDOMHTMLAppletElementPrivate.h"
 #include "webkit/WebKitDOMHTMLAreaElementPrivate.h"
-#include "webkit/WebKitDOMHTMLAudioElementPrivate.h"
 #include "webkit/WebKitDOMHTMLBRElementPrivate.h"
 #include "webkit/WebKitDOMHTMLBaseElementPrivate.h"
 #include "webkit/WebKitDOMHTMLBaseFontElementPrivate.h"
@@ -153,6 +152,10 @@
 #include "webkit/WebKitDOMHTMLUListElementPrivate.h"
 #include "webkit/webkitdom.h"
 
+#if ENABLE(VIDEO)
+#include "webkit/WebKitDOMHTMLAudioElementPrivate.h"
+#endif
+
 #include <wtf/text/CString.h>
 
 namespace WebKit {
@@ -177,10 +180,12 @@ static gpointer createAreaWrapper(PassRefPtr<HTMLElement> element)
     return wrapHTMLAreaElement(static_cast<HTMLAreaElement*>(element.get()));
 }
 
+#if ENABLE(VIDEO)
 static gpointer createAudioWrapper(PassRefPtr<HTMLElement> element)
 {
     return wrapHTMLAudioElement(static_cast<HTMLAudioElement*>(element.get()));
 }
+#endif
 
 static gpointer createBaseWrapper(PassRefPtr<HTMLElement> element)
 {
@@ -453,7 +458,9 @@ gpointer createHTMLElementWrapper(PassRefPtr<WebCore::HTMLElement> element)
     if (map.isEmpty()) {
        map.set(aTag.localName().impl(), createAnchorWrapper);
        map.set(appletTag.localName().impl(), createAppletWrapper);
+#if ENABLE(VIDEO)
        map.set(audioTag.localName().impl(), createAudioWrapper);
+#endif
        map.set(areaTag.localName().impl(), createAreaWrapper);
        map.set(baseTag.localName().impl(), createBaseWrapper);
        map.set(basefontTag.localName().impl(), createBaseFontWrapper);

-- 
WebKit Debian packaging