Merge 126048

Source/WebCore/rendering/RenderQuote.cpp

 /**
  * Copyright (C) 2011 Nokia Inc.  All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
     ASSERT(!m_attached);
     ASSERT(!m_next && !m_previous);
 }
 
 void RenderQuote::willBeDestroyed()
 {
     detachQuote();
     RenderText::willBeDestroyed();
 }
 
+void RenderQuote::willBeRemovedFromTree()
+{
+    RenderText::willBeRemovedFromTree();
+
+    detachQuote();
+}
+
 typedef HashMap<AtomicString, const QuotesData*, CaseFoldingHash> QuotesMap;
 
 static const QuotesMap& quotesDataLanguageMap()
 {
     DEFINE_STATIC_LOCAL(QuotesMap, staticQuotesMap, ());
     if (staticQuotesMap.size())
         return staticQuotesMap;
 
     // Table of quotes from http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#quotes
     #define QUOTES_LANG(lang, o1, c1, o2, c2) staticQuotesMap.set(lang, QuotesData::create(U(o1), U(c1), U(o2), U(c2)).leakRef())
@@ skipping 286 matching lines @@
     }
     // FIXME: Don't call setNeedsLayout or dirty our preferred widths during layout.
     // This is likely to fail anyway as one of our ancestor will call setNeedsLayout(false),
     // preventing the future layout to occur on |this|. The solution is to move that to a
     // pre-layout phase.
     if (oldDepth != m_depth)
         setNeedsLayoutAndPrefWidthsRecalc();
 }
 
 } // namespace WebCore