Merge 125448

Source/WebCore/rendering/RenderQuote.cpp

 /**
  * Copyright (C) 2011 Nokia 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 59 matching lines @@
     return staticBasicQuotes;
 }
 
 PassRefPtr<StringImpl> RenderQuote::originalText() const
 {
     switch (m_type) {
     case NO_OPEN_QUOTE:
     case NO_CLOSE_QUOTE:
         return StringImpl::empty();
     case CLOSE_QUOTE:
-        // FIXME: When m_depth is 0 we should return empty string.
-        return quotesData()->getCloseQuote(std::max(m_depth - 1, 0)).impl();
+        return quotesData()->getCloseQuote(m_depth - 1).impl();
     case OPEN_QUOTE:
         return quotesData()->getOpenQuote(m_depth).impl();
     }
     ASSERT_NOT_REACHED();
     return StringImpl::empty();
 }
 
 void RenderQuote::computePreferredLogicalWidths(float lead)
 {
     if (!m_attached)
@@ skipping 104 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