Fix QWebFrame::title().

For the titleChanged() signal we use the documentloader's title. For the property we have to use the same
instead of Document::title() as the latter is not trimmed and not suited for a window caption.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 7168a225cca25d4f73aea56a4e53cfc9e0aac5c4..710f63a6ed781757ed334f1d46caaa3abcf4ee9e 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -26,6 +26,7 @@
 #include "qwebpage_p.h"
 #include "qwebframe_p.h"
 
+#include "DocumentLoader.h"
 #include "FocusController.h"
 #include "FrameLoaderClientQt.h"
 #include "Frame.h"
@@ -220,7 +221,7 @@ QString QWebFrame::renderTreeDump() const
 QString QWebFrame::title() const
 {
     if (d->frame->document())
-        return d->frame->document()->title();
+        return d->frame->loader()->documentLoader()->title();
     else return QString();
 }
 

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 04643d31c7b0000e7b83c8edbb8b95be93e93d8a..09ad25ebfee6c3f30ef06c0960b70b4c2a165475 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-17  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Holger.
+
+        Fix QWebFrame::title().
+        
+        For the titleChanged() signal we use the documentloader's title. For the property we have to use the same
+        instead of Document::title() as the latter is not trimmed and not suited for a window caption.
+        
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::title):
+
 2008-01-17  Simon Hausmann  <hausmann@webkit.org>
 
         Reviewed by Maciej, Lars, Holger.