summaryrefslogtreecommitdiffstats
path: root/WebCore/WebCorePrefix.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-1/+1
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Factors out common code from JSC and V8 Makefiles, ready for upstreaming to ↵Steve Block2009-11-171-3/+4
| | | | | | | | | | | | | | | | | | | | | webkit.org. Both the JSC and V8 builds use Android.mk, WebCore/Android.mk and WebCore/Android.derived.mk. The JSC build also uses WebCore/Android.jscbindings.mk and WebCore/Android.derived.jscbindings.mk. The V8 build also uses V8Bindings/V8Binding.derived.mk. Change details ... Android.mk - Added content from both Android.jsc.mk and Android.v8.mk and removed these files. Added ifdefs to switch between two builds. WebCore/Android.mk - Moved JSC bindings code to WebCore/Android.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.mk, which was removed. WebCore/Android.derived.mk - Moved JSC bindings code to WebCore/Android.derived.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.derived.mk, which was removed. Also updates copyright dates, as per WebKit requirements. Change-Id: I92377b60f6f63c57283c316a2c7c2c64a13dc7de
* Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.Steve Block2009-11-121-2/+14
| | | | | | | | | | | | | | | | Content from WebCorePrefixAndroid.h has been moved to WebCorePrefix.h and the Android Makefiles modified to use that file. - Enabler flags have been moved to WebCore/config.h. - flex_XXX_T types are defined in WebCore/css/maketokenizer - Most system includes are alreay present in WebCorePrefix.h - Some includes have been moved directly to the source files that require them. - The following includes seem not to be required so have been dropped. - #include <limits.h> - #include <math.h> - #include <stdint.h> - #include <unistd.h> Change-Id: I8eba4d0a606463503554955e113d57bdf76a7136
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-2/+12
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-12/+2
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-2/+12
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-2/+18
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-10/+0
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-1/+1
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+126
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-126/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-2/+4
|
* external/webkit r30707Upstream1970-01-121-0/+124