Title: [217234] trunk/Source/WebCore
- Revision
- 217234
- Author
- [email protected]
- Date
- 2017-05-22 12:02:11 -0700 (Mon, 22 May 2017)
Log Message
ASSERTION FAILED: m_boundThread == currentThread() in WTF::WeakReference<WebCore::WebCoreDecompressionSession>::clear()
https://bugs.webkit.org/show_bug.cgi?id=172457
<rdar://problem/32329436>
Reviewed by Eric Carlson.
Remove vestigal WeakPtrFactory that was entirely unused.
* platform/graphics/cocoa/WebCoreDecompressionSession.h:
(WebCore::WebCoreDecompressionSession::createWeakPtr): Deleted.
* platform/graphics/cocoa/WebCoreDecompressionSession.mm:
(WebCore::WebCoreDecompressionSession::WebCoreDecompressionSession):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (217233 => 217234)
--- trunk/Source/WebCore/ChangeLog 2017-05-22 18:49:02 UTC (rev 217233)
+++ trunk/Source/WebCore/ChangeLog 2017-05-22 19:02:11 UTC (rev 217234)
@@ -1,3 +1,18 @@
+2017-05-22 Jer Noble <[email protected]>
+
+ ASSERTION FAILED: m_boundThread == currentThread() in WTF::WeakReference<WebCore::WebCoreDecompressionSession>::clear()
+ https://bugs.webkit.org/show_bug.cgi?id=172457
+ <rdar://problem/32329436>
+
+ Reviewed by Eric Carlson.
+
+ Remove vestigal WeakPtrFactory that was entirely unused.
+
+ * platform/graphics/cocoa/WebCoreDecompressionSession.h:
+ (WebCore::WebCoreDecompressionSession::createWeakPtr): Deleted.
+ * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+ (WebCore::WebCoreDecompressionSession::WebCoreDecompressionSession):
+
2017-05-22 Antti Koivisto <[email protected]>
Crash in WebCore::StyleRuleKeyframes::findKeyframeIndex
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h (217233 => 217234)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h 2017-05-22 18:49:02 UTC (rev 217233)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h 2017-05-22 19:02:11 UTC (rev 217234)
@@ -34,7 +34,6 @@
#include <wtf/Ref.h>
#include <wtf/RetainPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
-#include <wtf/WeakPtr.h>
typedef CFTypeRef CMBufferRef;
typedef struct opaqueCMBufferQueue *CMBufferQueueRef;
@@ -75,7 +74,6 @@
void decodeSample(CMSampleBufferRef, bool displaying);
void enqueueDecodedSample(CMSampleBufferRef, bool displaying);
- WeakPtr<WebCoreDecompressionSession> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
void handleDecompressionOutput(bool displaying, OSStatus, VTDecodeInfoFlags, CVImageBufferRef, CMTime presentationTimeStamp, CMTime presentationDuration);
RetainPtr<CVPixelBufferRef> getFirstVideoFrame();
void resetAutomaticDequeueTimer();
@@ -103,7 +101,6 @@
OSObjectPtr<dispatch_source_t> m_timerSource;
std::function<void()> m_notificationCallback;
std::function<void()> m_hasAvailableFrameCallback;
- WeakPtrFactory<WebCoreDecompressionSession> m_weakFactory;
CMBufferQueueTriggerToken m_didBecomeReadyTrigger { nullptr };
bool m_invalidated { false };
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm (217233 => 217234)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-05-22 18:49:02 UTC (rev 217233)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-05-22 19:02:11 UTC (rev 217234)
@@ -48,9 +48,7 @@
: m_decompressionQueue(adoptOSObject(dispatch_queue_create("WebCoreDecompressionSession Decompression Queue", DISPATCH_QUEUE_SERIAL)))
, m_enqueingQueue(adoptOSObject(dispatch_queue_create("WebCoreDecompressionSession Enqueueing Queue", DISPATCH_QUEUE_SERIAL)))
, m_hasAvailableImageSemaphore(adoptOSObject(dispatch_semaphore_create(0)))
- , m_weakFactory(this)
{
- auto weakThis = createWeakPtr();
}
void WebCoreDecompressionSession::invalidate()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
