Merge 127381

Source/WebCore/rendering/RenderText.h

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple 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.
  *
@@ skipping 27 matching lines @@
     virtual ~RenderText();
 #endif
 
     virtual const char* renderName() const;
 
     virtual bool isTextFragment() const;
     virtual bool isWordBreak() const;
 
     virtual PassRefPtr<StringImpl> originalText() const;
 
+    void updateTextIfNeeded()
+    {
+        if (preferredLogicalWidthsDirty())
+            updateText();
+    }
+
     void extractTextBox(InlineTextBox*);
     void attachTextBox(InlineTextBox*);
     void removeTextBox(InlineTextBox*);
 
     StringImpl* text() const { return m_text.impl(); }
     String textWithoutTranscoding() const;
 
     InlineTextBox* createInlineTextBox();
     void dirtyLineBoxes(bool fullLayout);
 
@@ skipping 74 matching lines @@
     bool knownToHaveNoOverflowAndNoFallbackFonts() const { return m_knownToHaveNoOverflowAndNoFallbackFonts; }
 
     void removeAndDestroyTextBoxes();
 
 protected:
     virtual void willBeDestroyed();
 
     virtual void styleWillChange(StyleDifference, const RenderStyle*) { }
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
+    virtual void updateText() { }
     virtual void setTextInternal(PassRefPtr<StringImpl>);
     virtual UChar previousCharacter() const;
     
     virtual InlineTextBox* createTextBox(); // Subclassed by SVG.
 
 private:
     void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
 
     bool computeCanUseSimpleFontCodePath() const;
     
@@ skipping 60 matching lines @@
 inline void RenderText::checkConsistency() const
 {
 }
 #endif
 
 void applyTextTransform(const RenderStyle*, String&, UChar);
 
 } // namespace WebCore
 
 #endif // RenderText_h