Changeset 35325 in webkit

Timestamp:

Jul 24, 2008 7:19:35 AM (16 years ago)

Author:

jchaffraix@webkit.org

Message:

2008-07-24 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Eric.

Bug 20029: [XBL] Add more tags

Add <binding> and <template> classes.
Add <div> tag.

The two classes are stubs for the moment.

These tags are required to have a simple XBL example
running.

XBLElement now inherits from StyledElement as <div>
is a placeholder for CSS style information.

• WebCore.xcodeproj/project.pbxproj:
• dom/make_names.pl: Add 'generateNameOnly' attribute used for <div> as we do not want to add a specialized class.

• xbl/XBLBindingElement.h: Added. (WebCore::XBLBindingElement::XBLBindingElement):
• xbl/XBLElement.h: (WebCore::XBLElement::XBLElement): Now XBLElement inherits from styledElement.

• xbl/XBLTemplateElement.h: Added. (WebCore::XBLTemplateElement::XBLTemplateElement):
• xbl/xbltags.in: Add tags.

Location:

branches/XBL2/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dom/make_names.pl (modified) (6 diffs)
• xbl/XBLBindingElement.h (added)
• xbl/XBLElement.h (modified) (1 diff)
• xbl/XBLTemplateElement.h (added)
• xbl/xbltags.in (modified) (1 diff)

branches/XBL2/WebCore/ChangeLog

@@ +1 @@
+2008-07-24  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Eric.
+
+        Bug 20029: [XBL] Add more tags
+
+        Add <binding> and <template> classes.
+        Add <div> tag.
+
+        The two classes are stubs for the moment.
+
+        These tags are required to have a simple XBL example
+        running.
+        
+        XBLElement now inherits from StyledElement as <div>
+        is a placeholder for CSS style information.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/make_names.pl: Add 'generateNameOnly' attribute
+        used for <div> as we do not want to add a specialized
+        class.
+
+        * xbl/XBLBindingElement.h: Added.
+        (WebCore::XBLBindingElement::XBLBindingElement):
+        * xbl/XBLElement.h:
+        (WebCore::XBLElement::XBLElement): Now XBLElement
+        inherits from styledElement.
+
+        * xbl/XBLTemplateElement.h: Added.
+        (WebCore::XBLTemplateElement::XBLTemplateElement):
+        * xbl/xbltags.in: Add tags.
+
 2008-07-24  Julien Chaffraix  <jchaffraix@webkit.org>
 

branches/XBL2/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1827 +1827 @@
                 A10D20A70E386DCF007E500B /* XBLBindingManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A10D20A40E386DCF007E500B /* XBLBindingManager.cpp */; };
                 A10D20A80E386DCF007E500B /* XBLBindingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D20A50E386DCF007E500B /* XBLBindingManager.h */; };
+                A10D21400E389A0D007E500B /* XBLBindingElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D213F0E389A0D007E500B /* XBLBindingElement.h */; };
+                A10D21420E389A18007E500B /* XBLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D21410E389A18007E500B /* XBLTemplateElement.h */; };
                 A1172D6E0E0C539E00175C88 /* XBLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = A1172D6D0E0C539E00175C88 /* XBLDocument.h */; };
                 A718760E0B2A120100A16ECE /* DragActions.h in Headers */ = {isa = PBXBuildFile; fileRef = A718760D0B2A120100A16ECE /* DragActions.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -6299 +6301 @@
                 A10D20A40E386DCF007E500B /* XBLBindingManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBLBindingManager.cpp; sourceTree = "<group>"; };
                 A10D20A50E386DCF007E500B /* XBLBindingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBLBindingManager.h; sourceTree = "<group>"; };
+                A10D213F0E389A0D007E500B /* XBLBindingElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBLBindingElement.h; sourceTree = "<group>"; };
+                A10D21410E389A18007E500B /* XBLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBLTemplateElement.h; sourceTree = "<group>"; };
                 A1172D6D0E0C539E00175C88 /* XBLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBLDocument.h; sourceTree = "<group>"; };
                 A718760D0B2A120100A16ECE /* DragActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragActions.h; sourceTree = "<group>"; };
@@ -13300 +13304 @@
                         isa = PBXGroup;
                         children = (
+                                A10D21410E389A18007E500B /* XBLTemplateElement.h */,
+                                A10D213F0E389A0D007E500B /* XBLBindingElement.h */,
                                 A10D20A30E386DCF007E500B /* XBLBinding.h */,
                                 A10D20A40E386DCF007E500B /* XBLBindingManager.cpp */,
@@ -15320 +15326 @@
                                 A10D20A60E386DCF007E500B /* XBLBinding.h in Headers */,
                                 A10D20A80E386DCF007E500B /* XBLBindingManager.h in Headers */,
+                                A10D21400E389A0D007E500B /* XBLBindingElement.h in Headers */,
+                                A10D21420E389A18007E500B /* XBLTemplateElement.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

branches/XBL2/WebCore/dom/make_names.pl

@@ -87 +87 @@
 {
     return ('upperCase' => upperCaseName($_[0]),
-            'applyAudioHack' => 0);
+            'applyAudioHack' => 0,
+            'generateNameOnly' => 0);
 }
 
@@ -237 +238 @@
     print F "#if $parameters{'guardFactoryWith'}\n" if $parameters{'guardFactoryWith'};
     for my $name (sort keys %names) {
+        next if ($names{$name}{'generateNameOnly'});
+
         my $ucName = $names{$name}{"upperCase"};
 
@@ -250 +253 @@
 {
     my ($F, $namesRef) = @_;
-    for my $name (sort keys %$namesRef) {
+    my %names = %$namesRef;
+    for my $name (sort keys %names) {
+        next if ($names{$name}{'generateNameOnly'});
+        
         print F "    gFunctionMap->set(${name}Tag.localName().impl(), ${name}Constructor);\n";
     }
@@ -460 +466 @@
     my %names = %$namesRef;
     for my $name (sort keys %names) {
-        next if ($shouldSkipCustomMappings && hasCustomMapping($name));
+        next if ($names{$name}{'generateNameOnly'} || ($shouldSkipCustomMappings && hasCustomMapping($name)));
 
         my $ucName = $names{$name}{"upperCase"};
@@ -722 +728 @@
     for my $name (sort keys %names) {
         # Custom mapping do not need a JS wrapper
-        next if (hasCustomMapping($name));
+        next if ($names{$name}{'generateNameOnly'} || hasCustomMapping($name));
 
         my $ucName = $names{$name}{"upperCase"};
@@ -793 +799 @@
 
     for my $tag (sort keys %tags) {
-        next if (hasCustomMapping($tag));
+        next if ($tags{$tag}{'generateNameOnly'} || hasCustomMapping($tag));
 
         my $ucTag = $tags{$tag}{"upperCase"};

branches/XBL2/WebCore/xbl/XBLElement.h

@@ -30 +30 @@
 
 #include "config.h"
-#include "Element.h"
+#include "StyledElement.h"
 
 namespace WebCore {
 
-    class XBLElement : public Element {
+    class XBLElement : public StyledElement {
     public:
         XBLElement(const WebCore::QualifiedName& qName, WebCore::Document* doc)
-            : Element(qName, doc)
+            : StyledElement(qName, doc)
         {
         }

branches/XBL2/WebCore/xbl/xbltags.in

@@ -1 +1 @@
 <tags namespace="XBL" cppNamespace="WebCore" namespaceURI="http://www.w3.org/ns/xbl" generateFactory="1" guardFactoryWith="ENABLE(XBL)">
+<binding/>
+<div generateNameOnly="1"/>
+<template/>
 <xbl upperCase="XBL"/>
 </tags>