[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp
Adele
adele at opensource.apple.com
Wed Jul 13 16:46:16 PDT 2005
adele 05/07/13 16:46:15
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/ecma Tag: Safari-1-3-branch kjs_window.cpp
Log:
Reviewed by Maciej.
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): removed isnan calls and used IS_NAN macro instead to get this to build on Panther.
Revision Changes Path
No revision
No revision
1.4108.4.43 +6 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4108.4.42
retrieving revision 1.4108.4.43
diff -u -r1.4108.4.42 -r1.4108.4.43
--- ChangeLog 13 Jul 2005 22:45:14 -0000 1.4108.4.42
+++ ChangeLog 13 Jul 2005 23:46:08 -0000 1.4108.4.43
@@ -1,5 +1,11 @@
=== WebCore-315.8 ===
+2005-07-13 Adele Peterson <adele at apple.com>
+
+ Reviewed by Maciej.
+
+ * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): removed isnan calls and used IS_NAN macro instead to get this to build on Panther.
+
2005-07-12 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-1-3-branch
No revision
No revision
1.146.6.7 +4 -12 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.146.6.6
retrieving revision 1.146.6.7
diff -u -r1.146.6.6 -r1.146.6.7
--- kjs_window.cpp 13 Jul 2005 04:25:59 -0000 1.146.6.6
+++ kjs_window.cpp 13 Jul 2005 23:46:15 -0000 1.146.6.7
@@ -68,12 +68,6 @@
#define IS_NAN(d) (!(d == d))
-// Must include <cmath> instead of <math.h> because of a bug in the
-// gcc 3.3 library version of <math.h> where if you include both
-// <cmath> and <math.h> the macros necessary for functions like
-// isnan are not defined.
-#include <cmath>
-
using DOM::DocumentImpl;
using DOM::DOMString;
using DOM::ElementImpl;
@@ -87,8 +81,6 @@
using namespace KJS;
-using std::isnan;
-
namespace KJS {
////////////////////// History Object ////////////////////////
@@ -1723,7 +1715,7 @@
if (key == "left" || key == "screenx") {
bool ok;
double d = val.toDouble(&ok);
- if ((d != 0 || ok) && !isnan(d)) {
+ if ((d != 0 || ok) && !IS_NAN(d)) {
d += screen.x();
if (d < screen.x() || d > screen.right())
d = screen.x(); // only safe choice until size is determined
@@ -1735,7 +1727,7 @@
} else if (key == "top" || key == "screeny") {
bool ok;
double d = val.toDouble(&ok);
- if ((d != 0 || ok) && !isnan(d)) {
+ if ((d != 0 || ok) && !IS_NAN(d)) {
d += screen.y();
if (d < screen.y() || d > screen.bottom())
d = screen.y(); // only safe choice until size is determined
@@ -1747,7 +1739,7 @@
} else if (key == "height") {
bool ok;
double d = val.toDouble(&ok);
- if ((d != 0 || ok) && !isnan(d)) {
+ if ((d != 0 || ok) && !IS_NAN(d)) {
#if !APPLE_CHANGES
d += 2*qApp->style().pixelMetric( QStyle::PM_DefaultFrameWidth ) + 2;
#endif
@@ -1763,7 +1755,7 @@
} else if (key == "width") {
bool ok;
double d = val.toDouble(&ok);
- if ((d != 0 || ok) && !isnan(d)) {
+ if ((d != 0 || ok) && !IS_NAN(d)) {
#if !APPLE_CHANGES
d += 2*qApp->style().pixelMetric( QStyle::PM_DefaultFrameWidth ) + 2;
#endif
More information about the webkit-changes
mailing list