Changeset 74570 in webkit

Timestamp:

Dec 23, 2010 11:57:15 AM (13 years ago)

Author:

mdelaney@apple.com

Message:

2010-12-22 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

Add setNeedsStyleRecalc for getting canvas contexts that use IOSurfaces
This patch also changes USE_IOSURFACE to instead follow USE(IOSURFACE)
​https://bugs.webkit.org/show_bug.cgi?id=51279

• html/HTMLCanvasElement.cpp: For IOSurface, use setNeedsStyleRecalc
• html/canvas/CanvasRenderingContext2D.cpp: Use new flag
• platform/graphics/ImageBuffer.h: Use new flag
• platform/graphics/cg/ImageBufferCG.cpp: Use new flag

2010-12-22 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

Add setNeedsStyleRecalc for getting canvas contexts that use IOSurfaces
​https://bugs.webkit.org/show_bug.cgi?id=51279

• platform/mac-snowleopard/platform/mac/compositing: Added.
• platform/mac-snowleopard/platform/mac/compositing/canvas: Added.
• platform/mac-snowleopard/platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt: Added.
• platform/mac/compositing/canvas: Added.
• platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt: Added.
• platform/mac/compositing/canvas/accelerated-canvas-compositing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-snowleopard/platform/mac/compositing (added)
• LayoutTests/platform/mac-snowleopard/platform/mac/compositing/canvas (added)
• LayoutTests/platform/mac-snowleopard/platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt (added)
• LayoutTests/platform/mac/compositing/canvas (added)
• LayoutTests/platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt (added)
• LayoutTests/platform/mac/compositing/canvas/accelerated-canvas-compositing.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.cpp (modified) (2 diffs)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• WebCore/platform/graphics/ImageBuffer.h (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (10 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-22  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Add setNeedsStyleRecalc for getting canvas contexts that use IOSurfaces
+        https://bugs.webkit.org/show_bug.cgi?id=51279
+
+        * platform/mac-snowleopard/platform/mac/compositing: Added.
+        * platform/mac-snowleopard/platform/mac/compositing/canvas: Added.
+        * platform/mac-snowleopard/platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt: Added.
+        * platform/mac/compositing/canvas: Added.
+        * platform/mac/compositing/canvas/accelerated-canvas-compositing-expected.txt: Added.
+        * platform/mac/compositing/canvas/accelerated-canvas-compositing.html: Added.
+
 2010-12-23  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-22  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Add setNeedsStyleRecalc for getting canvas contexts that use IOSurfaces
+        This patch also changes USE_IOSURFACE to instead follow USE(IOSURFACE)
+        https://bugs.webkit.org/show_bug.cgi?id=51279
+
+        * html/HTMLCanvasElement.cpp: For IOSurface, use setNeedsStyleRecalc
+        * html/canvas/CanvasRenderingContext2D.cpp: Use new flag
+        * platform/graphics/ImageBuffer.h: Use new flag
+        * platform/graphics/cg/ImageBufferCG.cpp: Use new flag
+
 2010-12-20  Adrienne Walker  <enne@google.com>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -158 +158 @@
 #endif
             m_context = adoptPtr(new CanvasRenderingContext2D(this, document()->inQuirksMode(), usesDashbardCompatibilityMode));
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
             if (m_context) {
                 // Need to make sure a RenderLayer and compositing layer get created for the Canvas
@@ -385 +385 @@
         return;
 
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     m_imageBuffer = ImageBuffer::create(size, ColorSpaceDeviceRGB, Accelerated);
 #else

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -145 +145 @@
 bool CanvasRenderingContext2D::isAccelerated() const
 {
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     return true;
 #elif ENABLE(ACCELERATED_2D_CANVAS)
@@ -1824 +1824 @@
         IntRect maskRect = enclosingIntRect(textRect);
 
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
         OwnPtr<ImageBuffer> maskImage = ImageBuffer::create(maskRect.size(), ColorSpaceDeviceRGB, Accelerated);
 #else

trunk/WebCore/platform/graphics/ImageBuffer.h

@@ -41 +41 @@
 
 #if (PLATFORM(MAC) && PLATFORM(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
-#define USE_IOSURFACE 1
+#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
 #endif
 

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

@@ -43 +43 @@
 #include <math.h>
 
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
 #include <IOSurface/IOSurface.h>
 #endif
@@ -55 +55 @@
 namespace WebCore {
 
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
 static RetainPtr<IOSurfaceRef> createIOSurface(const IntSize& size)
 {
@@ -101 +101 @@
 ImageBufferData::ImageBufferData(const IntSize&)
     : m_data(0)
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     , m_surface(0)
 #endif
@@ -112 +112 @@
     , m_accelerateRendering(renderingMode == Accelerated)
 {
-#if !defined(USE_IOSURFACE)
+#if !USE(IOSURFACE_CANVAS_BACKING_STORE)
     ASSERT(renderingMode == Unaccelerated);
 #endif
@@ -149 +149 @@
         m_data.m_dataProvider.adoptCF(CGDataProviderCreateWithData(0, m_data.m_data, dataSize, releaseImageData));
     } else {
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
         m_data.m_surface = createIOSurface(size);
         cgContext.adoptCF(wkIOSurfaceContextCreate(m_data.m_surface.get(), size.width(), size.height(), m_data.m_colorSpace));
@@ -186 +186 @@
     if (!m_accelerateRendering)
         ctxImage = CGBitmapContextCreateImage(context()->platformContext());
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     else
         ctxImage = wkIOSurfaceContextCreateImage(context()->platformContext());
@@ -242 +242 @@
     if (!m_accelerateRendering)
         image.adoptCF(cgImage(m_size, m_data));
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     else
         image.adoptCF(wkIOSurfaceContextCreateImage(platformContext));
@@ -310 +310 @@
         }
     } else {
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
         IOSurfaceRef surface = imageData.m_surface.get();
         IOSurfaceLock(surface, kIOSurfaceLockReadOnly, 0);
@@ -411 +411 @@
         }
     } else {
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
         IOSurfaceRef surface = imageData.m_surface.get();
         IOSurfaceLock(surface, 0, 0);
@@ -497 +497 @@
     if (!m_accelerateRendering)
         image.adoptCF(CGBitmapContextCreateImage(context()->platformContext()));
-#if defined(USE_IOSURFACE)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     else
         image.adoptCF(wkIOSurfaceContextCreateImage(context()->platformContext()));