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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e4f54c9fbd6cacc83149781026206979f1291fac
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 21:07:11 2010 +0000

    2010-11-23  Jonathan Backer  <backer at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            Renderer is resizing IOSurfaces when accelerated compositing is disabled.
            https://bugs.webkit.org/show_bug.cgi?id=49827
    
            - IOSurfaces are only presented when accelerated compositing is enabled.
            - Slight performance increase (and clean-up for using this path for Linux and Windows).
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::resize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 240e9fb..2244de3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-23  Jonathan Backer  <backer at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Renderer is resizing IOSurfaces when accelerated compositing is disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=49827
+
+        - IOSurfaces are only presented when accelerated compositing is enabled.
+        - Slight performance increase (and clean-up for using this path for Linux and Windows).
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize):
+
 2010-11-23  Grace Kloba  <klobag at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index af81f32..12a01b8 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -937,7 +937,7 @@ void WebViewImpl::resize(const WebSize& newSize)
     }
 
 #if USE(ACCELERATED_COMPOSITING)
-    if (m_layerRenderer) {
+    if (m_layerRenderer && isAcceleratedCompositingActive()) {
         m_layerRenderer->resizeOnscreenContent(IntSize(std::max(1, m_size.width),
                                                        std::max(1, m_size.height)));
     }

-- 
WebKit Debian packaging