[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 400db120e90d38b22f99a4f5f916e4157884e482
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 10 01:23:53 2003 +0000

    	Implement start() and stop() for marquees.
    
            Reviewed by darin
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLElement::classInfo):
            (KJS::HTMLElementFunction::tryCall):
            * khtml/ecma/kjs_html.h:
            (KJS::HTMLElement::):
            * khtml/ecma/kjs_html.lut.h:
            (KJS::):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0c5c521..d794015 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-12-09  David Hyatt  <hyatt at apple.com>
+
+	Implement start() and stop() for marquees.
+	
+        Reviewed by darin
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLElement::classInfo):
+        (KJS::HTMLElementFunction::tryCall):
+        * khtml/ecma/kjs_html.h:
+        (KJS::HTMLElement::):
+        * khtml/ecma/kjs_html.lut.h:
+        (KJS::):
+
 2003-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 3d0b8fa..20fca38 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -47,6 +47,7 @@
 #include "misc/htmltags.h"
 
 #include "rendering/render_object.h"
+#include "rendering/render_layer.h"
 
 #include <kdebug.h>
 
@@ -487,6 +488,7 @@ const ClassInfo KJS::HTMLElement::tablecell_info = { "HTMLTableCellElement", &KJ
 const ClassInfo KJS::HTMLElement::frameSet_info = { "HTMLFrameSetElement", &KJS::HTMLElement::info, &HTMLFrameSetElementTable, 0 };
 const ClassInfo KJS::HTMLElement::frame_info = { "HTMLFrameElement", &KJS::HTMLElement::info, &HTMLFrameElementTable, 0 };
 const ClassInfo KJS::HTMLElement::iFrame_info = { "HTMLIFrameElement", &KJS::HTMLElement::info, &HTMLIFrameElementTable, 0 };
+const ClassInfo KJS::HTMLElement::marquee_info = { "HTMLMarqueeElement", &KJS::HTMLElement::info, &HTMLMarqueeElementTable, 0 };
 
 const ClassInfo* KJS::HTMLElement::classInfo() const
 {
@@ -610,6 +612,8 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
     return &frame_info;
   case ID_IFRAME:
     return &iFrame_info;
+  case ID_MARQUEE:
+    return &marquee_info;
   default:
     return &info;
   }
@@ -1067,6 +1071,11 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
   src		  KJS::HTMLElement::IFrameSrc			DontDelete
   width		  KJS::HTMLElement::IFrameWidth			DontDelete
 @end
+
+ at begin HTMLMarqueeElementTable 2
+  start           KJS::HTMLElement::MarqueeStart		DontDelete|Function 0
+  stop            KJS::HTMLElement::MarqueeStop                 DontDelete|Function 0
+ at end
 */
 
 Value KJS::HTMLElement::tryGet(ExecState *exec, const Identifier &propertyName) const
@@ -2098,6 +2107,22 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
         return Undefined();
       }
     }
+    case ID_MARQUEE: {
+        if (id == KJS::HTMLElement::MarqueeStart && element.handle()->renderer() && 
+            element.handle()->renderer()->layer() &&
+            element.handle()->renderer()->layer()->marquee()) {
+            element.handle()->renderer()->layer()->marquee()->start();
+            return Undefined();
+        }
+        else if (id == KJS::HTMLElement::MarqueeStop && element.handle()->renderer() && 
+                 element.handle()->renderer()->layer() &&
+                 element.handle()->renderer()->layer()->marquee()) {
+            element.handle()->renderer()->layer()->marquee()->suspend();
+            return Undefined();
+        }
+        break;
+    }
+        
     break;
   }
 
diff --git a/WebCore/khtml/ecma/kjs_html.h b/WebCore/khtml/ecma/kjs_html.h
index 7824176..ca10aa7 100644
--- a/WebCore/khtml/ecma/kjs_html.h
+++ b/WebCore/khtml/ecma/kjs_html.h
@@ -75,7 +75,7 @@ namespace KJS {
       hr_info, mod_info, a_info, img_info, object_info, param_info,
       applet_info, map_info, area_info, script_info, table_info,
       caption_info, col_info, tablesection_info, tr_info,
-      tablecell_info, frameSet_info, frame_info, iFrame_info;
+      tablecell_info, frameSet_info, frame_info, iFrame_info, marquee_info;
 
     enum { HtmlVersion, HeadProfile, LinkHref, LinkRel, LinkMedia,
            LinkCharset, LinkDisabled, LinkHrefLang, LinkRev, LinkTarget, LinkType,
@@ -145,6 +145,7 @@ namespace KJS {
            FrameNoResize, IFrameLongDesc, IFrameDocument, IFrameAlign,
            IFrameFrameBorder, IFrameSrc, IFrameName, IFrameHeight,
            IFrameMarginHeight, IFrameMarginWidth, IFrameScrolling, IFrameWidth, IFrameContentDocument,
+           MarqueeStart, MarqueeStop,
            ElementInnerHTML, ElementTitle, ElementId, ElementDir, ElementLang,
            ElementClassName, ElementInnerText, ElementDocument, ElementChildren, ElementContentEditable,
            ElementIsContentEditable};
diff --git a/WebCore/khtml/ecma/kjs_html.lut.h b/WebCore/khtml/ecma/kjs_html.lut.h
index 6622924..090b2a2 100644
--- a/WebCore/khtml/ecma/kjs_html.lut.h
+++ b/WebCore/khtml/ecma/kjs_html.lut.h
@@ -987,6 +987,18 @@ const struct HashTable HTMLIFrameElementTable = { 2, 17, HTMLIFrameElementTableE
 
 namespace KJS {
 
+const struct HashEntry HTMLMarqueeElementTableEntries[] = {
+   { "start", KJS::HTMLElement::MarqueeStart, DontDelete|Function, 0, &HTMLMarqueeElementTableEntries[2] },
+   { 0, 0, 0, 0, 0 },
+   { "stop", KJS::HTMLElement::MarqueeStop, DontDelete|Function, 0, 0 }
+};
+
+const struct HashTable HTMLMarqueeElementTable = { 2, 3, HTMLMarqueeElementTableEntries, 2 };
+
+} // namespace
+
+namespace KJS {
+
 const struct HashEntry HTMLCollectionProtoTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "namedItem", HTMLCollection::NamedItem, DontDelete|Function, 1, 0 },

-- 
WebKit Debian packaging