summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/config.h
Commit message (Collapse)AuthorAgeFilesLines
* Move all ANDROID defines to wtf/Platform.hSteve Block2011-06-141-130/+1
| | | | | | | | | | | | | | This patch moves many defines from WebCore/config.h to keep all of the Android defines together. Also, WebCore/config.h should not be used by JavaScriptCore (though currently it is on Android), whereas wtf/Platform.h is always included. Some Android defines in WebCore/config.h are already usptreamed, but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602 Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-11/+11
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-0/+30
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge "JavaScriptCore/config.h should not include WebCore/config.h"Steve Block2011-06-021-6/+3
|\
| * JavaScriptCore/config.h should not include WebCore/config.hSteve Block2011-06-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All WebKit ports other than Chromium use a separate set of include paths for building JSC vs WebCore, so source files pick up the appropriate version of config.h. Android uses a single set of include paths, so gets aroud this problem by adding WebCore/ to the include path first and including JavaScriptCore/config.h from WebCore/config.h. This is ugly and will cause problems in an upcoming merge due to new macros being defined in both files. The two files are very similar. JavaScriptCore/config.h adds only the following two defines ... - HAVE_STDINT_H - This is not used on Android - WTF_CHANGES This patch removes the include of JavaScriptCore/config.h from WebCore/config.h and adds WTF_CHANGES for Android. Note that Chromium uses only WebCore/config.h and adds WTF_CHANGES in a similar way. Change-Id: Ib9c93eda0023096aa40dde947b5a476c207542e0
* | Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-021-2/+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-9/+0
|/ | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-0/+4
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Fix build when WEBARCHIVE is disabledSteve Block2011-05-181-2/+0
| | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-2/+4
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+333
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-05-28 17:38:01 +0000