diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:45:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 12:18:43 +0100 |
| commit | 57a47dd4f75b9c15804c3c61479540cfdc11bd6e (patch) | |
| tree | 5ec595511ac1e4b36aea409b2705e3e332b4366f /JavaScriptCore/wtf | |
| parent | 21939df44de1705786c545cd1bf519d47250322d (diff) | |
| download | external_webkit-57a47dd4f75b9c15804c3c61479540cfdc11bd6e.zip external_webkit-57a47dd4f75b9c15804c3c61479540cfdc11bd6e.tar.gz external_webkit-57a47dd4f75b9c15804c3c61479540cfdc11bd6e.tar.bz2 | |
Merge Webkit at r58956: Fix conflicts.
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
Diffstat (limited to 'JavaScriptCore/wtf')
| -rw-r--r-- | JavaScriptCore/wtf/MathExtras.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h index 25e724a..1f77b61 100644 --- a/JavaScriptCore/wtf/MathExtras.h +++ b/JavaScriptCore/wtf/MathExtras.h @@ -190,11 +190,7 @@ inline float deg2turn(float d) { return d / 360.0f; } inline float rad2grad(float r) { return r * 200.0f / piFloat; } inline float grad2rad(float g) { return g * piFloat / 200.0f; } -<<<<<<< HEAD:JavaScriptCore/wtf/MathExtras.h -#if !COMPILER(MSVC) && !COMPILER(RVCT) && !COMPILER(WINSCW) -======= #if !COMPILER(MSVC) && !COMPILER(WINSCW) && !(COMPILER(RVCT) && OS(SYMBIAN)) ->>>>>>> webkit.org at r58956:JavaScriptCore/wtf/MathExtras.h using std::isfinite; using std::isinf; using std::isnan; |