Title: [168456] trunk/Source/WebKit2
- Revision
- 168456
- Author
- simon.fra...@apple.com
- Date
- 2014-05-07 18:16:53 -0700 (Wed, 07 May 2014)
Log Message
Put a better version of the assertion back, and add one when we ensureBackingStore.
Reviewed by Tim Horton.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
(WebKit::PlatformCALayerRemote::ensureBackingStore):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168455 => 168456)
--- trunk/Source/WebKit2/ChangeLog 2014-05-08 00:48:34 UTC (rev 168455)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-08 01:16:53 UTC (rev 168456)
@@ -1,5 +1,15 @@
2014-05-07 Simon Fraser <simon.fra...@apple.com>
+ Put a better version of the assertion back, and add one when we ensureBackingStore.
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
+ (WebKit::PlatformCALayerRemote::ensureBackingStore):
+
+2014-05-07 Simon Fraser <simon.fra...@apple.com>
+
This assertion was wrong and fired every time. Remove it.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (168455 => 168456)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-08 00:48:34 UTC (rev 168455)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-08 01:16:53 UTC (rev 168456)
@@ -118,6 +118,8 @@
void PlatformCALayerRemote::recursiveBuildTransaction(RemoteLayerTreeTransaction& transaction)
{
+ ASSERT(!m_properties.backingStore || owner());
+
if (m_properties.backingStore && (!owner() || !owner()->platformCALayerDrawsContent())) {
m_properties.backingStore = nullptr;
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BackingStoreChanged);
@@ -167,6 +169,8 @@
void PlatformCALayerRemote::ensureBackingStore()
{
+ ASSERT(owner());
+
if (!m_properties.backingStore)
m_properties.backingStore = std::make_unique<RemoteLayerBackingStore>(m_context);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
