Changeset 38838 in webkit

Timestamp:

Nov 28, 2008 8:00:20 PM (15 years ago)

Author:

Nikolas Zimmermann

Message:

Reviewed by Cameron Zwarich.

Fixes: ​https://bugs.webkit.org/show_bug.cgi?id=22550

Add <timer> element support. It provides a way to execute a task with a delay.
The user is notified by firing the task associated with the <card>'s ontimer attribute.
Only one timer element is allowed per <card> (fix wrong error message in reportWMLError)

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/wml/err-multi-timer-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/wml/err-multi-timer-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/wml/err-multi-timer-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/wml/WMLCardElement.cpp (modified) (4 diffs)
• WebCore/wml/WMLCardElement.h (modified) (3 diffs)
• WebCore/wml/WMLDoElement.cpp (modified) (2 diffs)
• WebCore/wml/WMLErrorHandling.cpp (modified) (1 diff)
• WebCore/wml/WMLPageState.h (modified) (1 diff)
• WebCore/wml/WMLPrevElement.cpp (modified) (2 diffs)
• WebCore/wml/WMLRefreshElement.cpp (modified) (2 diffs)
• WebCore/wml/WMLTagNames.in (modified) (2 diffs)
• WebCore/wml/WMLTimerElement.cpp (added)
• WebCore/wml/WMLTimerElement.h (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-11-28  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Update WML layout test results after adding <timer> element support.
+
+        * platform/mac/fast/wml/err-multi-timer-expected.checksum:
+        * platform/mac/fast/wml/err-multi-timer-expected.png:
+        * platform/mac/fast/wml/err-multi-timer-expected.txt:
+
 2008-11-28  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 

trunk/LayoutTests/platform/mac/fast/wml/err-multi-timer-expected.checksum

@@ -1 @@
-ec325e125c7d147318bc7d519440914c
+0b637caf7ac3a7af93fe0e787a096efa

trunk/LayoutTests/platform/mac/fast/wml/err-multi-timer-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x76
-  RenderBlock {wml} at (0,0) size 800x76
-    RenderBlock {card} at (8,16) size 784x52
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {timer} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderInline {timer} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {p} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 281x18
-          text run at (0,0) width 281: "Test for error of meta multi-timer in one card"
-      RenderBlock (anonymous) at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 585x18
-          text run at (0,0) width 585: "You should NOT see this text, because of the error that more than one timer exist in one card"
+layer at (0,0) size 800x166
+  RenderBlock {html} at (0,0) size 800x166
+    RenderBody {body} at (8,16) size 784x134
+      RenderBlock {parsererror} at (16,0) size 752x134 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
+        RenderBlock {h3} at (18,20) size 716x22
+          RenderText {#text} at (0,0) size 324x22
+            text run at (0,0) width 324: "This page contains the following errors:"
+        RenderBlock {div} at (18,60) size 716x14
+          RenderText {#text} at (0,0) size 518x14
+            text run at (0,0) width 518: "error on line 6 at column 65: Only one timer element is allowed in a card."
+        RenderBlock {h3} at (18,92) size 716x22
+          RenderText {#text} at (0,0) size 429x22
+            text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
+      RenderBlock (anonymous) at (0,150) size 784x0
+        RenderInline {wml} at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,150) size 784x0
+        RenderBlock {card} at (8,0) size 768x0
+          RenderInline {timer} at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
+          RenderInline {timer} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,150) size 784x0
+        RenderInline {wml} at (0,0) size 0x0

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-28  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Fixes: https://bugs.webkit.org/show_bug.cgi?id=22550
+
+        Add <timer> element support. It provides a way to execute a task with a delay.
+        The user is notified by firing the task associated with the <card>'s ontimer attribute.
+        Only one timer element is allowed per <card> (fix wrong error message in reportWMLError)
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * wml/WMLCardElement.cpp:
+        (WebCore::WMLCardElement::WMLCardElement):
+        (WebCore::WMLCardElement::setIntrinsicEventTimer):
+        (WebCore::WMLCardElement::handleIntrinsicEventIfNeeded):
+        * wml/WMLCardElement.h:
+        * wml/WMLDoElement.cpp:
+        (WebCore::WMLDoElement::defaultEventHandler):
+        * wml/WMLErrorHandling.cpp:
+        (WebCore::reportWMLError):
+        * wml/WMLPageState.h:
+        (WebCore::WMLPageState::getVariable):
+        * wml/WMLPrevElement.cpp:
+        (WebCore::WMLPrevElement::executeTask):
+        * wml/WMLRefreshElement.cpp:
+        (WebCore::WMLRefreshElement::executeTask):
+        * wml/WMLTagNames.in:
+        * wml/WMLTimerElement.cpp: Added.
+        (WebCore::WMLTimerElement::WMLTimerElement):
+        (WebCore::WMLTimerElement::parseMappedAttribute):
+        (WebCore::WMLTimerElement::insertedIntoDocument):
+        (WebCore::WMLTimerElement::timerFired):
+        (WebCore::WMLTimerElement::start):
+        (WebCore::WMLTimerElement::stop):
+        (WebCore::WMLTimerElement::storeIntervalToPageState):
+        * wml/WMLTimerElement.h: Added.
+
 2008-11-28  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -46 +46 @@
                 0818AEE20EDB86BC00647B66 /* WMLEventHandlingElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0818AEE00EDB86BC00647B66 /* WMLEventHandlingElement.cpp */; };
                 0818AEE30EDB86BC00647B66 /* WMLEventHandlingElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0818AEE10EDB86BC00647B66 /* WMLEventHandlingElement.h */; };
+                081D81310EE0E74D00D73689 /* WMLTimerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */; };
+                081D81320EE0E74D00D73689 /* WMLTimerElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 081D81300EE0E74D00D73689 /* WMLTimerElement.h */; };
                 08203A9F0ED8C35300B8B61A /* WMLAccessElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08203A9D0ED8C35300B8B61A /* WMLAccessElement.cpp */; };
                 08203AA00ED8C35300B8B61A /* WMLAccessElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */; };
@@ -4824 +4826 @@
                 0818AEE00EDB86BC00647B66 /* WMLEventHandlingElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLEventHandlingElement.cpp; sourceTree = "<group>"; };
                 0818AEE10EDB86BC00647B66 /* WMLEventHandlingElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLEventHandlingElement.h; sourceTree = "<group>"; };
+                081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLTimerElement.cpp; sourceTree = "<group>"; };
+                081D81300EE0E74D00D73689 /* WMLTimerElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLTimerElement.h; sourceTree = "<group>"; };
                 08203A9D0ED8C35300B8B61A /* WMLAccessElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLAccessElement.cpp; sourceTree = "<group>"; };
                 08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLAccessElement.h; sourceTree = "<group>"; };
@@ -9559 +9563 @@
                                 08CD61B80ED3929C002DDF51 /* WMLTaskElement.cpp */,
                                 08CD61B90ED3929C002DDF51 /* WMLTaskElement.h */,
+                                081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */,
+                                081D81300EE0E74D00D73689 /* WMLTimerElement.h */,
                                 084DBA9D0ED39D350038C226 /* WMLVariables.cpp */,
                                 084DBA9E0ED39D360038C226 /* WMLVariables.h */,
@@ -16453 +16459 @@
                                 08E192540EDE0C3A0087B780 /* WMLErrorHandling.h in Headers */,
                                 0804BF6F0EE09C3B0006C000 /* WMLDoElement.h in Headers */,
+                                081D81320EE0E74D00D73689 /* WMLTimerElement.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -18391 +18398 @@
                                 08E192530EDE0C3A0087B780 /* WMLErrorHandling.cpp in Sources */,
                                 0804BF6E0EE09C3B0006C000 /* WMLDoElement.cpp in Sources */,
+                                081D81310EE0E74D00D73689 /* WMLTimerElement.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/wml/WMLCardElement.cpp

@@ -37 +37 @@
 #include "WMLNames.h"
 #include "WMLPageState.h"
+#include "WMLTimerElement.h"
 #include "WMLVariables.h"
 
@@ -48 +49 @@
     , m_isOrdered(false)
     , m_isVisible(false)
+    , m_eventTimer(0)
 {
 }
@@ -69 +71 @@
     m_doElements.append(doElement);
     doElement->setActive(true);
+}
+
+void WMLCardElement::setIntrinsicEventTimer(WMLTimerElement* timer)
+{
+    // Only one timer is allowed in a card 
+    if (m_eventTimer) {
+        m_eventTimer = 0;     
+        reportWMLError(document(), WMLErrorMultipleTimerElements);
+        return;
+    }
+
+    m_eventTimer = timer;
 }
 
@@ -118 +132 @@
         eventHandler->triggerIntrinsicEvent(eventType);
 
-    // FIXME Start the timer if it exists in current card
-    /*
-    if (eventTimer)
-        eventTimer->start();
-    */
+    // Start the timer if it exists in current card
+    if (m_eventTimer)
+        m_eventTimer->start();
 
     // FIXME: Initialize input/select  elements in this card

trunk/WebCore/wml/WMLCardElement.h

@@ -31 +31 @@
 
 class WMLDoElement;
+class WMLTimerElement;
 
 class WMLCardElement : public WMLEventHandlingElement {
@@ -39 +40 @@
     bool isNewContext() const { return m_isNewContext; }
     bool isOrdered() const { return m_isOrdered; }
+    WMLTimerElement* eventTimer() const { return m_eventTimer; }
 
     void registerDoElement(WMLDoElement*);
+    void setIntrinsicEventTimer(WMLTimerElement*);
     void handleIntrinsicEventIfNeeded();
 
@@ -59 +62 @@
     bool m_isVisible;
 
+    WMLTimerElement* m_eventTimer;
     Vector<WMLDoElement*> m_doElements;
 };

trunk/WebCore/wml/WMLDoElement.cpp

@@ -35 +35 @@
 #include "WMLErrorHandling.h"
 #include "WMLTaskElement.h"
+#include "WMLTimerElement.h"
 #include "WMLNames.h"
 #include "WMLPageState.h"
@@ -77 +78 @@
             return;
 
-        /* FIXME: Stop the timer of the current card if it is active
+        // Stop the timer of the current card if it is active
         WMLCardElement* card = pageState->activeCard();
         if (card && card->eventTimer())
             card->eventTimer()->stop();
-        */
 
         pageState->page()->goBack();

trunk/WebCore/wml/WMLErrorHandling.cpp

@@ -77 +77 @@
         break;
     case WMLErrorMultipleTimerElements:
-        errorMessage = "Only one access element is allowed in a card.";
+        errorMessage = "Only one timer element is allowed in a card.";
         break;
     case WMLErrorUnknown: 

trunk/WebCore/wml/WMLPageState.h

@@ -48 +48 @@
     void storeVariable(const String& name, const String& value) { m_variables.set(name, value); }
     void storeVariables(WMLVariableMap& variables) { m_variables = variables; }
-    String getVaribale(const String& name) const { return m_variables.get(name); }
+    String getVariable(const String& name) const { return m_variables.get(name); }
     bool hasVariables() const { return m_variables.size(); }
 

trunk/WebCore/wml/WMLPrevElement.cpp

@@ -26 +26 @@
 
 #include "Page.h"
+#include "WMLCardElement.h"
 #include "WMLDocument.h"
 #include "WMLPageState.h"
+#include "WMLTimerElement.h"
 
 namespace WebCore {
@@ -52 +54 @@
     storeVariableState(pageState);
 
-/* FIXME
     // Stop the timer of the current card if it is active
     if (WMLTimerElement* timer = card->eventTimer())
         timer->stop();
-*/
 
     pageState->page()->goBack();

trunk/WebCore/wml/WMLRefreshElement.cpp

@@ -28 +28 @@
 #include "FrameLoader.h"
 #include "Page.h"
+#include "WMLCardElement.h"
 #include "WMLDocument.h"
 #include "WMLPageState.h"
+#include "WMLTimerElement.h"
 
 namespace WebCore {
@@ -52 +54 @@
         return;
 
-/* FIXME
     // Before perform refresh task, we store the current timeout
     // value in the page state and then stop the timer
-    if (WMLTimerElement* timer = card->eventTimer()) {
+    WMLTimerElement* timer = card->eventTimer();
+    if (timer) {
         timer->storeIntervalToPageState();
         timer->stop();
     }
-*/
 
     storeVariableState(pageState);
 
     // Redisplay curremt card with current variable state
-    if (Frame* frame = pageState->page()->mainFrame())
+    if (Frame* frame = pageState->page()->mainFrame()) {
         if (FrameLoader* loader = frame->loader())
             loader->reload();
+    }
 
-/* FIXME
     // After refreshing task, resume the timer if it exsits 
     if (timer)
         timer->start();
-*/
 }
 

trunk/WebCore/wml/WMLTagNames.in

@@ -16 +16 @@
 refresh
 setvar
+timer
 
 #if 0
@@ -31 +32 @@
 postfield
 template
-timer
 #endif