Changeset 98171 in webkit

Timestamp:

Oct 21, 2011 5:01:58 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

Ensure periodic flushing of canvas drawing context
​https://bugs.webkit.org/show_bug.cgi?id=70646

Reviewed by Simon Fraser.

No new tests. No current way to track tests that cause hangs or
non-deterministic drops in performance.

• platform/graphics/cg/ImageBufferDataCG.h: Adds a timestamp of last tracked flush.
• platform/graphics/cg/ImageBufferCG.cpp: Ensures periodic flushes on the drawing context.

(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::context): Flushes context if we're beyond flush interval.
(WebCore::ImageBuffer::copyNativeImage): Updates last flush timestamp.
(WebCore::ImageBuffer::getUnmultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::getPremultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::putUnmultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::putPremultipliedImageData): Updates last flush timestamp.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (8 diffs)
• platform/graphics/cg/ImageBufferDataCG.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-21  Matthew Delaney  <mdelaney@apple.com>
+
+        Ensure periodic flushing of canvas drawing context
+        https://bugs.webkit.org/show_bug.cgi?id=70646
+
+        Reviewed by Simon Fraser.
+
+        No new tests. No current way to track tests that cause hangs or
+        non-deterministic drops in performance.
+
+        * platform/graphics/cg/ImageBufferDataCG.h: Adds a timestamp of last tracked flush.
+        * platform/graphics/cg/ImageBufferCG.cpp: Ensures periodic flushes on the drawing context.
+        (WebCore::ImageBuffer::ImageBuffer):
+        (WebCore::ImageBuffer::context): Flushes context if we're beyond flush interval.
+        (WebCore::ImageBuffer::copyNativeImage): Updates last flush timestamp.
+        (WebCore::ImageBuffer::getUnmultipliedImageData): Updates last flush timestamp.
+        (WebCore::ImageBuffer::getPremultipliedImageData): Updates last flush timestamp.
+        (WebCore::ImageBuffer::putUnmultipliedImageData): Updates last flush timestamp.
+        (WebCore::ImageBuffer::putPremultipliedImageData): Updates last flush timestamp.
+
 2011-10-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -39 +39 @@
 #include <wtf/Assertions.h>
 #include <wtf/CheckedArithmetic.h>
+#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/OwnArrayPtr.h>
@@ -165 +166 @@
         return;
 
-    m_context= adoptPtr(new GraphicsContext(cgContext.get()));
+    m_context = adoptPtr(new GraphicsContext(cgContext.get()));
     m_context->scale(FloatSize(1, -1));
     m_context->translate(0, -height.unsafeGet());
     m_context->setIsAcceleratedContext(accelerateRendering);
+    m_data.m_lastFlushTime = currentTimeMS();
     success = true;
 }
@@ -183 +185 @@
 GraphicsContext* ImageBuffer::context() const
 {
+    // Force a flush if last flush was more than 20ms ago
+    if (m_context->isAcceleratedContext()) {
+        double elapsedTime = currentTimeMS() - m_data.m_lastFlushTime;
+        double maxFlushInterval = 20; // in ms
+
+        if (elapsedTime > maxFlushInterval) {
+            CGContextRef context = m_context->platformContext();
+            CGContextFlush(context);
+            m_data.m_lastFlushTime = currentTimeMS();
+        }
+    }
+
     return m_context.get();
 }
@@ -213 +227 @@
     }
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
-    else
+    else {
         image = wkIOSurfaceContextCreateImage(context()->platformContext());
+        m_data.m_lastFlushTime = currentTimeMS();
+    }
 #endif
 
@@ -263 +279 @@
 PassRefPtr<ByteArray> ImageBuffer::getUnmultipliedImageData(const IntRect& rect) const
 {
-    if (m_context->isAcceleratedContext())
+    if (m_context->isAcceleratedContext()) {
         CGContextFlush(context()->platformContext());
+        m_data.m_lastFlushTime = currentTimeMS();
+    }
     return m_data.getData(rect, m_size, m_context->isAcceleratedContext(), true);
 }
@@ -270 +288 @@
 PassRefPtr<ByteArray> ImageBuffer::getPremultipliedImageData(const IntRect& rect) const
 {
-    if (m_context->isAcceleratedContext())
+    if (m_context->isAcceleratedContext()) {
         CGContextFlush(context()->platformContext());
+        m_data.m_lastFlushTime = currentTimeMS();
+    }
     return m_data.getData(rect, m_size, m_context->isAcceleratedContext(), false);
 }
@@ -277 +297 @@
 void ImageBuffer::putUnmultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
 {
-    if (m_context->isAcceleratedContext())
+    if (m_context->isAcceleratedContext()) {
         CGContextFlush(context()->platformContext());
+        m_data.m_lastFlushTime = currentTimeMS();
+    }
     m_data.putData(source, sourceSize, sourceRect, destPoint, m_size, m_context->isAcceleratedContext(), true);
 }
@@ -284 +306 @@
 void ImageBuffer::putPremultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
 {
-    if (m_context->isAcceleratedContext())
+    if (m_context->isAcceleratedContext()) {
         CGContextFlush(context()->platformContext());
+        m_data.m_lastFlushTime = currentTimeMS();
+    }
     m_data.putData(source, sourceSize, sourceRect, destPoint, m_size, m_context->isAcceleratedContext(), false);
 }

trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h

@@ -55 +55 @@
     CGColorSpaceRef m_colorSpace;
     RetainPtr<IOSurfaceRef> m_surface;
+    mutable double m_lastFlushTime;
 
     PassRefPtr<ByteArray> getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied) const;