summaryrefslogtreecommitdiffstats
path: root/WebCore/WebCorePrefix.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-0/+1
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-10/+1
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-1/+1
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.hKristian Monsen2010-10-051-5/+0
| | | | | | | | | | | | | | | | This is a cherry-pick of the following upstream CL: https://bugs.webkit.org/show_bug.cgi?id=47179 This violates the rules at the top of the file, and means that it will be included before any other includes for all compilation units. We are now just including JavaScriptCore/config.h from WebCore/config.h so if you include one you get both. This created a compile error in V8Counters.cpp, which is also fixed Change-Id: I272247161877ddc680b3aab509bc413ab3445219
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-2/+10
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+8
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-1/+1
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-0/+1
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* 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