Only unregister touch action handler conditionally

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2349 matching lines @@
         cache->remove(this);
 
     // If this renderer had a parent, remove should have destroyed any counters
     // attached to this renderer and marked the affected other counters for
     // reevaluation. This apparently redundant check is here for the case when
     // this renderer had no parent at the time remove() was called.
 
     if (hasCounterNodeMap())
         RenderCounter::destroyCounterNodes(*this);
 
-    // Remove the handler if node had touch-action set. Don't call when
-    // document is being destroyed as all handlers will have been cleared
-    // previously. Handlers are not added for text nodes so don't try removing
-    // for one too. Need to check if m_style is null in cases of partial construction.
-    if (!documentBeingDestroyed() && node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto)
-        document().frameHost()->eventHandlerRegistry().didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent);
+    // Remove the handler if node had touch-action set. Handlers are not added
+    // for text nodes so don't try removing for one too. Need to check if
+    // m_style is null in cases of partial construction. Any handler we added
+    // previously may have already been removed by the Document independently.
+    if (node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) {
+        EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
+        if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEvent)->contains(node()))
+            registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent);
+    }
 
     setAncestorLineBoxDirty(false);
 
     clearLayoutRootIfNeeded();
 }
 
 void RenderObject::insertedIntoTree()
 {
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
 
@@ skipping 787 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif