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

kbr at google.com kbr at google.com
Wed Dec 22 13:39:38 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0bd3fe0c7d0c742fd527d717b6ddfa00c3f78518
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 19:29:21 2010 +0000

    2010-09-22  Kenneth Russell  <kbr at google.com>
    
            Unreviewed, Chromium build fix. Fix build when accelerated
            compositing is not enabled at compile time.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::resize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68068 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 98f3f29..41ab08d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-22  Kenneth Russell  <kbr at google.com>
+
+        Unreviewed, Chromium build fix. Fix build when accelerated
+        compositing is not enabled at compile time.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize):
+
 2010-09-22  Matt Perry  <mpcomplete at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 4a209f1..7685afe 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -925,7 +925,7 @@ void WebViewImpl::resize(const WebSize& newSize)
             m_client->didInvalidateRect(damagedRect);
     }
 
-#if OS(DARWIN)
+#if USE(ACCELERATED_COMPOSITING) && OS(DARWIN)
     if (m_layerRenderer) {
         m_layerRenderer->resizeOnscreenContent(WebCore::IntSize(std::max(1, m_size.width),
                                                                 std::max(1, m_size.height)));

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list