diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 14:28:54 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:31:08 +0100 |
commit | a551df194f6950988c7accff3018f55c9c674bc3 (patch) | |
tree | 3265b3e1122d384bf2c96cbe7162ddac8790622a /Source/WebCore/rendering/InlineTextBox.h | |
parent | 3b523b87218c05c8dd49c191e3d5a7a114907e82 (diff) | |
download | external_webkit-a551df194f6950988c7accff3018f55c9c674bc3.zip external_webkit-a551df194f6950988c7accff3018f55c9c674bc3.tar.gz external_webkit-a551df194f6950988c7accff3018f55c9c674bc3.tar.bz2 |
Merge WebKit at r80534: Fix uses of rounding hacks.
Font rounding hacks have been removed upstream, so there
is no need for our local code anymore. Remove all uses
of the ANDROID_DISABLE_ROUNDING_HACKS macro.
Note that this brings our behavior in line with upstream -
Android will see a change in behavior to before the merge
as we did not disable rounding hacks in all cases.
- SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for
disableRoundingHacks, so we don't disable hacks, so this behaviour will
change as rounding hacks are disabled now.
- RenderText::createTextBox() - We pass a value for
disableRoundingHacks, true if any parent is a text control.
So we will change behavior in any case where the parent is not
a text control.
Note that although we may see a change in behavior, that change is
consistent with the upstream codebase.
See http://trac.webkit.org/changeset/78846
Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
Diffstat (limited to 'Source/WebCore/rendering/InlineTextBox.h')
-rw-r--r-- | Source/WebCore/rendering/InlineTextBox.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebCore/rendering/InlineTextBox.h b/Source/WebCore/rendering/InlineTextBox.h index a900a71..d894b85 100644 --- a/Source/WebCore/rendering/InlineTextBox.h +++ b/Source/WebCore/rendering/InlineTextBox.h @@ -41,20 +41,13 @@ Color correctedTextColor(Color textColor, Color backgroundColor); class InlineTextBox : public InlineBox { public: -#ifdef ANDROID_DISABLE_ROUNDING_HACKS - InlineTextBox(RenderObject* obj, bool disableRoundingHacks = false) -#else InlineTextBox(RenderObject* obj) -#endif : InlineBox(obj) , m_prevTextBox(0) , m_nextTextBox(0) , m_start(0) , m_len(0) , m_truncation(cNoTruncation) -#ifdef ANDROID_DISABLE_ROUNDING_HACKS - , m_disableRoundingHacks(disableRoundingHacks) -#endif { } @@ -149,9 +142,6 @@ private: unsigned short m_truncation; // Where to truncate when text overflow is applied. We use special constants to // denote no truncation (the whole run paints) and full truncation (nothing paints at all). -#ifdef ANDROID_DISABLE_ROUNDING_HACKS - bool m_disableRoundingHacks; -#endif protected: void paintCompositionBackground(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, int startPos, int endPos); |