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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 44134e33f52706e89dc7d10735d6f0f6b6e6c38f
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 20:29:40 2010 +0000

    2010-10-13  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            Revert changes to WebViewImpl in r69633
            https://bugs.webkit.org/show_bug.cgi?id=47610
    
            Revert change to WebViewImpl.cpp in
            http://trac.webkit.org/changeset/69633 which incorrectly used
            PassRefPtr for a local variable instead of RefPtr. This was a fix
            for changes in http://trac.webkit.org/changeset/69619 and
            http://trac.webkit.org/changeset/69624 .
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 18b8c9b..b074f4a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-13  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        Revert changes to WebViewImpl in r69633
+        https://bugs.webkit.org/show_bug.cgi?id=47610
+
+        Revert change to WebViewImpl.cpp in
+        http://trac.webkit.org/changeset/69633 which incorrectly used
+        PassRefPtr for a local variable instead of RefPtr. This was a fix
+        for changes in http://trac.webkit.org/changeset/69619 and
+        http://trac.webkit.org/changeset/69624 .
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2010-10-13  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 0b33d17..0eaaac1 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2369,13 +2369,13 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
         return;
     }
 
-    PassRefPtr<GraphicsContext3D> context = m_temporaryOnscreenGraphicsContext3D.release();
+    RefPtr<GraphicsContext3D> context = m_temporaryOnscreenGraphicsContext3D.release();
     if (!context) {
         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);
+    m_layerRenderer = LayerRendererChromium::create(context.release());
     if (m_layerRenderer) {
         m_isAcceleratedCompositingActive = true;
         m_compositorCreationFailed = false;

-- 
WebKit Debian packaging