OSDN Git Service

Merge WebKit at r80534: Fix uses of rounding hacks.
authorBen Murdoch <benm@google.com>
Tue, 24 May 2011 13:28:54 +0000 (14:28 +0100)
committerBen Murdoch <benm@google.com>
Thu, 2 Jun 2011 09:31:08 +0000 (10:31 +0100)
commita551df194f6950988c7accff3018f55c9c674bc3
tree3265b3e1122d384bf2c96cbe7162ddac8790622a
parent3b523b87218c05c8dd49c191e3d5a7a114907e82
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/config.h
Source/WebCore/platform/android/FileChooserAndroid.cpp
Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
Source/WebCore/rendering/InlineTextBox.cpp
Source/WebCore/rendering/InlineTextBox.h
Source/WebCore/rendering/RenderText.cpp