From a551df194f6950988c7accff3018f55c9c674bc3 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 14:28:54 +0100 Subject: 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 --- Source/WebCore/rendering/RenderText.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'Source/WebCore/rendering/RenderText.cpp') diff --git a/Source/WebCore/rendering/RenderText.cpp b/Source/WebCore/rendering/RenderText.cpp index d4f4166..3e696d3 100644 --- a/Source/WebCore/rendering/RenderText.cpp +++ b/Source/WebCore/rendering/RenderText.cpp @@ -1185,27 +1185,10 @@ void RenderText::dirtyLineBoxes(bool fullLayout) } m_linesDirty = false; } -#ifdef ANDROID_DISABLE_ROUNDING_HACKS -static bool disableRoundingHacks(RenderText* renderText) -{ - RenderObject* renderer = renderText; - while (renderer) { - if (renderer->isTextControl()) { - return true; - } - renderer = renderer->parent(); - } - return false; -} -#endif InlineTextBox* RenderText::createTextBox() { -#ifdef ANDROID_DISABLE_ROUNDING_HACKS - return new (renderArena()) InlineTextBox(this, disableRoundingHacks(this)); -#else return new (renderArena()) InlineTextBox(this); -#endif } InlineTextBox* RenderText::createInlineTextBox() -- cgit v1.1