[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 c25dec9b678d57d3cadcb9788f17bcfb3a401b5c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 12:51:07 2010 +0000

    2010-09-16  Nat Duca  <nduca at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Make compositor obey finish flag
            https://bugs.webkit.org/show_bug.cgi?id=45552
    
            The compositor should obey the finish flag on doComposite. This
            flag causes the compositor to finish rendering before returning,
            which is needed when resizing the window to avoid flashes of green.
    
            * platform/graphics/chromium/LayerRendererChromium.cpp:
            (WebCore::LayerRendererChromium::finish):
            * platform/graphics/chromium/LayerRendererChromium.h:
    2010-09-16  Nat Duca  <nduca at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Make compositor obey finish flag
            https://bugs.webkit.org/show_bug.cgi?id=45552
    
            The compositor should obey the finish flag on doComposite. This
            flag causes the compositor to finish rendering before returning,
            which is needed when resizing the window to avoid flashes of green.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::composite):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67610 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c6b1b7c..f035f02 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-16  Nat Duca  <nduca at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Make compositor obey finish flag
+        https://bugs.webkit.org/show_bug.cgi?id=45552
+
+        The compositor should obey the finish flag on doComposite. This
+        flag causes the compositor to finish rendering before returning,
+        which is needed when resizing the window to avoid flashes of green.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::finish):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+
 2010-09-16  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
index 79df7b4..4fac991 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
@@ -334,6 +334,11 @@ void LayerRendererChromium::drawLayers(const IntRect& visibleRect, const IntRect
     GLC(glDisable(GL_SCISSOR_TEST));
 }
 
+void LayerRendererChromium::finish()
+{
+    glFinish();
+}
+
 void LayerRendererChromium::present()
 {
     // We're done! Time to swapbuffers!
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.h b/WebCore/platform/graphics/chromium/LayerRendererChromium.h
index b4574b2..f4bd6f3 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.h
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.h
@@ -70,6 +70,9 @@ public:
     // draws the current layers onto the backbuffer
     void drawLayers(const IntRect& visibleRect, const IntRect& contentRect);
 
+    // waits for rendering to finish
+    void finish();
+
     // puts backbuffer onscreen
     void present();
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9b1e812..9a5de90 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-16  Nat Duca  <nduca at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Make compositor obey finish flag
+        https://bugs.webkit.org/show_bug.cgi?id=45552
+
+        The compositor should obey the finish flag on doComposite. This
+        flag causes the compositor to finish rendering before returning,
+        which is needed when resizing the window to avoid flashes of green.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::composite):
+
 2010-09-15  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 7480f20..e93b897 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1035,7 +1035,8 @@ void WebViewImpl::composite(bool finish)
     doComposite();
 
     // Finish if requested.
-    // FIXME: handle finish flag.
+    if (finish)
+        m_layerRenderer->finish();
 
     // Put result onscreen.
     m_layerRenderer->present();

-- 
WebKit Debian packaging