diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/html/HTMLTitleElement.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/html/HTMLTitleElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLTitleElement.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebCore/html/HTMLTitleElement.cpp b/Source/WebCore/html/HTMLTitleElement.cpp index 776c37c..78c8b6a 100644 --- a/Source/WebCore/html/HTMLTitleElement.cpp +++ b/Source/WebCore/html/HTMLTitleElement.cpp @@ -46,7 +46,7 @@ PassRefPtr<HTMLTitleElement> HTMLTitleElement::create(const QualifiedName& tagNa void HTMLTitleElement::insertedIntoDocument() { HTMLElement::insertedIntoDocument(); - document()->setTitle(m_title, this); + document()->setTitleElement(m_title, this); } void HTMLTitleElement::removedFromDocument() @@ -57,12 +57,9 @@ void HTMLTitleElement::removedFromDocument() void HTMLTitleElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta) { - m_title = ""; - for (Node* c = firstChild(); c != 0; c = c->nextSibling()) - if (c->nodeType() == TEXT_NODE || c->nodeType() == CDATA_SECTION_NODE) - m_title += c->nodeValue(); + m_title = text(); if (inDocument()) - document()->setTitle(m_title, this); + document()->setTitleElement(m_title, this); HTMLElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta); } |