Changeset 167273 in webkit

Timestamp:

Apr 14, 2014 3:37:07 PM (10 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Hash table assertion closing a tab
​https://bugs.webkit.org/show_bug.cgi?id=131640

Reviewed by Tim Horton.

Have RemoteLayerTreeContext keep track of all PlatformCALayerRemotes,
and clear their context pointer when it is being destroyed to avoid
calling into a deleted object later.

• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::~PlatformCALayerRemote):
(WebKit::PlatformCALayerRemote::addAnimationForKey):

• WebProcess/WebPage/mac/PlatformCALayerRemote.h:

(WebKit::PlatformCALayerRemote::clearContext):

• WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
• WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:

(WebKit::RemoteLayerTreeContext::~RemoteLayerTreeContext):
(WebKit::RemoteLayerTreeContext::layerWasCreated):
(WebKit::RemoteLayerTreeContext::layerWillBeDestroyed):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (2 diffs)
• WebProcess/WebPage/mac/PlatformCALayerRemote.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeContext.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeContext.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-14  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Hash table assertion closing a tab
+        https://bugs.webkit.org/show_bug.cgi?id=131640
+
+        Reviewed by Tim Horton.
+        
+        Have RemoteLayerTreeContext keep track of all PlatformCALayerRemotes,
+        and clear their context pointer when it is being destroyed to avoid
+        calling into a deleted object later.
+
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+        (WebKit::PlatformCALayerRemote::~PlatformCALayerRemote):
+        (WebKit::PlatformCALayerRemote::addAnimationForKey):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+        (WebKit::PlatformCALayerRemote::clearContext):
+        * WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
+        (WebKit::RemoteLayerTreeContext::~RemoteLayerTreeContext):
+        (WebKit::RemoteLayerTreeContext::layerWasCreated):
+        (WebKit::RemoteLayerTreeContext::layerWillBeDestroyed):
+
 2014-04-14  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -110 +110 @@
     for (const auto& layer : m_children)
         toPlatformCALayerRemote(layer.get())->m_superlayer = nullptr;
-    m_context->layerWillBeDestroyed(this);
+
+    if (m_context)
+        m_context->layerWillBeDestroyed(this);
 }
 
@@ -287 +289 @@
     m_properties.addedAnimations.set(key, toPlatformCAAnimationRemote(animation)->properties());
     m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnimationsChanged);
-    
-    m_context->willStartAnimationOnLayer(this);
+
+    if (m_context)
+        m_context->willStartAnimationOnLayer(this);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

@@ -154 +154 @@
     RemoteLayerTreeTransaction::LayerProperties& properties() { return m_properties; }
 
+    void clearContext() { m_context = nullptr; }
+
 protected:
     PlatformCALayerRemote(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner, RemoteLayerTreeContext* context);

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.h

@@ -72 +72 @@
     Vector<WebCore::GraphicsLayer::PlatformLayerID> m_destroyedLayers;
 
+    HashMap<WebCore::GraphicsLayer::PlatformLayerID, PlatformCALayerRemote*> m_liveLayers;
     HashMap<WebCore::GraphicsLayer::PlatformLayerID, PlatformCALayerRemote*> m_layersAwaitingAnimationStart;
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm

@@ -50 +50 @@
 RemoteLayerTreeContext::~RemoteLayerTreeContext()
 {
+    for (auto& layer : m_liveLayers.values())
+        layer->clearContext();
 }
 
@@ -62 +64 @@
 
     m_createdLayers.append(creationProperties);
+    m_liveLayers.add(layer->layerID(), layer);
 }
 
 void RemoteLayerTreeContext::layerWillBeDestroyed(PlatformCALayerRemote* layer)
 {
+    m_liveLayers.remove(layer->layerID());
+
     ASSERT(!m_destroyedLayers.contains(layer->layerID()));
     m_destroyedLayers.append(layer->layerID());