summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/wtf/Platform.h
Commit message (Collapse)AuthorAgeFilesLines
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-041-0/+4
|
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-3/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-17/+55
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Enable orientation events.Patrick Scott2009-12-091-0/+1
| | | | | | | Remove our old orientation hacks as webkit now supports the orientation event. Call down into webkit when the orientation changes to send the js event. The change to Frame.cpp has been submited to bugs.webkit.org as issue 32321.
* Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.Steve Block2009-11-251-0/+7
| | | | | | | | This default was recently removed but is required to build on Mac. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=2cc706295f906df0bb49f51c9efe92a97c427464#patch1 Change-Id: Ice535a8205d14a0f3c3bfc4f32bc7d71132fbc2a
* Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.Steve Block2009-11-201-5/+0
| | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=31671 Note that we only need to undef a feature enable flag when we are overwriting a default value previosuly set in Platform.h. Also, we now rely on the default value for ENABLE_DATABASE. Change-Id: I26ca5ef5402609ead880bdd1ce05cdb3646c1bbc
* Cleans up Android-specific changes to Platform.h, ready for upstreaming to ↵Steve Block2009-11-191-30/+22
| | | | | | webkit.org. Change-Id: I873491c433058c5f3bc9d00f40e80813f831f736
* Removes extra define of HAVE_PTHREAD_RW_LOCK.Steve Block2009-11-111-1/+0
| | | | | | | | | This define was added to Android and later upstreamed to webkit.org at a slightly different location. The latest WebKit merge caused both defines to be used. See https://bugs.webkit.org/show_bug.cgi?id=30713 Change-Id: Ib68ceddb57868903661a1d2e3fedf9e092222091
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-5/+12
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-30/+12
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-44/+211
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-60/+14
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-14/+60
|
* Fix ReadWriteLock class problem. Will upstream this asapAndrei Popescu2009-08-141-1/+2
|
* Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings.Ben Murdoch2009-08-121-9/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-29/+143
|
* Get WebKit r44544.Feng Qian2009-06-171-38/+122
|
* Remove unneeded SKIA_SGL platform flagMike Reed2009-05-011-1/+0
|
* Merge commit 'goog/master' into merge_webkit_from_masterFeng Qian2009-04-291-0/+1
|\
| * First cut at sharing graphics code with chromeMike Reed2009-04-281-0/+1
| | | | | | | | | | | | | | Introduce (short lived I hope) platform SKIA_SGL, signifying that this code is used by both platforms (SKIA) and (SGL). This change is meant to be the foundation for more significant sharing later (e.g. TransformationMatrix, Pattern, Gradient, etc.)
* | Make WebCore built with V8.Feng Qian2009-04-241-0/+3
|/ | | | Picked up several new files from Chrome port.
* AI 146153: Make the TextDialog invisible, so that we only show WebKit's ↵Leon Scroggins2009-04-141-1/+1
| | | | | | | | | | | | | | | | | | rendering of the textfield, yet we retain the benefits of having the TextDialog. Frame.cpp: Removed a line that should not be there anyway. Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor. Platform.h: Let WebKit draw the cursor. RenderThemeAndroid.cpp: Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android. WebViewCore.cpp: Make the focused node's document's focus controller active. This allows webkit to draw the cursor. TextDialog.java: Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible. Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example). Since we are not drawing, remove onPreDraw, which is no longer necessary. In onSelectionChanged, pass a message to webkit telling it that the selection has changed. It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit. Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged). BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814 Automated import of CL 146153
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-11/+45
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-25/+121
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+436
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-436/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-15/+187
|
* Initial ContributionThe Android Open Source Project2008-10-211-3/+18
|
* external/webkit r30707Upstream1970-01-121-0/+249
generated by cgit v1.1 at 2025-11-27 13:20:58 +0000