summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/wtf/MathExtras.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+8
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-1/+1
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-1/+7
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-0/+2
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamedSteve Block2010-04-221-2/+0
| | | | | | | | | | | | Android's stlport now provides isinf etc. in the std namespace (see https://android-git.corp.google.com/g/41036). This allows us to remove the Android special-case from MathExtras.h (see https://android-git.corp.google.com/g/41037). This change has now been upstreamed in http://trac.webkit.org/changeset/58110 so we can remove the ANDROID guard marking this change. Change-Id: I7c06a5a5a8f9a0a7909a649e68424688bf02893a
* Updates WebKit's use of cmath to expect isfinite, isinf, isnan and signbit ↵Steve Block2010-02-171-7/+3
| | | | | | | | to be in the std namespace This follows a change to stlport to move these functions to the std namespace to match the simulator build. Change-Id: I7839a857520239610bb6403323fc29adb613d0c2
* Fix the sim-eng buildSteve Block2010-02-161-0/+6
| | | | Change-Id: Icc67c8786c1a1b98993fb27caf71bd4895118589
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-2/+9
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-12/+25
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-5/+1
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-0/+2
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge in WebKit r47029.Ben Murdoch2009-08-111-3/+1
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-39/+17
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+202
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-202/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-6/+31
|
* external/webkit r30707Upstream1970-01-121-0/+177
generated by cgit v1.1 at 2025-05-30 00:00:24 +0000