Remove <video controls> hack.

sky/engine/core/dom/shadow/ShadowRoot.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 31 matching lines @@
 struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
     void* pointers[1];
     unsigned countersAndFlags[1];
 };
 
 COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
 
 ShadowRoot::ShadowRoot(Document& document)
     : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(*this, document)
-    , m_registeredWithParentShadowRoot(false)
     , m_descendantInsertionPointsIsValid(false)
 {
 }
 
 ShadowRoot::~ShadowRoot()
 {
     document().styleEngine()->didRemoveShadowRoot(this);
 
     // We cannot let ContainerNode destructor call willBeDeletedFromDocument()
     // for this ShadowRoot instance because TreeScope destructor
@@ skipping 45 matching lines @@
         }
     }
 
     clearChildNeedsStyleRecalc();
 }
 
 void ShadowRoot::insertedInto(ContainerNode* insertionPoint)
 {
     DocumentFragment::insertedInto(insertionPoint);
 
-    if (!insertionPoint->inDocument())
-        return;
-
-    // FIXME: When parsing <video controls>, insertedInto() is called many times without invoking removedFrom.
-    // For now, we check m_registeredWithParentShadowroot. We would like to ASSERT(!m_registeredShadowRoot) here.
-    // https://bugs.webkit.org/show_bug.cig?id=101316
-    if (m_registeredWithParentShadowRoot)
-        return;
-
-    if (ShadowRoot* root = host()->containingShadowRoot()) {
+    if (ShadowRoot* root = host()->containingShadowRoot())
         root->addChildShadowRoot();
-        m_registeredWithParentShadowRoot = true;
-    }
 }
 
 void ShadowRoot::removedFrom(ContainerNode* insertionPoint)
 {
-    if (insertionPoint->inDocument() && m_registeredWithParentShadowRoot) {
-        ShadowRoot* root = host()->containingShadowRoot();
-        if (!root)
-            root = insertionPoint->containingShadowRoot();
-        if (root)
-            root->removeChildShadowRoot();
-        m_registeredWithParentShadowRoot = false;
-    }
+    ShadowRoot* root = host()->containingShadowRoot();
+    if (!root)
+        root = insertionPoint->containingShadowRoot();
+    if (root)
+        root->removeChildShadowRoot();
 
     DocumentFragment::removedFrom(insertionPoint);
 }
 
 ShadowRootRareData* ShadowRoot::ensureShadowRootRareData()
 {
     if (m_shadowRootRareData)
         return m_shadowRootRareData.get();
 
     m_shadowRootRareData = adoptPtr(new ShadowRootRareData);
@@ skipping 60 matching lines @@
     Vector<RefPtr<InsertionPoint> > insertionPoints;
     for (InsertionPoint* insertionPoint = Traversal<InsertionPoint>::firstWithin(*this); insertionPoint; insertionPoint = Traversal<InsertionPoint>::next(*insertionPoint, this))
         insertionPoints.append(insertionPoint);
 
     ensureShadowRootRareData()->setDescendantInsertionPoints(insertionPoints);
 
     return m_shadowRootRareData->descendantInsertionPoints();
 }
 
 }