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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 42a17665e86fe6243f8f1f896b83ecb6336ccb07
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 15:13:47 2010 +0000

    2010-11-10  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r71733.
            http://trac.webkit.org/changeset/71733
            https://bugs.webkit.org/show_bug.cgi?id=49319
    
            made qt bot crashy and sad (Requested by kling on #webkit).
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
    2010-11-10  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r71733.
            http://trac.webkit.org/changeset/71733
            https://bugs.webkit.org/show_bug.cgi?id=49319
    
            made qt bot crashy and sad (Requested by kling on #webkit).
    
            * page/FrameView.cpp:
            (WebCore::FrameView::windowClipRect):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 655d2c4..6367c3a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-10  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r71733.
+        http://trac.webkit.org/changeset/71733
+        https://bugs.webkit.org/show_bug.cgi?id=49319
+
+        made qt bot crashy and sad (Requested by kling on #webkit).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::windowClipRect):
+
 2010-11-10  Peter Rybin  <peter.rybin at gmail.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index fe0be6a..f4b9b9f 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -1842,9 +1842,6 @@ IntRect FrameView::windowClipRect(bool clipToContents) const
 {
     ASSERT(m_frame->view() == this);
 
-    if (paintsEntireContents())
-        return IntRect(IntPoint(0, 0), contentsSize());
-
     // Set our clip rect to be our contents.
     IntRect clipRect = contentsToWindow(visibleContentRect(!clipToContents));
     if (!m_frame || !m_frame->document() || !m_frame->document()->ownerElement())
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 6cc2aa0..f026827 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -141,7 +141,6 @@ void QGraphicsWebViewPrivate::updateResizesToContentsForPage()
                          q, SLOT(_q_contentsSizeChanged(const QSize&)));
     }
     page->d->page->settings()->setShouldDelegateScrolling(resizesToContents);
-    page->d->page->mainFrame()->view()->setPaintsEntireContents(resizesToContents);
 }
 
 void QGraphicsWebViewPrivate::_q_contentsSizeChanged(const QSize& size)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 55cca93..cf6a32f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-10  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r71733.
+        http://trac.webkit.org/changeset/71733
+        https://bugs.webkit.org/show_bug.cgi?id=49319
+
+        made qt bot crashy and sad (Requested by kling on #webkit).
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
+
 2010-11-10  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 76fda94..1b57138 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -274,18 +274,12 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage()
     bool hLock = hScrollbar != ScrollbarAuto;
     bool vLock = vScrollbar != ScrollbarAuto;
 
-    bool paintsEntireContents = m_frame->view()->paintsEntireContents();
-
     m_frame->createView(m_webFrame->page()->viewportSize(),
                         backgroundColor, !backgroundColor.alpha(),
                         preferredLayoutSize.isValid() ? IntSize(preferredLayoutSize) : IntSize(),
                         preferredLayoutSize.isValid(),
                         hScrollbar, hLock,
                         vScrollbar, vLock);
-
-    bool isMainFrame = m_frame == m_frame->page()->mainFrame();
-    if (isMainFrame)
-        m_frame->view()->setPaintsEntireContents(paintsEntireContents);
 }
 
 void FrameLoaderClientQt::dispatchDidBecomeFrameset(bool)

-- 
WebKit Debian packaging