diff options
Diffstat (limited to 'WebCore/wml')
-rw-r--r-- | WebCore/wml/WMLCardElement.cpp | 2 | ||||
-rw-r--r-- | WebCore/wml/WMLDocument.cpp | 8 | ||||
-rw-r--r-- | WebCore/wml/WMLDocument.h | 6 | ||||
-rw-r--r-- | WebCore/wml/WMLErrorHandling.h | 3 | ||||
-rw-r--r-- | WebCore/wml/WMLGoElement.cpp | 1 | ||||
-rw-r--r-- | WebCore/wml/WMLPageState.h | 2 | ||||
-rw-r--r-- | WebCore/wml/WMLSelectElement.cpp | 2 | ||||
-rw-r--r-- | WebCore/wml/WMLVariables.h | 3 |
8 files changed, 15 insertions, 12 deletions
diff --git a/WebCore/wml/WMLCardElement.cpp b/WebCore/wml/WMLCardElement.cpp index 539dcd3..645d0fc 100644 --- a/WebCore/wml/WMLCardElement.cpp +++ b/WebCore/wml/WMLCardElement.cpp @@ -287,7 +287,7 @@ WMLCardElement* WMLCardElement::findNamedCardInDocument(Document* doc, const Str for (unsigned i = 0; i < length; ++i) { WMLCardElement* card = static_cast<WMLCardElement*>(nodeList->item(i)); - if (card->getIDAttribute() != cardName) + if (card->getIdAttribute() != cardName) continue; return card; diff --git a/WebCore/wml/WMLDocument.cpp b/WebCore/wml/WMLDocument.cpp index ba4bb57..9781a68 100644 --- a/WebCore/wml/WMLDocument.cpp +++ b/WebCore/wml/WMLDocument.cpp @@ -26,7 +26,7 @@ #include "BackForwardList.h" #include "Frame.h" #include "Page.h" -#include "DocumentParser.h" +#include "ScriptableDocumentParser.h" #include "WMLCardElement.h" #include "WMLErrorHandling.h" #include "WMLPageState.h" @@ -34,8 +34,8 @@ namespace WebCore { -WMLDocument::WMLDocument(Frame* frame) - : Document(frame, false, false) +WMLDocument::WMLDocument(Frame* frame, const KURL& url) + : Document(frame, url, false, false) , m_activeCard(0) { clearXMLVersion(); @@ -47,7 +47,7 @@ WMLDocument::~WMLDocument() void WMLDocument::finishedParsing() { - if (DocumentParser* parser = this->parser()) { + if (ScriptableDocumentParser* parser = this->scriptableDocumentParser()) { if (!parser->wellFormed()) { Document::finishedParsing(); return; diff --git a/WebCore/wml/WMLDocument.h b/WebCore/wml/WMLDocument.h index 9053518..3057d9b 100644 --- a/WebCore/wml/WMLDocument.h +++ b/WebCore/wml/WMLDocument.h @@ -32,9 +32,9 @@ class WMLCardElement; class WMLDocument : public Document { public: - static PassRefPtr<WMLDocument> create(Frame* frame) + static PassRefPtr<WMLDocument> create(Frame* frame, const KURL& url) { - return adoptRef(new WMLDocument(frame)); + return adoptRef(new WMLDocument(frame, url)); } virtual ~WMLDocument(); @@ -47,7 +47,7 @@ public: WMLCardElement* activeCard() const { return m_activeCard; } private: - WMLDocument(Frame*); + WMLDocument(Frame*, const KURL&); WMLCardElement* m_activeCard; }; diff --git a/WebCore/wml/WMLErrorHandling.h b/WebCore/wml/WMLErrorHandling.h index 8277be4..c75c975 100644 --- a/WebCore/wml/WMLErrorHandling.h +++ b/WebCore/wml/WMLErrorHandling.h @@ -21,11 +21,12 @@ #ifndef WMLErrorHandling_h #define WMLErrorHandling_h +#include <wtf/Forward.h> + #if ENABLE(WML) namespace WebCore { class Document; - class String; enum WMLErrorCode { WMLErrorUnknown = 0, diff --git a/WebCore/wml/WMLGoElement.cpp b/WebCore/wml/WMLGoElement.cpp index 9b329d7..d3a6216 100644 --- a/WebCore/wml/WMLGoElement.cpp +++ b/WebCore/wml/WMLGoElement.cpp @@ -25,6 +25,7 @@ #include "Attribute.h" #include "FormData.h" +#include "FormDataBuilder.h" #include "FormSubmission.h" #include "Frame.h" #include "FrameLoader.h" diff --git a/WebCore/wml/WMLPageState.h b/WebCore/wml/WMLPageState.h index ed1ce8e..614bc94 100644 --- a/WebCore/wml/WMLPageState.h +++ b/WebCore/wml/WMLPageState.h @@ -25,12 +25,12 @@ #if ENABLE(WML) #include "StringHash.h" +#include <wtf/Forward.h> #include <wtf/HashMap.h> namespace WebCore { class Page; -class String; class WMLCardElement; typedef HashMap<String, String> WMLVariableMap; diff --git a/WebCore/wml/WMLSelectElement.cpp b/WebCore/wml/WMLSelectElement.cpp index 2f8ebf6..3991b52 100644 --- a/WebCore/wml/WMLSelectElement.cpp +++ b/WebCore/wml/WMLSelectElement.cpp @@ -167,7 +167,7 @@ void WMLSelectElement::reset() void WMLSelectElement::defaultEventHandler(Event* event) { - SelectElement::defaultEventHandler(m_data, this, event); + SelectElement::defaultEventHandler(m_data, this, event, 0); // FIXME: There must be a better place to update the page variable state. Investigate. updateVariables(); diff --git a/WebCore/wml/WMLVariables.h b/WebCore/wml/WMLVariables.h index 18c6ba4..3bd0f81 100644 --- a/WebCore/wml/WMLVariables.h +++ b/WebCore/wml/WMLVariables.h @@ -21,11 +21,12 @@ #ifndef WMLVariables_h #define WMLVariables_h +#include <wtf/Forward.h> + #if ENABLE(WML) namespace WebCore { class Document; - class String; enum WMLVariableEscapingMode { WMLVariableEscapingNone = 0, |