[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[robert at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5999ee7aec9c0bead28bd0230ee4780e6818693a
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 14:19:19 2010 +0000

    2010-03-15  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Fix crash in QWebView::setPage()
    
            tst_qwebpage was crashing on setPage(0)
    
            https://bugs.webkit.org/show_bug.cgi?id=36137
    
            * Api/qwebview.cpp:
            (QWebView::setPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 79c16c7..1553244 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -395,11 +395,11 @@ void QWebView::setPage(QWebPage* page)
                 this, SLOT(updateMicroFocus()));
         connect(d->page, SIGNAL(destroyed()),
                 this, SLOT(_q_pageDestroyed()));
-    }
-    setAttribute(Qt::WA_OpaquePaintEvent, d->page);
 #if USE(ACCELERATED_COMPOSITING)
-    d->page->d->page->settings()->setAcceleratedCompositingEnabled(false);
+        d->page->d->page->settings()->setAcceleratedCompositingEnabled(false);
 #endif
+    }
+    setAttribute(Qt::WA_OpaquePaintEvent, d->page);
     update();
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e8569c0..e071661 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-15  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix crash in QWebView::setPage()
+
+        tst_qwebpage was crashing on setPage(0)
+
+        https://bugs.webkit.org/show_bug.cgi?id=36137
+
+        * Api/qwebview.cpp:
+        (QWebView::setPage):
+
 2010-03-16  Yury Semikhatsky <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.

-- 
WebKit Debian packaging