Changeset 160259 in webkit

Timestamp:

Dec 6, 2013 4:33:42 PM (10 years ago)

Author:

Antti Koivisto

Message:

Save original text for RenderText to a map
​https://bugs.webkit.org/show_bug.cgi?id=125278

Reviewed by Darin Adler.

Currently the original text is fetched from the Text node. This is one of the few things
where we use the RenderText node pointer and is stopping Text nodes from being anonymous.

It is very rare of original text to differ from the actual text so we can just squirrel the
original to a map when it differs. This is also simplifies the code.

• rendering/RenderQuote.cpp:

(WebCore::RenderQuote::styleDidChange):
(WebCore::RenderQuote::updateDepth):

• rendering/RenderText.cpp:

(WebCore::originalTextMap):
(WebCore::RenderText::RenderText):
(WebCore::RenderText::~RenderText):
(WebCore::RenderText::styleDidChange):
(WebCore::RenderText::originalText):
(WebCore::RenderText::setTextInternal):
(WebCore::RenderText::setText):

• rendering/RenderText.h:
• rendering/RenderTextFragment.cpp:
• rendering/RenderTextFragment.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderQuote.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (10 diffs)
• rendering/RenderText.h (modified) (3 diffs)
• rendering/RenderTextFragment.cpp (modified) (2 diffs)
• rendering/RenderTextFragment.h (modified) (1 diff)
• rendering/svg/RenderSVGInlineText.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGInlineText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-06  Antti Koivisto  <antti@apple.com>
+
+        Save original text for RenderText to a map
+        https://bugs.webkit.org/show_bug.cgi?id=125278
+
+        Reviewed by Darin Adler.
+        
+        Currently the original text is fetched from the Text node. This is one of the few things 
+        where we use the RenderText node pointer and is stopping Text nodes from being anonymous.
+        
+        It is very rare of original text to differ from the actual text so we can just squirrel the
+        original to a map when it differs. This is also simplifies the code.
+
+        * rendering/RenderQuote.cpp:
+        (WebCore::RenderQuote::styleDidChange):
+        (WebCore::RenderQuote::updateDepth):
+        * rendering/RenderText.cpp:
+        (WebCore::originalTextMap):
+        (WebCore::RenderText::RenderText):
+        (WebCore::RenderText::~RenderText):
+        (WebCore::RenderText::styleDidChange):
+        (WebCore::RenderText::originalText):
+        (WebCore::RenderText::setTextInternal):
+        (WebCore::RenderText::setText):
+        * rendering/RenderText.h:
+        * rendering/RenderTextFragment.cpp:
+        * rendering/RenderTextFragment.h:
+
 2013-12-04  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/RenderQuote.cpp

@@ -63 +63 @@
 {
     RenderText::styleDidChange(diff, oldStyle);
-    setText(originalText());
+    setText(originalText(), true);
 }
 
@@ -453 +453 @@
         return;
     m_depth = depth;
-    setText(originalText());
+    setText(originalText(), true);
 }
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -105 +105 @@
 };
 
+
+typedef HashMap<const RenderText*, String> OriginalTextMap;
+
+static OriginalTextMap& originalTextMap()
+{
+    DEFINE_STATIC_LOCAL(OriginalTextMap, map, ());
+    return map;
+}
+
 static void makeCapitalized(String* string, UChar previous)
 {
@@ -155 +164 @@
     , m_knownToHaveNoOverflowAndNoFallbackFonts(false)
     , m_useBackslashAsYenSymbol(false)
+    , m_originalTextDiffersFromRendered(false)
 #if ENABLE(IOS_TEXT_AUTOSIZING)
     , m_candidateComputedTextSize(0)
@@ -178 +188 @@
     , m_knownToHaveNoOverflowAndNoFallbackFonts(false)
     , m_useBackslashAsYenSymbol(false)
+    , m_originalTextDiffersFromRendered(false)
 #if ENABLE(IOS_TEXT_AUTOSIZING)
     , m_candidateComputedTextSize(0)
@@ -193 +204 @@
 }
 
-#ifndef NDEBUG
-
 RenderText::~RenderText()
 {
-}
-
-#endif
+    if (m_originalTextDiffersFromRendered)
+        originalTextMap().remove(this);
+}
 
 const char* RenderText::renderName() const
@@ -254 +263 @@
     ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE;
     if (needsResetText || oldTransform != newStyle.textTransform() || oldSecurity != newStyle.textSecurity())
-        transformText();
+        RenderText::setText(originalText(), true);
 }
 
@@ -280 +289 @@
 String RenderText::originalText() const
 {
-    return textNode() ? textNode()->data() : String();
+    return m_originalTextDiffersFromRendered ? originalTextMap().get(this) : m_text;
 }
 
@@ -971 +980 @@
 }
 
-void RenderText::transformText()
-{
-    String textToTransform = originalText();
-    if (!textToTransform.isNull())
-        setText(textToTransform, true);
-}
-
 static inline bool isInlineFlowOrEmptyText(const RenderObject* o)
 {
@@ -1024 +1026 @@
 {
     ASSERT(!text.isNull());
+
+    if (m_originalTextDiffersFromRendered) {
+        originalTextMap().remove(this);
+        m_originalTextDiffersFromRendered = false;
+    }
+    String originalText = text;
+
     m_text = text;
 
@@ -1064 +1073 @@
     m_isAllASCII = m_text.containsOnlyASCII();
     m_canUseSimpleFontCodePath = computeCanUseSimpleFontCodePath();
+
+    if (m_text != originalText) {
+        originalTextMap().add(this, originalText);
+        m_originalTextDiffersFromRendered = true;
+    }
 }
 
@@ -1092 +1106 @@
     ASSERT(!text.isNull());
 
-    if (!force && m_text == text)
+    if (!force && text == originalText())
         return;
 

trunk/Source/WebCore/rendering/RenderText.h

@@ -38 +38 @@
     RenderText(Text&, const String&);
     RenderText(Document&, const String&);
-#ifndef NDEBUG
+
     virtual ~RenderText();
-#endif
 
     virtual const char* renderName() const OVERRIDE;
@@ -107 +106 @@
     virtual void setText(const String&, bool force = false);
     void setTextWithOffset(const String&, unsigned offset, unsigned len, bool force = false);
-
-    virtual void transformText();
 
     virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }
@@ -205 +202 @@
     mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1;
     bool m_useBackslashAsYenSymbol : 1;
+    bool m_originalTextDiffersFromRendered : 1;
 
 #if ENABLE(IOS_TEXT_AUTOSIZING)

trunk/Source/WebCore/rendering/RenderTextFragment.cpp

@@ -59 +59 @@
 }
 
-String RenderTextFragment::originalText() const
-{
-    String result = textNode() ? textNode()->data() : contentString();
-    return result.substring(start(), end());
-}
-
 bool RenderTextFragment::canBeSelectionLeaf() const
 {
@@ -104 +98 @@
 }
 
-void RenderTextFragment::transformText()
-{
-    // Don't reset first-letter here because we are only transforming the truncated fragment.
-    String textToTransform = originalText();
-    if (!textToTransform.isNull())
-        RenderText::setText(textToTransform, true);
-}
-
 UChar RenderTextFragment::previousCharacter() const
 {

trunk/Source/WebCore/rendering/RenderTextFragment.h

@@ -51 +51 @@
 
     StringImpl* contentString() const { return m_contentString.impl(); }
-    virtual String originalText() const OVERRIDE;
 
     virtual void setText(const String&, bool force = false) OVERRIDE;
-
-    virtual void transformText() OVERRIDE;
 
     const String& altText() const { return m_altText; }

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp

@@ -39 +39 @@
 #include "StyleFontSizeFunctions.h"
 #include "StyleResolver.h"
+#include "Text.h"
 #include "VisiblePosition.h"
 
@@ -75 +76 @@
 }
 
+String RenderSVGInlineText::originalText() const
+{
+    return textNode().data();
+}
+
 void RenderSVGInlineText::setTextInternal(const String& text)
 {

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.h

@@ -53 +53 @@
     virtual const char* renderName() const OVERRIDE { return "RenderSVGInlineText"; }
 
+    virtual String originalText() const OVERRIDE;
     virtual void setTextInternal(const String&) OVERRIDE;
     virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE;