Changeset 161001 in webkit

Timestamp:

Dec 23, 2013, 10:27:20 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r160945.
​http://trac.webkit.org/changeset/160945
​https://bugs.webkit.org/show_bug.cgi?id=126164

Seems to have broken multiple canvas tests (Requested by ap on
#webkit).

PerformanceTests:

• Canvas/reuse.html: Removed.

Source/WebCore:

• WebCore.xcodeproj/project.pbxproj:
• platform/graphics/cg/ImageBufferBackingStoreCache.cpp: Removed.
• platform/graphics/cg/ImageBufferBackingStoreCache.h: Removed.
• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::createIOSurface):
(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::~ImageBuffer):

LayoutTests:

• fast/canvas/canvas-backing-store-reuse-expected.txt: Removed.
• fast/canvas/canvas-backing-store-reuse.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-backing-store-reuse-expected.txt (deleted)
• LayoutTests/fast/canvas/canvas-backing-store-reuse.html (deleted)
• PerformanceTests/Canvas/reuse.html (deleted)
• PerformanceTests/ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp (deleted)
• Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h (deleted)
• Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2013-12-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r160945.
+        http://trac.webkit.org/changeset/160945
+        https://bugs.webkit.org/show_bug.cgi?id=126164
+
+        Seems to have broken multiple canvas tests (Requested by ap on
+        #webkit).
+
+        * fast/canvas/canvas-backing-store-reuse-expected.txt: Removed.
+        * fast/canvas/canvas-backing-store-reuse.html: Removed.
+
 2013-12-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/PerformanceTests/ChangeLog ¶

@@ +1 @@
+2013-12-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r160945.
+        http://trac.webkit.org/changeset/160945
+        https://bugs.webkit.org/show_bug.cgi?id=126164
+
+        Seems to have broken multiple canvas tests (Requested by ap on
+        #webkit).
+
+        * Canvas/reuse.html: Removed.
+
 2013-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2013-12-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r160945.
+        http://trac.webkit.org/changeset/160945
+        https://bugs.webkit.org/show_bug.cgi?id=126164
+
+        Seems to have broken multiple canvas tests (Requested by ap on
+        #webkit).
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/cg/ImageBufferBackingStoreCache.cpp: Removed.
+        * platform/graphics/cg/ImageBufferBackingStoreCache.h: Removed.
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::createIOSurface):
+        (WebCore::ImageBuffer::ImageBuffer):
+        (WebCore::ImageBuffer::~ImageBuffer):
+
 2013-12-23  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj ¶

@@ -847 +847 @@
                 1C18DA58181AF6A500C4EF22 /* TextPainter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C18DA56181AF6A500C4EF22 /* TextPainter.cpp */; };
                 1C18DA59181AF6A500C4EF22 /* TextPainter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C18DA57181AF6A500C4EF22 /* TextPainter.h */; };
-                1C21E57C183ED1FF001C289D /* ImageBufferBackingStoreCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C21E57A183ED1FF001C289D /* ImageBufferBackingStoreCache.cpp */; };
-                1C21E57D183ED1FF001C289D /* ImageBufferBackingStoreCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C21E57B183ED1FF001C289D /* ImageBufferBackingStoreCache.h */; };
                 1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */; };
                 1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */; };
@@ -7505 +7503 @@
                 1C18DA56181AF6A500C4EF22 /* TextPainter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextPainter.cpp; sourceTree = "<group>"; };
                 1C18DA57181AF6A500C4EF22 /* TextPainter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextPainter.h; sourceTree = "<group>"; };
-                1C21E57A183ED1FF001C289D /* ImageBufferBackingStoreCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferBackingStoreCache.cpp; sourceTree = "<group>"; };
-                1C21E57B183ED1FF001C289D /* ImageBufferBackingStoreCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageBufferBackingStoreCache.h; sourceTree = "<group>"; };
                 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoaderMac.cpp; sourceTree = "<group>"; };
                 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageMac.cpp; sourceTree = "<group>"; };
@@ -19284 +19280 @@
                                 1FC40FB71655C5910040F29E /* SubimageCacheWithTimer.h */,
                                 B275352A0B053814002CE64F /* TransformationMatrixCG.cpp */,
-                                1C21E57A183ED1FF001C289D /* ImageBufferBackingStoreCache.cpp */,
-                                1C21E57B183ED1FF001C289D /* ImageBufferBackingStoreCache.h */,
                         );
                         path = cg;
@@ -23702 +23696 @@
                                 A6148A7912E41E3B0044A784 /* JSHTMLKeygenElement.h in Headers */,
                                 1AE2AB220A1CE63B00B42B25 /* JSHTMLLabelElement.h in Headers */,
-                                1C21E57D183ED1FF001C289D /* ImageBufferBackingStoreCache.h in Headers */,
                                 1AE2AB240A1CE63B00B42B25 /* JSHTMLLegendElement.h in Headers */,
                                 1AE2AB260A1CE63B00B42B25 /* JSHTMLLIElement.h in Headers */,
@@ -26884 +26877 @@
                                 4162A4571011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp in Sources */,
                                 4162A454101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp in Sources */,
-                                1C21E57C183ED1FF001C289D /* ImageBufferBackingStoreCache.cpp in Sources */,
                                 FDA15ED112B03F94003A583A /* JSDelayNode.cpp in Sources */,
                                 31FB1A65120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp in Sources */,

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

@@ -48 +48 @@
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
-#include "ImageBufferBackingStoreCache.h"
 #include <IOSurface/IOSurface.h>
 #endif
@@ -56 +55 @@
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
 static const int maxIOSurfaceDimension = 4096;
+
+static RetainPtr<IOSurfaceRef> createIOSurface(const IntSize& size)
+{
+    unsigned pixelFormat = 'BGRA';
+    unsigned bytesPerElement = 4;
+    int width = size.width();
+    int height = size.height();
+
+    unsigned long bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size.width() * bytesPerElement);
+    if (!bytesPerRow)
+        return 0;
+
+    unsigned long allocSize = IOSurfaceAlignProperty(kIOSurfaceAllocSize, size.height() * bytesPerRow);
+    if (!allocSize)
+        return 0;
+
+    const void *keys[6];
+    const void *values[6];
+    keys[0] = kIOSurfaceWidth;
+    values[0] = CFNumberCreate(0, kCFNumberIntType, &width);
+    keys[1] = kIOSurfaceHeight;
+    values[1] = CFNumberCreate(0, kCFNumberIntType, &height);
+    keys[2] = kIOSurfacePixelFormat;
+    values[2] = CFNumberCreate(0, kCFNumberIntType, &pixelFormat);
+    keys[3] = kIOSurfaceBytesPerElement;
+    values[3] = CFNumberCreate(0, kCFNumberIntType, &bytesPerElement);
+    keys[4] = kIOSurfaceBytesPerRow;
+    values[4] = CFNumberCreate(0, kCFNumberLongType, &bytesPerRow);
+    keys[5] = kIOSurfaceAllocSize;
+    values[5] = CFNumberCreate(0, kCFNumberLongType, &allocSize);
+
+    RetainPtr<CFDictionaryRef> dict = adoptCF(CFDictionaryCreate(0, keys, values, 6, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+    for (unsigned i = 0; i < 6; i++)
+        CFRelease(values[i]);
+
+    return adoptCF(IOSurfaceCreate(dict.get()));
+}
 #endif
 
@@ -121 +157 @@
     if (accelerateRendering) {
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
-        ImageBufferBackingStoreCache::IOSurfaceAndContext infoFromPool = ImageBufferBackingStoreCache::get().getOrAllocate(
-            internalSize(), m_data.m_colorSpace, false);
-        cgContext = infoFromPool.context;
-        if (cgContext) {
-            m_data.m_surface = infoFromPool.surface;
-            m_data.m_backingStoreSize.setWidth(IOSurfaceGetWidth(m_data.m_surface.get()));
-            m_data.m_backingStoreSize.setHeight(IOSurfaceGetHeight(m_data.m_surface.get()));
-            m_data.m_bytesPerRow = IOSurfaceGetBytesPerRow(m_data.m_surface.get());
-        }
+        m_data.m_surface = createIOSurface(m_data.m_backingStoreSize);
+        FloatSize userBounds = scaleSizeToUserSpace(FloatSize(width.unsafeGet(), height.unsafeGet()), m_data.m_backingStoreSize, m_size);
+        cgContext = adoptCF(wkIOSurfaceContextCreate(m_data.m_surface.get(), userBounds.width(), userBounds.height(), m_data.m_colorSpace));
 #endif
         if (!cgContext)
@@ -159 +189 @@
 ImageBuffer::~ImageBuffer()
 {
-#if USE(IOSURFACE_CANVAS_BACKING_STORE)
-    if (m_data.m_surface)
-        ImageBufferBackingStoreCache::get().deallocate(m_data.m_surface.get());
-#endif
 }