summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/InlineTextBox.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-2/+11
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-1/+9
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-021-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-12/+12
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-3/+6
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+178
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84