Merge 143060

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 36 matching lines @@
 
 void RenderQuote::willBeDestroyed()
 {
     detachQuote();
     RenderText::willBeDestroyed();
 }
 
 void RenderQuote::willBeRemovedFromTree()
 {
     RenderText::willBeRemovedFromTree();
+    detachQuote();
+}
 
-    detachQuote();
+void RenderQuote::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderText::styleDidChange(diff, oldStyle);
+    updateText();
 }
 
 typedef HashMap<AtomicString, const QuotesData*, CaseFoldingHash> QuotesMap;
 
 static const QuotesMap& quotesDataLanguageMap()
 {
     DEFINE_STATIC_LOCAL(QuotesMap, staticQuotesMap, ());
     if (staticQuotesMap.size())
         return staticQuotesMap;
 
@@ skipping 169 matching lines @@
         return quotesData()->getCloseQuote(m_depth - 1).impl();
     case OPEN_QUOTE:
         return quotesData()->getOpenQuote(m_depth).impl();
     }
     ASSERT_NOT_REACHED();
     return StringImpl::empty();
 }
 
 void RenderQuote::updateText()
 {
-    computePreferredLogicalWidths(0);
-}
-
-void RenderQuote::computePreferredLogicalWidths(float lead)
-{
-#ifndef NDEBUG
-    // FIXME: We shouldn't be modifying the tree in computePreferredLogicalWidths.
-    // Instead, we should properly hook the appropriate changes in the DOM and modify
-    // the render tree then. When that's done, we also won't need to override
-    // computePreferredLogicalWidths at all.
-    // https://bugs.webkit.org/show_bug.cgi?id=104829
-    SetLayoutNeededForbiddenScope layoutForbiddenScope(this, false);
-#endif
-
-    if (!m_attached)
-        attachQuote();
-    setTextInternal(originalText());
-
-    RenderText::computePreferredLogicalWidths(lead);
+    setText(originalText());
 }
 
 const QuotesData* RenderQuote::quotesData() const
 {
     if (QuotesData* customQuotes = style()->quotes())
         return customQuotes;
 
     AtomicString language = style()->locale();
     if (language.isNull())
         return basicQuotesData();
     const QuotesData* quotes = quotesDataLanguageMap().get(language);
     if (!quotes)
         return basicQuotesData();
     return quotes;
 }
 
 void RenderQuote::attachQuote()
 {
     ASSERT(view());
     ASSERT(!m_attached);
     ASSERT(!m_next && !m_previous);
-
-    // FIXME: Don't set pref widths dirty during layout. See updateDepth() for
-    // more detail.
-    if (!isRooted()) {
-        setNeedsLayoutAndPrefWidthsRecalc();
-        return;
-    }
+    ASSERT(isRooted());
 
     if (!view()->renderQuoteHead()) {
         view()->setRenderQuoteHead(this);
         m_attached = true;
         return;
     }
 
     for (RenderObject* predecessor = previousInPreOrder(); predecessor; predecessor = predecessor->previousInPreOrder()) {
         // Skip unattached predecessors to avoid having stale m_previous pointers
         // if the previous node is never attached and is then destroyed.
@@ skipping 58 matching lines @@
         case NO_OPEN_QUOTE:
             m_depth++;
             break;
         case CLOSE_QUOTE:
         case NO_CLOSE_QUOTE:
             if (m_depth)
                 m_depth--;
             break;
         }
     }
-    // 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();
+        updateText();
 }
 
 } // namespace WebCore