← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/3rdparty/webkit/WebCore/wml/WMLElement.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/webkit/WebCore/wml/WMLElement.cpp
25
25
 
26
26
#include "CSSPropertyNames.h"
27
27
#include "HTMLNames.h"
 
28
#include "MappedAttribute.h"
28
29
#include "RenderObject.h"
29
30
#include "WMLErrorHandling.h"
30
31
#include "WMLNames.h"
37
38
 
38
39
using namespace WMLNames;
39
40
 
40
 
WMLElement::WMLElement(const QualifiedName& tagName, Document* doc)
41
 
    : StyledElement(tagName, doc)
42
 
{
 
41
WMLElement::WMLElement(const QualifiedName& tagName, Document* document)
 
42
    : StyledElement(tagName, document, CreateElementZeroRefCount)
 
43
{
 
44
}
 
45
 
 
46
PassRefPtr<WMLElement> WMLElement::create(const QualifiedName& tagName, Document* document)
 
47
{
 
48
    return new WMLElement(tagName, document);
43
49
}
44
50
 
45
51
bool WMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
76
82
    }
77
83
}
78
84
 
 
85
String WMLElement::title() const
 
86
{
 
87
    return parseValueSubstitutingVariableReferences(getAttribute(HTMLNames::titleAttr));
 
88
}
 
89
 
79
90
bool WMLElement::rendererIsNeeded(RenderStyle* style)
80
91
{
81
92
    return document()->documentElement() == this || style->display() != NONE;
86
97
    return RenderObject::createObject(this, style);
87
98
}
88
99
 
89
 
String WMLElement::parseValueSubstitutingVariableReferences(const AtomicString& value, WMLErrorCode defaultErrorCode)
 
100
String WMLElement::parseValueSubstitutingVariableReferences(const AtomicString& value, WMLErrorCode defaultErrorCode) const
90
101
{
91
102
    bool isValid = false;
92
103
    if (!containsVariableReference(value, isValid))
100
111
    return substituteVariableReferences(value, document());
101
112
}
102
113
 
103
 
String WMLElement::parseValueForbiddingVariableReferences(const AtomicString& value)
 
114
String WMLElement::parseValueForbiddingVariableReferences(const AtomicString& value) const
104
115
{
105
116
    bool isValid = false;
106
117
    if (containsVariableReference(value, isValid)) {