[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 21717f6fa7338ef3ea201d00a6721106e0ee222b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 01:02:04 2009 +0000

    2009-09-23  J-P Nurmi  <jpnurmi at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            Prevent QWebPage::setView() from changing the viewport size on the fly
            in case the view doesn't actually change. QWebPage::setView() is
            called upon every QWebGraphicsItem::hoverMoveEvent(), which forced
            the viewport size to be equal to the size of the whole graphics view.
    
            https://bugs.webkit.org/show_bug.cgi?id=29676
    
            * Api/qwebpage.cpp:
            (QWebPage::setView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index e6f611a..a6942a4 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1555,8 +1555,10 @@ QWebHistory *QWebPage::history() const
 */
 void QWebPage::setView(QWidget *view)
 {
-    d->view = view;
-    setViewportSize(view ? view->size() : QSize(0, 0));
+    if (d->view != view) {
+        d->view = view;
+        setViewportSize(view ? view->size() : QSize(0, 0));
+    }
 }
 
 /*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7c5c6fe..3603e86 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-23  J-P Nurmi  <jpnurmi at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        Prevent QWebPage::setView() from changing the viewport size on the fly
+        in case the view doesn't actually change. QWebPage::setView() is
+        called upon every QWebGraphicsItem::hoverMoveEvent(), which forced
+        the viewport size to be equal to the size of the whole graphics view.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29676
+
+        * Api/qwebpage.cpp:
+        (QWebPage::setView):
+
 2009-09-23  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging