| d2c5226a647dc21d0c15267e09a3d19cf3e0d593 |
|
13-Jun-2011 |
Steve Block <steveblock@google.com> |
Move all ANDROID defines to wtf/Platform.h
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
/external/webkit/Source/WebCore/config.h
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/config.h
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/config.h
|
| 1b22c7a9c33756726c60ab2c9c67d4bbeac153ce |
|
02-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge "JavaScriptCore/config.h should not include WebCore/config.h"
|
| a551df194f6950988c7accff3018f55c9c674bc3 |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
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
/external/webkit/Source/WebCore/config.h
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/config.h
|
| 6d8f06eaadcb30642ddca3d2ceff6cf840a5d143 |
|
01-Jun-2011 |
Steve Block <steveblock@google.com> |
JavaScriptCore/config.h should not include WebCore/config.h
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
/external/webkit/Source/WebCore/config.h
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/config.h
|
| 5dc3f82ee1d379f4df8606cdf60369965b44486c |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Fix build when WEBARCHIVE is disabled
Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
/external/webkit/Source/WebCore/config.h
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/config.h
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/config.h
|