Changeset 20610 for trunk/WebCore/rendering/RenderText.h

Timestamp:

03/30/07 02:59:57 (22 months ago)

Author:

antti

Message:

Reviewed by Hyatt.

Render tree memory savings, part 1

• Eliminate caching of monospace char width from RenderText. This optimization is not needed anymore since Font already caches space width (RenderText -4 bytes)
• Eliminate caching of tab width from RenderBlock. Similary this optimization has become obsolete (RenderBlock -4 bytes)

• platform/Font.cpp: (WebCore::WidthIterator::advance): (WebCore::Font::spaceWidth):
• platform/Font.h: (WebCore::Font::tabWidth):
• platform/TextStyle.h: (WebCore::TextStyle::TextStyle): (WebCore::TextStyle::allowTabs):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::selectionRect): (WebCore::InlineTextBox::paint): (WebCore::InlineTextBox::paintSelection): (WebCore::InlineTextBox::paintMarkedTextBackground): (WebCore::InlineTextBox::paintSpellingOrGrammarMarker): (WebCore::InlineTextBox::paintTextMatchMarker): (WebCore::InlineTextBox::offsetForPosition): (WebCore::InlineTextBox::positionForOffset):
• rendering/RenderBlock.cpp: (WebCore:::RenderFlow): (WebCore::RenderBlock::setStyle):
• rendering/RenderBlock.h:
• rendering/RenderObject.cpp:
• rendering/RenderObject.h:
• rendering/RenderText.cpp: (WebCore::RenderText::RenderText): (WebCore::RenderText::setStyle): (WebCore::RenderText::widthFromCache): (WebCore::RenderText::trimmedMinMaxWidth): (WebCore::RenderText::calcMinMaxWidthInternal): (WebCore::RenderText::setTextInternal): (WebCore::RenderText::width):
• rendering/RenderText.h: (WebCore::RenderText::allowTabs):
• rendering/bidi.cpp:

Files:

• trunk/WebCore/rendering/RenderText.h (modified) (3 diffs)

trunk/WebCore/rendering/RenderText.h

@@ -126 +126 @@
     InlineTextBox* findNextInlineTextBox(int offset, int& pos) const;
 
+    int allowTabs() const { return !style()->collapseWhiteSpace(); }
+
 protected:
     void setTextInternal(PassRefPtr<StringImpl>);
@@ -139 +141 @@
     void calcMinMaxWidthInternal(int leadWidth);
 
-    void updateMonospaceCharacterWidth();
-    int widthFromCache(const Font&, int start, int len, int tabWidth, int xPos) const;
+    int widthFromCache(const Font&, int start, int len, int xPos) const;
     bool isAllASCII() const { return m_isAllASCII; }
 
@@ -165 +166 @@
     bool m_containsReversedText : 1;
     bool m_isAllASCII : 1;
-
-    int m_monospaceCharacterWidth;
 };