[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 5468c1cfa0958417d0e4f47f047d9072f1dcafcd
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 16:58:26 2010 +0000

    2010-11-30  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Early return if setResizesToContentsUsingLayoutSize() is called with already-set size
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 704f731..132e99f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-30  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Early return if setResizesToContentsUsingLayoutSize() is called with already-set size
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
+
 2010-11-29  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 207ed35..0f11c22 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -441,6 +441,9 @@ void WebPage::setActualVisibleContentRect(const IntRect& rect)
 
 void WebPage::setResizesToContentsUsingLayoutSize(const IntSize& targetLayoutSize)
 {
+    if (m_resizesToContentsLayoutSize == targetLayoutSize)
+        return;
+
     m_resizesToContentsLayoutSize = targetLayoutSize;
 
     Frame* frame = m_page->mainFrame();

-- 
WebKit Debian packaging