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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 16:24:26 UTC 2010


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

    2010-11-22  Nat Duca  <nduca at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] Send didActivateAcceleratedCompositing when compositor
            initializes but does not create the shared context3d.
            https://bugs.webkit.org/show_bug.cgi?id=49930
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0921e2c..17792af 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-22  Nat Duca  <nduca at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Send didActivateAcceleratedCompositing when compositor
+        initializes but does not create the shared context3d.
+        https://bugs.webkit.org/show_bug.cgi?id=49930
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2010-11-22  Tony Chang  <tony at chromium.org>
 
         Unreviewed, roll Chromium DEPS to r67004.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 6625949..44ea116 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2373,13 +2373,13 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
 
     RefPtr<GraphicsContext3D> context = m_temporaryOnscreenGraphicsContext3D.release();
     if (!context) {
-        m_client->didActivateAcceleratedCompositing(true);
         context = GraphicsContext3D::create(GraphicsContext3D::Attributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow);
         if (context)
             context->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
     }
     m_layerRenderer = LayerRendererChromium::create(context.release());
     if (m_layerRenderer) {
+        m_client->didActivateAcceleratedCompositing(true);
         m_isAcceleratedCompositingActive = true;
         m_compositorCreationFailed = false;
     } else {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list