diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bindings/gobject | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/bindings/gobject')
3 files changed, 18 insertions, 6 deletions
diff --git a/Source/WebCore/bindings/gobject/GNUmakefile.am b/Source/WebCore/bindings/gobject/GNUmakefile.am index 4067dbc..881f45a 100644 --- a/Source/WebCore/bindings/gobject/GNUmakefile.am +++ b/Source/WebCore/bindings/gobject/GNUmakefile.am @@ -395,10 +395,13 @@ endif if ENABLE_VIDEO webkitgtk_built_h_api += \ - $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLAudioElement.h + $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLAudioElement.h \ + $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLVideoElement.h webkitgtk_gdom_built_sources += \ DerivedSources/webkit/WebKitDOMHTMLAudioElement.cpp \ - DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h + DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h \ + DerivedSources/webkit/WebKitDOMHTMLVideoElement.cpp \ + DerivedSources/webkit/WebKitDOMHTMLVideoElementPrivate.h endif gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources))))) @@ -424,7 +427,8 @@ $(top_builddir)/DerivedSources/webkit/WebKitDOMEventTargetPrivate.h: $(WebCore)/ $(AM_V_GEN)cp -f $< $@ # Filter out SVG for now -gdom_feature_defines := $(filter-out ENABLE-SVG%, $(FEATURE_DEFINES)) -DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h:: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm +gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(FEATURE_DEFINES))) +DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h:: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am + echo $(gdom_feature_defines) $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject $< diff --git a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp b/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp index a9b0897..aff3434 100644 --- a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp +++ b/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp @@ -57,7 +57,7 @@ static gpointer createWrapper(Node* node) switch (node->nodeType()) { case Node::ELEMENT_NODE: if (node->isHTMLElement()) - wrappedNode = createHTMLElementWrapper(static_cast<HTMLElement*>(node)); + wrappedNode = createHTMLElementWrapper(toHTMLElement(node)); else wrappedNode = wrapElement(static_cast<Element*>(node)); break; @@ -93,7 +93,7 @@ WebKitDOMElement* kit(Element* element) gpointer wrappedElement; if (element->isHTMLElement()) - wrappedElement = createHTMLElementWrapper(static_cast<HTMLElement*>(element)); + wrappedElement = createHTMLElementWrapper(toHTMLElement(element)); else wrappedElement = wrapElement(element); diff --git a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp index 3ac13d1..0a869fd 100644 --- a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp +++ b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp @@ -93,6 +93,7 @@ #include "HTMLTextAreaElement.h" #include "HTMLTitleElement.h" #include "HTMLUListElement.h" +#include "HTMLVideoElement.h" #include "webkit/WebKitDOMHTMLAnchorElementPrivate.h" #include "webkit/WebKitDOMHTMLAppletElementPrivate.h" @@ -156,6 +157,7 @@ #if ENABLE(VIDEO) #include "webkit/WebKitDOMHTMLAudioElementPrivate.h" +#include "webkit/WebKitDOMHTMLVideoElementPrivate.h" #endif #include <wtf/text/CString.h> @@ -187,6 +189,11 @@ static gpointer createAudioWrapper(PassRefPtr<HTMLElement> element) { return wrapHTMLAudioElement(static_cast<HTMLAudioElement*>(element.get())); } + +static gpointer createVideoWrapper(PassRefPtr<HTMLElement> element) +{ + return wrapHTMLVideoElement(static_cast<HTMLVideoElement*>(element.get())); +} #endif static gpointer createBaseWrapper(PassRefPtr<HTMLElement> element) @@ -467,6 +474,7 @@ gpointer createHTMLElementWrapper(PassRefPtr<WebCore::HTMLElement> element) map.set(appletTag.localName().impl(), createAppletWrapper); #if ENABLE(VIDEO) map.set(audioTag.localName().impl(), createAudioWrapper); + map.set(videoTag.localName().impl(), createVideoWrapper); #endif map.set(areaTag.localName().impl(), createAreaWrapper); map.set(baseTag.localName().impl(), createBaseWrapper); |