Title: [187681] trunk/Source/WebCore
- Revision
- 187681
- Author
- [email protected]
- Date
- 2015-07-31 14:16:42 -0700 (Fri, 31 Jul 2015)
Log Message
ImageBufferDataCG should not add IOSurfaces to the pool
https://bugs.webkit.org/show_bug.cgi?id=147494
Reviewed by Tim Horton.
ImageBufferDataCG should not add IOSurfaces to the pool as it is not
safe. IOSurfaceIsInUse() does not return accurate result for those
surfaces.
This is a partial revert of r181301.
* platform/graphics/cg/ImageBufferDataCG.cpp:
(WebCore::ImageBufferData::~ImageBufferData): Deleted.
* platform/graphics/cg/ImageBufferDataCG.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187680 => 187681)
--- trunk/Source/WebCore/ChangeLog 2015-07-31 21:05:19 UTC (rev 187680)
+++ trunk/Source/WebCore/ChangeLog 2015-07-31 21:16:42 UTC (rev 187681)
@@ -1,3 +1,20 @@
+2015-07-31 Chris Dumez <[email protected]>
+
+ ImageBufferDataCG should not add IOSurfaces to the pool
+ https://bugs.webkit.org/show_bug.cgi?id=147494
+
+ Reviewed by Tim Horton.
+
+ ImageBufferDataCG should not add IOSurfaces to the pool as it is not
+ safe. IOSurfaceIsInUse() does not return accurate result for those
+ surfaces.
+
+ This is a partial revert of r181301.
+
+ * platform/graphics/cg/ImageBufferDataCG.cpp:
+ (WebCore::ImageBufferData::~ImageBufferData): Deleted.
+ * platform/graphics/cg/ImageBufferDataCG.h:
+
2015-07-31 Jer Noble <[email protected]>
CRASH at WebCore::TaskDispatcher<WebCore::ScriptExecutionContext>::postTask + 38
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (187680 => 187681)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-07-31 21:05:19 UTC (rev 187680)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-07-31 21:16:42 UTC (rev 187681)
@@ -37,7 +37,6 @@
#if USE(IOSURFACE_CANVAS_BACKING_STORE)
#include "IOSurface.h"
-#include "IOSurfacePool.h"
#include "IOSurfaceSPI.h"
#include <dispatch/dispatch.h>
#endif
@@ -47,14 +46,6 @@
namespace WebCore {
-ImageBufferData::~ImageBufferData()
-{
-#if USE(IOSURFACE_CANVAS_BACKING_STORE)
- if (surface)
- IOSurfacePool::sharedPool().addSurface(WTF::move(surface));
-#endif
-}
-
#if USE(ACCELERATE)
#if USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
static void unpremultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (187680 => 187681)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-07-31 21:05:19 UTC (rev 187680)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-07-31 21:16:42 UTC (rev 187681)
@@ -43,8 +43,6 @@
class IOSurface;
struct ImageBufferData {
- ~ImageBufferData();
-
IntSize backingStoreSize;
Checked<unsigned, RecordOverflow> bytesPerRow;
CGColorSpaceRef colorSpace;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
