Title: [131966] trunk/Source/WebCore
- Revision
- 131966
- Author
- simon.fra...@apple.com
- Date
- 2012-10-19 17:36:41 -0700 (Fri, 19 Oct 2012)
Log Message
Remove .get() calls in assertions as suggested by Darin Adler.
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayer::appendSublayer):
(PlatformCALayer::insertSublayer):
(PlatformCALayer::replaceSublayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131965 => 131966)
--- trunk/Source/WebCore/ChangeLog 2012-10-20 00:19:40 UTC (rev 131965)
+++ trunk/Source/WebCore/ChangeLog 2012-10-20 00:36:41 UTC (rev 131966)
@@ -1,5 +1,14 @@
2012-10-19 Simon Fraser <simon.fra...@apple.com>
+ Remove .get() calls in assertions as suggested by Darin Adler.
+
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayer::appendSublayer):
+ (PlatformCALayer::insertSublayer):
+ (PlatformCALayer::replaceSublayer):
+
+2012-10-19 Simon Fraser <simon.fra...@apple.com>
+
Fix a hang when combining tile cache layers with preserve-3d or reflections
https://bugs.webkit.org/show_bug.cgi?id=99890
<rdar://problem/12539560>
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (131965 => 131966)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2012-10-20 00:19:40 UTC (rev 131965)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2012-10-20 00:36:41 UTC (rev 131966)
@@ -330,7 +330,7 @@
void PlatformCALayer::appendSublayer(PlatformCALayer* layer)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS
- ASSERT(m_layer.get() != layer->m_layer.get());
+ ASSERT(m_layer != layer->m_layer);
[m_layer.get() addSublayer:layer->m_layer.get()];
END_BLOCK_OBJC_EXCEPTIONS
}
@@ -338,7 +338,7 @@
void PlatformCALayer::insertSublayer(PlatformCALayer* layer, size_t index)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS
- ASSERT(m_layer.get() != layer->m_layer.get());
+ ASSERT(m_layer != layer->m_layer);
[m_layer.get() insertSublayer:layer->m_layer.get() atIndex:index];
END_BLOCK_OBJC_EXCEPTIONS
}
@@ -346,7 +346,7 @@
void PlatformCALayer::replaceSublayer(PlatformCALayer* reference, PlatformCALayer* layer)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS
- ASSERT(m_layer.get() != layer->m_layer.get());
+ ASSERT(m_layer != layer->m_layer);
[m_layer.get() replaceSublayer:reference->m_layer.get() with:layer->m_layer.get()];
END_BLOCK_OBJC_EXCEPTIONS
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
