[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 71e5e9b9d0ba593b1c5f9da9f11af2b5dd7fdece
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 18:44:58 2009 +0000

    Fix a crash in the layout test plugins/document-open.html
    
    Reviewed by Simon Hausmann.
    
    * Api/qwebframe.cpp:
    (QWebFrame::toPlainText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50823 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 2f2548d..b60b266 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -471,7 +471,9 @@ QString QWebFrame::toPlainText() const
         d->frame->view()->layout();
 
     Element *documentElement = d->frame->document()->documentElement();
-    return documentElement->innerText();
+    if (documentElement)
+        return documentElement->innerText();
+    return QString();
 }
 
 /*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4d89c3d..d94e859 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -7,6 +7,15 @@
         * tests/qwebpage/qwebpage.pro:
         * tests/qwebpage/tst_qwebpage.cpp:
 
+2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix a crash in the layout test plugins/document-open.html
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::toPlainText):
+
 2009-11-11  Warwick Allison  <warwick.allison at nokia.com>, Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging