[webkit-changes] cvs commit: JavaScriptCore/kxmlcore AlwaysInline.h
Darin
darin at opensource.apple.com
Mon Dec 19 11:53:13 PST 2005
darin 05/12/19 11:53:12
Modified: . ChangeLog WebCorePrefix.h
khtml/ecma kjs_window.cpp
khtml/rendering bidi.cpp render_canvasimage.cpp
render_image.cpp render_text.cpp
ksvg2/css SVGCSSStyleSelector.cpp
ksvg2/svg SVGAnimateColorElementImpl.cpp
SVGAnimateTransformElementImpl.cpp
SVGAnimationElementImpl.cpp
SVGLinearGradientElementImpl.cpp
SVGPatternElementImpl.cpp
SVGRadialGradientElementImpl.cpp
kwq KWQCString.h KWQCString.mm KWQDateTime.h
KWQDateTime.mm KWQDef.h KWQKHTMLPart.h
KWQKHTMLPart.mm KWQMap.h KWQMemArray.h KWQPoint.mm
KWQPointArray.h KWQPtrList.h KWQPtrStack.h
KWQPtrVector.h KWQRect.h KWQRect.mm KWQSize.h
KWQSize.mm KWQValueList.h
. ChangeLog
JavaScriptCore.xcodeproj project.pbxproj
bindings NP_jsobject.h runtime.cpp runtime.h
runtime_object.h
bindings/jni jni_jsobject.h
bindings/objc objc_runtime.h
kjs simple_number.h
Added: ForwardingHeaders/kxmlcore AlwaysInline.h
kxmlcore AlwaysInline.h
Log:
JavaScriptCore:
Reviewed by Geoff Garen and Eric Seidel.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=4923
stop using <ostream> in WebCore, eliminating the <cmath> troubles it causes
* kjs/simple_number.h: Removed many unnecessary includes, including
the <cmath> one to work around GCC library header bugs. We may have to
add some includes elsewhere for platforms other than OS X, since our
prefix header takes care of some things.
* kxmlcore/AlwaysInline.h: Added. Now clients that don't include
simple_number.h can still get the ALWAYS_INLINE macro.
* JavaScriptCore.xcodeproj/project.pbxproj: Added AlwaysInline.h.
* bindings/NP_jsobject.h: Removed a lot of unnecessary includes
and removed C-specific stuff from this C++-only header.
* bindings/jni/jni_jsobject.h: Removed a lot of unnecessary includes
and did some reformatting.
* bindings/objc/objc_runtime.h: Removed an unnecessary include.
* bindings/runtime.h: Removed some unneeded includes. Reformatted.
* bindings/runtime.cpp: Updated to compile with header changes,
including a lot of reformatting.
* bindings/runtime_object.h: Removed an unnecessary include.
WebCore:
Reviewed by Geoff Garen and Eric Seidel.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=4923
stop using <ostream> in WebCore, eliminating the <cmath> troubles it causes
* ForwardingHeaders/kxmlcore/AlwaysInline.h: Added.
* WebCorePrefix.h: Removed the use of <ostream>.
* kwq/KWQDef.h: Removed now-unused Q_INT64, Q_INT16, Q_UINT16, qRound, and _KWQ_IOSTREAM_.
* kwq/KWQKHTMLPart.h: Removed some unneeded headers and added forward-declarations of classes
instead. Corrected some incorrect member function declarations.
* kwq/KWQKHTMLPart.mm: Added a now-needed header.
* khtml/ecma/kjs_window.cpp: Removed the <cmath> workaround.
* khtml/rendering/bidi.cpp: Added include of AlwaysInline.h and removed a
lot of unnecessary includes.
* khtml/rendering/render_canvasimage.cpp: Removed the <cmath> workaround.
* khtml/rendering/render_image.cpp: Removed the <cmath> workaround.
* khtml/rendering/render_text.cpp: Added include of AlwaysInline.h and removed a
lot of unnecessary includes.
* ksvg2/css/SVGCSSStyleSelector.cpp: (KDOM::CSSStyleSelector::applySVGProperty):
* ksvg2/svg/SVGAnimateColorElementImpl.cpp: (SVGAnimateColorElementImpl::calculateColor):
* ksvg2/svg/SVGAnimateTransformElementImpl.cpp: (SVGAnimateTransformElementImpl::handleTimerEvent):
* ksvg2/svg/SVGAnimationElementImpl.cpp: (SVGAnimationElementImpl::closeRenderer):
* ksvg2/svg/SVGLinearGradientElementImpl.cpp: (SVGLinearGradientElementImpl::buildGradient):
* ksvg2/svg/SVGPatternElementImpl.cpp: (SVGPatternElementImpl::notifyAttributeChange):
* ksvg2/svg/SVGRadialGradientElementImpl.cpp: (SVGRadialGradientElementImpl::buildGradient):
Replaced use of qRound with use of lroundf or lround as appropriate.
* kwq/KWQCString.h:
* kwq/KWQCString.mm:
* kwq/KWQDateTime.h:
* kwq/KWQDateTime.mm:
* kwq/KWQMap.h:
* kwq/KWQMemArray.h:
* kwq/KWQPoint.mm:
* kwq/KWQPointArray.h:
* kwq/KWQPtrList.h:
* kwq/KWQPtrStack.h:
* kwq/KWQPtrVector.h:
* kwq/KWQRect.h:
* kwq/KWQRect.mm:
* kwq/KWQSize.h:
* kwq/KWQSize.mm:
* kwq/KWQValueList.h:
Removed _KWQ_IOSTREAM_ code that was used at one time for unit tests, but is now unneeded,
and requires <ostream>.
Revision Changes Path
1.5 +52 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 19 Dec 2005 19:50:45 -0000 1.4
+++ ChangeLog 19 Dec 2005 19:52:46 -0000 1.5
@@ -1,5 +1,57 @@
2005-12-19 Darin Adler <darin at apple.com>
+ Reviewed by Geoff Garen and Eric Seidel.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=4923
+ stop using <ostream> in WebCore, eliminating the <cmath> troubles it causes
+
+ * ForwardingHeaders/kxmlcore/AlwaysInline.h: Added.
+ * WebCorePrefix.h: Removed the use of <ostream>.
+
+ * kwq/KWQDef.h: Removed now-unused Q_INT64, Q_INT16, Q_UINT16, qRound, and _KWQ_IOSTREAM_.
+
+ * kwq/KWQKHTMLPart.h: Removed some unneeded headers and added forward-declarations of classes
+ instead. Corrected some incorrect member function declarations.
+ * kwq/KWQKHTMLPart.mm: Added a now-needed header.
+
+ * khtml/ecma/kjs_window.cpp: Removed the <cmath> workaround.
+ * khtml/rendering/bidi.cpp: Added include of AlwaysInline.h and removed a
+ lot of unnecessary includes.
+ * khtml/rendering/render_canvasimage.cpp: Removed the <cmath> workaround.
+ * khtml/rendering/render_image.cpp: Removed the <cmath> workaround.
+ * khtml/rendering/render_text.cpp: Added include of AlwaysInline.h and removed a
+ lot of unnecessary includes.
+
+ * ksvg2/css/SVGCSSStyleSelector.cpp: (KDOM::CSSStyleSelector::applySVGProperty):
+ * ksvg2/svg/SVGAnimateColorElementImpl.cpp: (SVGAnimateColorElementImpl::calculateColor):
+ * ksvg2/svg/SVGAnimateTransformElementImpl.cpp: (SVGAnimateTransformElementImpl::handleTimerEvent):
+ * ksvg2/svg/SVGAnimationElementImpl.cpp: (SVGAnimationElementImpl::closeRenderer):
+ * ksvg2/svg/SVGLinearGradientElementImpl.cpp: (SVGLinearGradientElementImpl::buildGradient):
+ * ksvg2/svg/SVGPatternElementImpl.cpp: (SVGPatternElementImpl::notifyAttributeChange):
+ * ksvg2/svg/SVGRadialGradientElementImpl.cpp: (SVGRadialGradientElementImpl::buildGradient):
+ Replaced use of qRound with use of lroundf or lround as appropriate.
+
+ * kwq/KWQCString.h:
+ * kwq/KWQCString.mm:
+ * kwq/KWQDateTime.h:
+ * kwq/KWQDateTime.mm:
+ * kwq/KWQMap.h:
+ * kwq/KWQMemArray.h:
+ * kwq/KWQPoint.mm:
+ * kwq/KWQPointArray.h:
+ * kwq/KWQPtrList.h:
+ * kwq/KWQPtrStack.h:
+ * kwq/KWQPtrVector.h:
+ * kwq/KWQRect.h:
+ * kwq/KWQRect.mm:
+ * kwq/KWQSize.h:
+ * kwq/KWQSize.mm:
+ * kwq/KWQValueList.h:
+ Removed _KWQ_IOSTREAM_ code that was used at one time for unit tests, but is now unneeded,
+ and requires <ostream>.
+
+2005-12-19 Darin Adler <darin at apple.com>
+
Reviewed by Geoff Garen and John Sullivan.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=4312
1.18 +0 -4 WebCore/WebCorePrefix.h
Index: WebCorePrefix.h
===================================================================
RCS file: /cvs/root/WebCore/WebCorePrefix.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebCorePrefix.h 21 Nov 2005 04:01:48 -0000 1.17
+++ WebCorePrefix.h 19 Dec 2005 19:52:46 -0000 1.18
@@ -26,10 +26,6 @@
#include <cstddef>
#include <new>
-#ifndef NDEBUG
-#include <ostream>
-#endif
-
// Work around bug 3553309 by re-including <ctype.h>.
#include <cctype>
#define isalnum(c) __istype((c), (_CTYPE_A|_CTYPE_D))
1.1 WebCore/ForwardingHeaders/kxmlcore/AlwaysInline.h
Index: AlwaysInline.h
===================================================================
#import <JavaScriptCore/AlwaysInline.h>
1.203 +0 -7 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- kjs_window.cpp 16 Dec 2005 21:21:27 -0000 1.202
+++ kjs_window.cpp 19 Dec 2005 19:52:47 -0000 1.203
@@ -71,13 +71,6 @@
#include "css/css_stylesheetimpl.h"
#include "misc/shared.h"
-// 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 std::isnan;
-
using namespace DOM;
using namespace EventNames;
1.164 +7 -10 WebCore/khtml/rendering/bidi.cpp
Index: bidi.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- bidi.cpp 18 Dec 2005 22:55:34 -0000 1.163
+++ bidi.cpp 19 Dec 2005 19:52:48 -0000 1.164
@@ -20,22 +20,19 @@
* Boston, MA 02111-1307, USA.
*
*/
+
#include "config.h"
#include "bidi.h"
+
#include "break_lines.h"
-#include "render_block.h"
-#include "render_text.h"
+#include "khtmlview.h"
+#include "kxmlcore/AlwaysInline.h"
#include "render_arena.h"
+#include "render_block.h"
#include "render_canvas.h"
-#include "khtmlview.h"
-#include "xml/dom_docimpl.h"
-#include "misc/shared.h"
-
-#include "kdebug.h"
-#include "qdatetime.h"
-#include "qfontmetrics.h"
+#include "render_text.h"
-using DOM::AtomicString;
+using namespace DOM;
namespace khtml {
1.23 +0 -6 WebCore/khtml/rendering/render_canvasimage.cpp
Index: render_canvasimage.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_canvasimage.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- render_canvasimage.cpp 16 Dec 2005 00:08:31 -0000 1.22
+++ render_canvasimage.cpp 19 Dec 2005 19:52:49 -0000 1.23
@@ -38,12 +38,6 @@
#include "xml/dom2_eventsimpl.h"
#include "html/html_documentimpl.h"
-// 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 namespace DOM;
using namespace HTMLNames;
using namespace khtml;
1.91 +0 -6 WebCore/khtml/rendering/render_image.cpp
Index: render_image.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_image.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- render_image.cpp 16 Dec 2005 00:08:32 -0000 1.90
+++ render_image.cpp 19 Dec 2005 19:52:49 -0000 1.91
@@ -39,12 +39,6 @@
#include "xml/dom2_eventsimpl.h"
#include "html/html_documentimpl.h"
-// 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 namespace DOM;
using namespace HTMLNames;
using namespace khtml;
1.213 +9 -21 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- render_text.cpp 17 Dec 2005 18:10:26 -0000 1.212
+++ render_text.cpp 19 Dec 2005 19:52:50 -0000 1.213
@@ -23,36 +23,22 @@
*/
#include "config.h"
-#include "rendering/render_text.h"
+#include "render_text.h"
-#include "rendering/render_canvas.h"
-#include "rendering/render_object.h"
-#include "rendering/break_lines.h"
-#include "xml/dom2_rangeimpl.h"
-#include "xml/dom_nodeimpl.h"
-#include "xml/dom_docimpl.h"
-#include "xml/dom_position.h"
+#include "break_lines.h"
+#include "kxmlcore/AlwaysInline.h"
#include "render_arena.h"
-
-#include "misc/loader.h"
-
-#include "khtml_part.h"
-
-#include <qpainter.h>
+#include "render_block.h"
+#include "xml/dom2_rangeimpl.h"
#include <qpen.h>
-#include <kdebug.h>
-#include <assert.h>
-
#include <unicode/ubrk.h>
-#include <unicode/uloc.h>
-#include <unicode/utypes.h>
-#include <unicode/parseerr.h>
//#define DEBUG_LAYOUT
-using namespace khtml;
using namespace DOM;
+namespace khtml {
+
#ifndef NDEBUG
static bool inInlineTextBoxDetach;
#endif
@@ -1876,3 +1862,5 @@
result = result->substring(start(), end());
return RefPtr<DOMStringImpl>(result);
}
+
+}
1.13 +1 -1 WebCore/ksvg2/css/SVGCSSStyleSelector.cpp
Index: SVGCSSStyleSelector.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGCSSStyleSelector.cpp 16 Dec 2005 02:30:12 -0000 1.12
+++ SVGCSSStyleSelector.cpp 19 Dec 2005 19:52:52 -0000 1.13
@@ -563,7 +563,7 @@
else
return;
- svgstyle->setStrokeMiterLimit(qRound(f));
+ svgstyle->setStrokeMiterLimit(lroundf(f));
break;
}
case SVGCSS_PROP_FILTER:
1.10 +3 -3 WebCore/ksvg2/svg/SVGAnimateColorElementImpl.cpp
Index: SVGAnimateColorElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGAnimateColorElementImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGAnimateColorElementImpl.cpp 2 Dec 2005 22:44:27 -0000 1.9
+++ SVGAnimateColorElementImpl.cpp 19 Dec 2005 19:52:53 -0000 1.10
@@ -262,9 +262,9 @@
void SVGAnimateColorElementImpl::calculateColor(double time, int &r, int &g, int &b) const
{
- r = qRound(m_redDiff * time) + m_fromColor->color().red();
- g = qRound(m_greenDiff * time) + m_fromColor->color().green();
- b = qRound(m_blueDiff * time) + m_fromColor->color().blue();
+ r = lround(m_redDiff * time) + m_fromColor->color().red();
+ g = lround(m_greenDiff * time) + m_fromColor->color().green();
+ b = lround(m_blueDiff * time) + m_fromColor->color().blue();
}
QColor SVGAnimateColorElementImpl::color() const
1.10 +4 -6 WebCore/ksvg2/svg/SVGAnimateTransformElementImpl.cpp
Index: SVGAnimateTransformElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGAnimateTransformElementImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGAnimateTransformElementImpl.cpp 2 Dec 2005 22:44:27 -0000 1.9
+++ SVGAnimateTransformElementImpl.cpp 19 Dec 2005 19:52:53 -0000 1.10
@@ -267,17 +267,15 @@
calculateRotationFromMatrix(qToMatrix, toAngle, toCx, toCy);
calculateRotationFromMatrix(qFromMatrix, fromAngle, fromCx, fromCy);
- if(m_toRotateSpecialCase)
- {
- if(qRound(toAngle) == 1)
+ if (m_toRotateSpecialCase) {
+ if (lround(toAngle) == 1)
toAngle = 0.0;
else
toAngle = 360.0;
}
- if(m_fromRotateSpecialCase)
- {
- if(qRound(fromAngle) == 1)
+ if (m_fromRotateSpecialCase) {
+ if (lround(fromAngle) == 1)
fromAngle = 0.0;
else
fromAngle = 360.0;
1.15 +1 -1 WebCore/ksvg2/svg/SVGAnimationElementImpl.cpp
Index: SVGAnimationElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGAnimationElementImpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SVGAnimationElementImpl.cpp 6 Dec 2005 01:53:15 -0000 1.14
+++ SVGAnimationElementImpl.cpp 19 Dec 2005 19:52:53 -0000 1.15
@@ -417,7 +417,7 @@
if(!ownerSVG)
return;
- ownerSVG->timeScheduler()->addTimer(this, qRound(getStartTime()));
+ ownerSVG->timeScheduler()->addTimer(this, lround(getStartTime()));
}
KDOM::DOMString SVGAnimationElementImpl::targetAttribute() const
1.10 +2 -2 WebCore/ksvg2/svg/SVGLinearGradientElementImpl.cpp
Index: SVGLinearGradientElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGLinearGradientElementImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGLinearGradientElementImpl.cpp 26 Nov 2005 22:19:12 -0000 1.9
+++ SVGLinearGradientElementImpl.cpp 19 Dec 2005 19:52:53 -0000 1.10
@@ -190,8 +190,8 @@
grad->setGradientTransform(mat);
grad->setBoundingBoxMode(bbox);
- grad->setGradientStart(QPoint(qRound(_x1), qRound(_y1)));
- grad->setGradientEnd(QPoint(qRound(_x2), qRound(_y2)));
+ grad->setGradientStart(QPoint(lroundf(_x1), lroundf(_y1)));
+ grad->setGradientEnd(QPoint(lroundf(_x2), lroundf(_y2)));
}
// vim:ts=4:noet
1.16 +1 -1 WebCore/ksvg2/svg/SVGPatternElementImpl.cpp
Index: SVGPatternElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGPatternElementImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SVGPatternElementImpl.cpp 2 Dec 2005 22:44:27 -0000 1.15
+++ SVGPatternElementImpl.cpp 19 Dec 2005 19:52:54 -0000 1.16
@@ -317,7 +317,7 @@
if(!m_paintServer || !m_paintServer->activeClient() || m_ignoreAttributeChanges)
return;
- QSize newSize = QSize(qRound(width()->baseVal()->value()), qRound(height()->baseVal()->value()));
+ QSize newSize = QSize(lroundf(width()->baseVal()->value()), lroundf(height()->baseVal()->value()));
if(m_tile && (m_tile->size() == newSize) || newSize.width() < 1 || newSize.height() < 1)
return;
1.9 +2 -2 WebCore/ksvg2/svg/SVGRadialGradientElementImpl.cpp
Index: SVGRadialGradientElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGRadialGradientElementImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGRadialGradientElementImpl.cpp 26 Nov 2005 22:19:14 -0000 1.8
+++ SVGRadialGradientElementImpl.cpp 19 Dec 2005 19:52:54 -0000 1.9
@@ -215,8 +215,8 @@
grad->setGradientTransform(mat);
grad->setBoundingBoxMode(bbox);
- grad->setGradientCenter(QPoint(qRound(_cx), qRound(_cy)));
- grad->setGradientFocal(QPoint(qRound(_fx), qRound(_fy)));
+ grad->setGradientCenter(QPoint(lroundf(_cx), lroundf(_cy)));
+ grad->setGradientFocal(QPoint(lroundf(_fx), lroundf(_fy)));
grad->setGradientRadius(_r);
}
1.28 +0 -4 WebCore/kwq/KWQCString.h
Index: KWQCString.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQCString.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- KWQCString.h 2 Sep 2005 10:03:19 -0000 1.27
+++ KWQCString.h 19 Dec 2005 19:52:56 -0000 1.28
@@ -60,10 +60,6 @@
QCString &operator+=(const char *s) { return append(s); }
QCString &operator+=(char c) { return append(c); }
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QCString &);
-#endif
-
private:
bool resize(uint);
};
1.20 +0 -10 WebCore/kwq/KWQCString.mm
Index: KWQCString.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQCString.mm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- KWQCString.mm 3 Oct 2005 21:13:01 -0000 1.19
+++ KWQCString.mm 19 Dec 2005 19:52:56 -0000 1.20
@@ -303,13 +303,3 @@
}
return (strcmp(s1, s2) == 0);
}
-
-#ifdef _KWQ_IOSTREAM_
-
-ostream &operator <<(ostream &o, const QCString &s)
-{
- const char *chs = s;
- return o << chs;
-}
-
-#endif
1.25 +0 -15 WebCore/kwq/KWQDateTime.h
Index: KWQDateTime.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQDateTime.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- KWQDateTime.h 5 Jul 2005 08:04:50 -0000 1.24
+++ KWQDateTime.h 19 Dec 2005 19:52:56 -0000 1.25
@@ -29,10 +29,6 @@
#include "KWQDef.h"
#include <CoreFoundation/CFDate.h>
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
class QTime {
public:
QTime() : timeInSeconds(0) { }
@@ -52,9 +48,6 @@
CFAbsoluteTime timeInSeconds;
friend class QDateTime;
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QTime & );
-#endif
};
class QDate {
@@ -67,10 +60,6 @@
int day;
friend class QDateTime;
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QDate & );
-#endif
-
};
class QDateTime {
@@ -86,10 +75,6 @@
private:
CFAbsoluteTime dateInSeconds;
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QDateTime & );
-#endif
};
class KWQUIEventTime {
1.16 +1 -54 WebCore/kwq/KWQDateTime.mm
Index: KWQDateTime.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQDateTime.mm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQDateTime.mm 29 Nov 2005 17:17:31 -0000 1.15
+++ KWQDateTime.mm 19 Dec 2005 19:52:56 -0000 1.16
@@ -24,10 +24,9 @@
*/
#include "config.h"
-#import <Foundation/Foundation.h>
#import "KWQDateTime.h"
+
#import <time.h>
-#import "WebCoreGraphicsBridge.h"
static CFTimeZoneRef systemTimeZone()
{
@@ -102,55 +101,3 @@
inMode:NSEventTrackingRunLoopMode dequeue:NO] != nil;
*/
}
-
-#ifdef _KWQ_IOSTREAM_
-
-std::ostream &operator<<(std::ostream &o, const QDate &date)
-{
- return o <<
- "QDate: [yy/mm/dd: " <<
- date.year <<
- '/' <<
- date.month <<
- '/' <<
- date.day <<
- ']';
-}
-
-std::ostream &operator<<(std::ostream &o, const QTime &time)
-{
- CFGregorianDate g = CFAbsoluteTimeGetGregorianDate(time.timeInSeconds, systemTimeZone());
- return o <<
- "QTime: [hh:mm:ss:ms = " <<
- (int)g.hour <<
- ':' <<
- (int)g.minute <<
- ':' <<
- (int)g.second <<
- ':' <<
- time.msec() <<
- ']';
-}
-
-std::ostream &operator<<(std::ostream &o, const QDateTime &dateTime)
-{
- CFGregorianDate g = CFAbsoluteTimeGetGregorianDate(dateTime.dateInSeconds, systemTimeZone());
- return o <<
- "QDateTime: [yy/mm/dd hh:mm:ss:ms = " <<
- (int)g.year <<
- '/' <<
- (int)g.month <<
- '/' <<
- (int)g.day <<
- ' ' <<
- (int)g.hour <<
- ':' <<
- (int)g.minute <<
- ':' <<
- (int)g.second <<
- ':' <<
- ((int)(g.second * 1000) % 1000) <<
- ']';
-}
-
-#endif // _KWQ_IOSTREAM_
1.19 +1 -12 WebCore/kwq/KWQDef.h
Index: KWQDef.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQDef.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- KWQDef.h 7 Jul 2005 17:06:54 -0000 1.18
+++ KWQDef.h 19 Dec 2005 19:52:57 -0000 1.19
@@ -27,7 +27,6 @@
#define KWQDEF_H_
#include <sys/types.h>
-#include <cmath>
#ifndef KWQ_UNSIGNED_TYPES_DEFINED
#define KWQ_UNSIGNED_TYPES_DEFINED
@@ -35,15 +34,11 @@
typedef unsigned long ulong;
#endif
-typedef int64_t Q_INT64;
-typedef u_int64_t Q_UINT64;
+typedef uint64_t Q_UINT64;
typedef int Q_INT32;
typedef unsigned int Q_UINT32;
-typedef short Q_INT16;
-typedef unsigned short Q_UINT16;
-
template<class T>
inline const T& kMin ( const T& a, const T& b ) { return a < b ? a : b; }
@@ -52,8 +47,6 @@
#define QABS(a) (((a) >= 0) ? (a) : -(a))
-inline int qRound(double a) { return lround(a); }
-
#ifndef TRUE
#define TRUE 1
#endif
@@ -70,8 +63,4 @@
#define Q_ASSERT(arg) do {} while(0)
-#ifndef NDEBUG
-#define _KWQ_IOSTREAM_
-#endif
-
#endif
1.238 +7 -8 WebCore/kwq/KWQKHTMLPart.h
Index: KWQKHTMLPart.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.h,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- KWQKHTMLPart.h 10 Dec 2005 17:14:37 -0000 1.237
+++ KWQKHTMLPart.h 19 Dec 2005 19:52:57 -0000 1.238
@@ -36,17 +36,13 @@
#import <CoreFoundation/CoreFoundation.h>
-#import <JavaScriptCore/jni_jsobject.h>
-#import <JavaScriptCore/npruntime.h>
-#import <JavaScriptCore/NP_jsobject.h>
-#import <JavaScriptCore/runtime.h>
-
#import "KWQDict.h"
#import "KWQClipboard.h"
#import "KWQScrollBar.h"
class KHTMLPartPrivate;
class KWQWindowWidget;
+class NPObject;
namespace DOM {
class DocumentFragmentImpl;
@@ -65,6 +61,10 @@
class SavedProperties;
class SavedBuiltins;
class ScheduledAction;
+ namespace Bindings {
+ class Instance;
+ class RootObject;
+ }
}
#ifdef __OBJC__
@@ -206,8 +206,7 @@
bool shouldClose();
- void KWQKHTMLPart::addMessageToConsole(const QString &message, unsigned int lineNumber, const QString &sourceID);
- using KHTMLPart::xmlDocImpl;
+ void addMessageToConsole(const QString &message, unsigned int lineNumber, const QString &sourceID);
khtml::RenderObject *renderer() const;
void forceLayout();
void forceLayoutWithPageWidthRange(float minPageWidth, float maxPageWidth);
@@ -359,7 +358,7 @@
KJS::Bindings::RootObject *bindingRootObject();
WebScriptObject *windowScriptObject();
- NPObject *KWQKHTMLPart::windowScriptNPObject();
+ NPObject *windowScriptNPObject();
void partClearedInBegin();
1.706 +1 -0 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- KWQKHTMLPart.mm 18 Dec 2005 22:13:20 -0000 1.705
+++ KWQKHTMLPart.mm 19 Dec 2005 19:52:57 -0000 1.706
@@ -81,6 +81,7 @@
#import <JavaScriptCore/runtime.h>
#import <JavaScriptCore/runtime_root.h>
#import <JavaScriptCore/WebScriptObjectPrivate.h>
+#import <JavaScriptCore/NP_jsobject.h>
#if APPLE_CHANGES
#import "KWQAccObjectCache.h"
1.26 +0 -27 WebCore/kwq/KWQMap.h
Index: KWQMap.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQMap.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- KWQMap.h 22 Jan 2003 00:12:35 -0000 1.25
+++ KWQMap.h 19 Dec 2005 19:52:59 -0000 1.26
@@ -30,10 +30,6 @@
#include "KWQMapImpl.h"
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
template <class K, class V> class QMap;
template <class K, class V> class QMapIterator;
template <class K, class V> class QMapConstIterator;
@@ -300,27 +296,4 @@
};
-#ifdef _KWQ_IOSTREAM_
-
-template<class K, class V>
-inline std::ostream &operator<<(std::ostream &stream, const QMap<K,V> &m)
-{
- uint count = m.count();
- stream << "QMap: [size: " << count << "; items: ";
-
- QMapConstIterator<K,V> iter = m.begin();
-
- for (unsigned int i = 0; i < count; i++) {
- stream << "(" << iter.key() << "," << iter.data() << ")";
- if (i + 1 < count) {
- stream << ", ";
- }
- ++iter;
- }
-
- return stream << "]";
-}
-
-#endif
-
#endif
1.28 +0 -23 WebCore/kwq/KWQMemArray.h
Index: KWQMemArray.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQMemArray.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- KWQMemArray.h 2 Sep 2005 10:03:19 -0000 1.27
+++ KWQMemArray.h 19 Dec 2005 19:52:59 -0000 1.28
@@ -29,10 +29,6 @@
#include "KWQDef.h"
#include "KWQArrayImpl.h"
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
template <class T> class QMemArray {
public:
QMemArray() : impl(sizeof(T)) { }
@@ -64,23 +60,4 @@
#define Q3MemArray QMemArray
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QMemArray<T>&a)
-{
- stream << "QMemArray: [size: " << a.size() << "; items: ";
- for (unsigned i = 0; i < a.size(); i++) {
- stream << a[i];
- if (i < a.size() - 1) {
- stream << ", ";
- }
- }
- stream << "]";
-
- return stream;
-}
-
-#endif
-
#endif
1.13 +0 -7 WebCore/kwq/KWQPoint.mm
Index: KWQPoint.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPoint.mm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KWQPoint.mm 3 Oct 2005 21:13:07 -0000 1.12
+++ KWQPoint.mm 19 Dec 2005 19:52:59 -0000 1.13
@@ -70,10 +70,3 @@
{
return QPoint((int)(p.xCoord * s), (int)(p.yCoord * s));
}
-
-#ifdef _KWQ_IOSTREAM_
-std::ostream &operator<<(std::ostream &o, const QPoint &p)
-{
- return o << "QPoint: [x: " << p.x() << "; h: " << p.y() << "]";
-}
-#endif
1.31 +1 -10 WebCore/kwq/KWQPointArray.h
Index: KWQPointArray.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPointArray.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- KWQPointArray.h 4 Dec 2005 11:35:09 -0000 1.30
+++ KWQPointArray.h 19 Dec 2005 19:52:59 -0000 1.31
@@ -28,10 +28,6 @@
#include "KWQDef.h"
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
#include "KWQMemArray.h"
// workaround for <rdar://problem/4294625>
@@ -94,12 +90,7 @@
void point(uint, int *, int *);
void setPoint(uint, int, int);
bool setPoints(int, int, int, int, int, int, int, int, int);
- bool setPoints( int nPoints, const int *points );
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QPoint &);
-#endif
-
+ bool setPoints(int nPoints, const int *points);
};
#endif
1.32 +0 -33 WebCore/kwq/KWQPtrList.h
Index: KWQPtrList.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPtrList.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- KWQPtrList.h 10 Dec 2005 20:34:43 -0000 1.31
+++ KWQPtrList.h 19 Dec 2005 19:52:59 -0000 1.32
@@ -30,10 +30,6 @@
#include "KWQCollection.h"
#include "KWQListImpl.h"
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
template <class T> class QPtrListIterator;
template <class T> class QPtrList : public QPtrCollection {
@@ -114,33 +110,4 @@
#define Q3PtrList QPtrList
#define Q3PtrListIterator QPtrListIterator
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrList<T> &l)
-{
- QPtrListIterator<T> iter(l);
- unsigned count = l.count();
-
- stream << "QPtrList: [size: " << l.count() << "; items: ";
-
- // print first
- if (count != 0) {
- stream << *iter.current();
- ++iter;
- --count;
- }
-
- // print rest
- while (count != 0) {
- stream << ", " << *iter.current();
- ++iter;
- --count;
- }
-
- return stream << "]";
-}
-
-#endif
-
#endif
1.17 +0 -23 WebCore/kwq/KWQPtrStack.h
Index: KWQPtrStack.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPtrStack.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- KWQPtrStack.h 2 Sep 2005 10:03:20 -0000 1.16
+++ KWQPtrStack.h 19 Dec 2005 19:52:59 -0000 1.17
@@ -47,27 +47,4 @@
#define Q3PtrStack QPtrStack
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrStack<T>&s)
-{
- stream << "QPtrStack: [size: " << s.count() << "; items: ";
-
- QPtrStack<T> tmp(s);
-
- while (!tmp.isEmpty()) {
- stream << *tmp.pop();
- if (tmp.count() > 0) {
- stream << ", ";
- }
- }
-
- stream << "]";
-
- return stream;
-}
-
-#endif
-
#endif
1.25 +0 -24 WebCore/kwq/KWQPtrVector.h
Index: KWQPtrVector.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPtrVector.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- KWQPtrVector.h 20 Nov 2004 02:24:08 -0000 1.24
+++ KWQPtrVector.h 19 Dec 2005 19:53:00 -0000 1.25
@@ -31,10 +31,6 @@
#include "KWQVectorImpl.h"
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
class QGVector : public QPtrCollection
{
public:
@@ -71,24 +67,4 @@
KWQVectorImpl impl;
};
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrVector<T> &v)
-{
- uint i = 0;
- uint count = v.count();
-
- stream << "QPtrVector: [size: " << count << "; items: ";
-
- while(i < count ) {
- stream << *v[i] << ", ";
- ++i;
- }
-
- return stream << "]";
-}
-
-#endif
-
#endif
1.35 +0 -4 WebCore/kwq/KWQRect.h
Index: KWQRect.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQRect.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- KWQRect.h 1 Nov 2005 19:04:23 -0000 1.34
+++ KWQRect.h 19 Dec 2005 19:53:00 -0000 1.35
@@ -97,10 +97,6 @@
#endif
operator CGRect() const;
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QRect &);
-#endif
-
private:
int xp;
int yp;
1.18 +0 -7 WebCore/kwq/KWQRect.mm
Index: KWQRect.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQRect.mm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- KWQRect.mm 3 Oct 2005 21:13:08 -0000 1.17
+++ KWQRect.mm 19 Dec 2005 19:53:00 -0000 1.18
@@ -208,10 +208,3 @@
{
return !(a == b);
}
-
-#ifdef _KWQ_IOSTREAM_
-std::ostream &operator<<(std::ostream &o, const QRect &r)
-{
- return o << "QRect: [left: " << r.left () << "; top: " << r.top() << "; right: " << r.right() << "; bottom: " << r.bottom() << "]";
-}
-#endif
1.23 +0 -8 WebCore/kwq/KWQSize.h
Index: KWQSize.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSize.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- KWQSize.h 12 Oct 2005 00:44:53 -0000 1.22
+++ KWQSize.h 19 Dec 2005 19:53:00 -0000 1.23
@@ -28,10 +28,6 @@
#include "KWQDef.h"
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
// workaround for <rdar://problem/4294625>
#if ! __LP64__ && ! NS_BUILD_32_LIKE_64
#undef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
@@ -69,10 +65,6 @@
friend bool operator==(const QSize &, const QSize &);
friend bool operator!=(const QSize &, const QSize &);
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QSize &);
-#endif
-
private:
int w;
int h;
1.12 +0 -7 WebCore/kwq/KWQSize.mm
Index: KWQSize.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSize.mm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KWQSize.mm 3 Oct 2005 21:13:09 -0000 1.11
+++ KWQSize.mm 19 Dec 2005 19:53:00 -0000 1.12
@@ -80,10 +80,3 @@
{
return a.w != b.w || a.h != b.h;
}
-
-#ifdef _KWQ_IOSTREAM_
-std::ostream &operator<<(std::ostream &o, const QSize &s)
-{
- return o << "QSize: [w: " << s.width() << "; h: " << s.height() << "]";
-}
-#endif
1.35 +0 -26 WebCore/kwq/KWQValueList.h
Index: KWQValueList.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQValueList.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- KWQValueList.h 2 Sep 2005 10:03:20 -0000 1.34
+++ KWQValueList.h 19 Dec 2005 19:53:00 -0000 1.35
@@ -29,10 +29,6 @@
#include "KWQDef.h"
#include "KWQValueListImpl.h"
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
template <class T> class QValueList;
template <class T> class QValueListConstIterator;
@@ -149,28 +145,6 @@
return a.impl.isEqual(b.impl, QValueList<T>::nodesEqual);
}
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &o, const QValueList<T>&p)
-{
- o <<
- "QValueList: [size: " <<
- (Q_UINT32)p.count() <<
- "; items: ";
- QValueListConstIterator<T> it = p.begin();
- while (it != p.end()) {
- o << *it;
- if (++it != p.end()) {
- o << ", ";
- }
- }
- o << "]";
- return o;
-}
-
-#endif
-
#define Q3ValueList QValueList
#define Q3ValueListIterator QValueListIterator
#define Q3ValueListConstIterator QValueListConstIterator
1.912 +26 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- ChangeLog 19 Dec 2005 10:38:06 -0000 1.911
+++ ChangeLog 19 Dec 2005 19:53:06 -0000 1.912
@@ -1,3 +1,29 @@
+2005-12-19 Darin Adler <darin at apple.com>
+
+ Reviewed by Geoff Garen and Eric Seidel.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=4923
+ stop using <ostream> in WebCore, eliminating the <cmath> troubles it causes
+
+ * kjs/simple_number.h: Removed many unnecessary includes, including
+ the <cmath> one to work around GCC library header bugs. We may have to
+ add some includes elsewhere for platforms other than OS X, since our
+ prefix header takes care of some things.
+
+ * kxmlcore/AlwaysInline.h: Added. Now clients that don't include
+ simple_number.h can still get the ALWAYS_INLINE macro.
+ * JavaScriptCore.xcodeproj/project.pbxproj: Added AlwaysInline.h.
+
+ * bindings/NP_jsobject.h: Removed a lot of unnecessary includes
+ and removed C-specific stuff from this C++-only header.
+ * bindings/jni/jni_jsobject.h: Removed a lot of unnecessary includes
+ and did some reformatting.
+ * bindings/objc/objc_runtime.h: Removed an unnecessary include.
+ * bindings/runtime.h: Removed some unneeded includes. Reformatted.
+ * bindings/runtime.cpp: Updated to compile with header changes,
+ including a lot of reformatting.
+ * bindings/runtime_object.h: Removed an unnecessary include.
+
2005-12-13 Maciej Stachowiak <mjs at apple.com>
Reviewed by Geoff and Adele
1.29 +4 -0 JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.pbxproj 13 Dec 2005 11:06:03 -0000 1.28
+++ project.pbxproj 19 Dec 2005 19:53:09 -0000 1.29
@@ -186,6 +186,7 @@
932F5BEA0822A1C700736975 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */ = {isa = PBXBuildFile; fileRef = F692A8540255597D01FF60F7 /* create_hash_table */; settings = {ATTRIBUTES = (Private, ); }; };
935F69FE08245057003D1A45 /* dftables.c in Sources */ = {isa = PBXBuildFile; fileRef = 6541720E039E08B90058BFEB /* dftables.c */; };
+ 93AA4F780957251F0084B3A7 /* AlwaysInline.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AA4F770957251F0084B3A7 /* AlwaysInline.h */; settings = {ATTRIBUTES = (Private, ); }; };
93DE3E420868DCAB00B8897C /* grammar.y in Sources */ = {isa = PBXBuildFile; fileRef = 933A3499038AE7C6008635CE /* grammar.y */; };
93E26BCA08B1511900F85226 /* pcre_ord2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */; };
93E26BCE08B1512600F85226 /* pcre_ucp_findchar.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */; };
@@ -383,6 +384,7 @@
9374D3A7038D9D74008635CE /* scope_chain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scope_chain.h; sourceTree = "<group>"; };
9374D3A8038D9D74008635CE /* scope_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope_chain.cpp; sourceTree = "<group>"; };
938772E5038BFE19008635CE /* array_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = array_instance.h; sourceTree = "<group>"; };
+ 93AA4F770957251F0084B3A7 /* AlwaysInline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlwaysInline.h; sourceTree = "<group>"; };
93E26BC908B1511900F85226 /* pcre_ord2utf8.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_ord2utf8.c; path = pcre/pcre_ord2utf8.c; sourceTree = "<group>"; };
93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_ucp_findchar.c; path = pcre/pcre_ucp_findchar.c; sourceTree = "<group>"; };
93E26BD008B1513800F85226 /* pcre_try_flipped.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_try_flipped.c; path = pcre/pcre_try_flipped.c; sourceTree = "<group>"; };
@@ -679,6 +681,7 @@
65E217B808E7EECC0023E5F6 /* Assertions.mm */,
65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
65E217BA08E7EECC0023E5F6 /* FastMalloc.h */,
+ 93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
);
path = kxmlcore;
sourceTree = "<group>";
@@ -848,6 +851,7 @@
65C647B4093EF8D60022C380 /* RefPtr.h in Headers */,
6580F796094070560082C219 /* PassRefPtr.h in Headers */,
657EEBC0094E445E008C9C7B /* HashCountedSet.h in Headers */,
+ 93AA4F780957251F0084B3A7 /* AlwaysInline.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1.8 +9 -13 JavaScriptCore/bindings/NP_jsobject.h
Index: NP_jsobject.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/NP_jsobject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NP_jsobject.h 11 Dec 2005 02:05:31 -0000 1.7
+++ NP_jsobject.h 19 Dec 2005 19:53:10 -0000 1.8
@@ -22,33 +22,29 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _NP_JSOBJECT_H
#define _NP_JSOBJECT_H
#include <JavaScriptCore/npruntime.h>
-#include <JavaScriptCore/runtime.h>
-#include <JavaScriptCore/runtime_object.h>
-#include <JavaScriptCore/runtime_root.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+namespace KJS {
+ class JSObject;
+ namespace Bindings {
+ class RootObject;
+ }
+}
extern NPClass *NPScriptObjectClass;
-typedef struct
+struct JavaScriptObject
{
NPObject object;
KJS::JSObject *imp;
const KJS::Bindings::RootObject *originExecutionContext;
const KJS::Bindings::RootObject *executionContext;
-} JavaScriptObject;
+};
NPObject *_NPN_CreateScriptObject (NPP npp, KJS::JSObject *imp, const KJS::Bindings::RootObject *originExecutionContext, const KJS::Bindings::RootObject *executionContext);
-#ifdef __cplusplus
-}
-#endif
-
#endif
1.24 +40 -37 JavaScriptCore/bindings/runtime.cpp
Index: runtime.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- runtime.cpp 11 Dec 2005 02:05:31 -0000 1.23
+++ runtime.cpp 19 Dec 2005 19:53:10 -0000 1.24
@@ -22,26 +22,24 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#include <value.h>
-#include <interpreter.h>
-#include <runtime_object.h>
-#include <jni_instance.h>
-#include <objc_instance.h>
-#include <c_instance.h>
-#include <NP_jsobject.h>
-#include <jni_jsobject.h>
+#include "config.h"
+#include "runtime.h"
-using namespace KJS;
-using namespace KJS::Bindings;
+#include "JSLock.h"
+#include "NP_jsobject.h"
+#include "c_instance.h"
+#include "jni_instance.h"
+#include "objc_instance.h"
+#include "runtime_object.h"
+namespace KJS { namespace Bindings {
-void MethodList::addMethod (Method *aMethod)
+void MethodList::addMethod(Method *aMethod)
{
Method **_newMethods = new Method *[_length + 1];
if (_length > 0) {
- memcpy (_newMethods, _methods, sizeof(Method *) * _length);
+ memcpy(_newMethods, _methods, sizeof(Method *) * _length);
delete [] _methods;
}
_methods = _newMethods;
@@ -53,9 +51,9 @@
return _length;
}
-Method *MethodList::methodAt (unsigned int index) const
+Method *MethodList::methodAt(unsigned int index) const
{
- assert (index < _length);
+ assert(index < _length);
return _methods[index];
}
@@ -64,7 +62,8 @@
delete [] _methods;
}
-MethodList::MethodList (const MethodList &other) {
+MethodList::MethodList(const MethodList &other)
+{
_length = other._length;
_methods = new Method *[_length];
if (_length > 0)
@@ -81,7 +80,7 @@
_length = other._length;
_methods = new Method *[_length];
if (_length > 0)
- memcpy (_methods, other._methods, sizeof(Method *) * _length);
+ memcpy(_methods, other._methods, sizeof(Method *) * _length);
return *this;
}
@@ -89,32 +88,34 @@
static KJSDidExecuteFunctionPtr _DidExecuteFunction;
-void Instance::setDidExecuteFunction (KJSDidExecuteFunctionPtr func) { _DidExecuteFunction = func; }
-KJSDidExecuteFunctionPtr Instance::didExecuteFunction () { return _DidExecuteFunction; }
+void Instance::setDidExecuteFunction(KJSDidExecuteFunctionPtr func) { _DidExecuteFunction = func; }
+KJSDidExecuteFunctionPtr Instance::didExecuteFunction() { return _DidExecuteFunction; }
-JSValue *Instance::getValueOfField (KJS::ExecState *exec, const Field *aField) const {
- return aField->valueFromInstance (exec, this);
+JSValue *Instance::getValueOfField(ExecState *exec, const Field *aField) const
+{
+ return aField->valueFromInstance(exec, this);
}
-void Instance::setValueOfField (KJS::ExecState *exec, const Field *aField, JSValue *aValue) const {
- aField->setValueToInstance (exec, this, aValue);
+void Instance::setValueOfField(ExecState *exec, const Field *aField, JSValue *aValue) const
+{
+ aField->setValueToInstance(exec, this, aValue);
}
-Instance *Instance::createBindingForLanguageInstance (BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
+Instance *Instance::createBindingForLanguageInstance(BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
{
Instance *newInstance = 0;
switch (language) {
case Instance::JavaLanguage: {
- newInstance = new Bindings::JavaInstance ((jobject)nativeInstance, executionContext);
+ newInstance = new Bindings::JavaInstance((jobject)nativeInstance, executionContext);
break;
}
case Instance::ObjectiveCLanguage: {
- newInstance = new Bindings::ObjcInstance ((struct objc_object *)nativeInstance);
+ newInstance = new Bindings::ObjcInstance((struct objc_object *)nativeInstance);
break;
}
case Instance::CLanguage: {
- newInstance = new Bindings::CInstance ((NPObject *)nativeInstance);
+ newInstance = new Bindings::CInstance((NPObject *)nativeInstance);
break;
}
default:
@@ -122,20 +123,20 @@
}
if (newInstance)
- newInstance->setExecutionContext (executionContext);
+ newInstance->setExecutionContext(executionContext);
return newInstance;
}
-JSObject *Instance::createRuntimeObject (BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
+JSObject *Instance::createRuntimeObject(BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
{
Instance *interfaceObject = Instance::createBindingForLanguageInstance(language, (void *)nativeInstance, executionContext);
JSLock lock;
- return new RuntimeObjectImp(interfaceObject,true);
+ return new RuntimeObjectImp(interfaceObject, true);
}
-void *Instance::createLanguageInstanceForValue (ExecState *exec, BindingLanguage language, JSObject *value, const RootObject *origin, const RootObject *current)
+void *Instance::createLanguageInstanceForValue(ExecState *exec, BindingLanguage language, JSObject *value, const RootObject *origin, const RootObject *current)
{
void *result = 0;
@@ -146,11 +147,11 @@
switch (language) {
case Instance::ObjectiveCLanguage: {
- result = createObjcInstanceForValue (value, origin, current);
+ result = createObjcInstanceForValue(value, origin, current);
break;
}
case Instance::CLanguage: {
- result = _NPN_CreateScriptObject (0, imp, origin, current);
+ result = _NPN_CreateScriptObject(0, imp, origin, current);
break;
}
case Instance::JavaLanguage: {
@@ -165,17 +166,19 @@
return result;
}
-Instance::Instance (const Instance &other)
+Instance::Instance(const Instance &other)
{
- setExecutionContext (other.executionContext());
-};
+ setExecutionContext(other.executionContext());
+}
Instance &Instance::operator=(const Instance &other)
{
if (this == &other)
return *this;
- setExecutionContext (other.executionContext());
+ setExecutionContext(other.executionContext());
return *this;
}
+
+} }
1.35 +34 -33 JavaScriptCore/bindings/runtime.h
Index: runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- runtime.h 11 Dec 2005 02:05:31 -0000 1.34
+++ runtime.h 19 Dec 2005 19:53:10 -0000 1.35
@@ -22,14 +22,17 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _RUNTIME_H_
-#define _RUNTIME_H_
-#include "list.h"
-#include "object.h"
+#ifndef JAVASCRIPTCORE_BINDINGS_RUNTIME_H
+#define JAVASCRIPTCORE_BINDINGS_RUNTIME_H
+
#include "value.h"
namespace KJS {
+
+class Identifier;
+class List;
+
namespace Bindings {
class Instance;
@@ -53,7 +56,7 @@
class Constructor
{
public:
- virtual Parameter *parameterAt(int i) const = 0;
+ virtual Parameter* parameterAt(int i) const = 0;
virtual int numParameters() const = 0;
virtual ~Constructor() {}
@@ -62,36 +65,34 @@
class Field
{
public:
- virtual const char *name() const = 0;
+ virtual const char* name() const = 0;
virtual RuntimeType type() const = 0;
- virtual JSValue *valueFromInstance(ExecState *, const Instance *) const = 0;
- virtual void setValueToInstance(ExecState *, const Instance *, JSValue *) const = 0;
+ virtual JSValue* valueFromInstance(ExecState*, const Instance*) const = 0;
+ virtual void setValueToInstance(ExecState*, const Instance*, JSValue*) const = 0;
virtual ~Field() {}
};
-
class MethodList
{
public:
MethodList() : _methods(0), _length(0) {}
- void addMethod(Method *aMethod);
+ void addMethod(Method*);
unsigned int length() const;
- Method *methodAt(unsigned int index) const;
+ Method* methodAt(unsigned int index) const;
~MethodList();
- MethodList(const MethodList &other);
- MethodList &operator=(const MethodList &other);
+ MethodList(const MethodList&);
+ MethodList& operator=(const MethodList&);
private:
Method **_methods;
unsigned int _length;
};
-
class Method
{
public:
@@ -107,19 +108,19 @@
public:
virtual const char *name() const = 0;
- virtual MethodList methodsNamed(const char *name, Instance *instance) const = 0;
+ virtual MethodList methodsNamed(const char *name, Instance*) const = 0;
virtual Constructor *constructorAt(int i) const = 0;
virtual int numConstructors() const = 0;
- virtual Field *fieldNamed(const char *name, Instance *instance) const = 0;
+ virtual Field *fieldNamed(const char *name, Instance*) const = 0;
- virtual JSValue *fallbackObject(ExecState *, Instance *, const Identifier &) { return jsUndefined(); }
+ virtual JSValue* fallbackObject(ExecState*, Instance*, const Identifier&) { return jsUndefined(); }
virtual ~Class() {}
};
-typedef void (*KJSDidExecuteFunctionPtr)(ExecState *exec, JSObject *rootObject);
+typedef void (*KJSDidExecuteFunctionPtr)(ExecState*, JSObject* rootObject);
class Instance
{
@@ -133,9 +134,9 @@
static void setDidExecuteFunction(KJSDidExecuteFunctionPtr func);
static KJSDidExecuteFunctionPtr didExecuteFunction();
- static Instance *createBindingForLanguageInstance(BindingLanguage language, void *nativeInstance, const RootObject *r = 0);
- static void *createLanguageInstanceForValue(ExecState *exec, BindingLanguage language, JSObject *value, const RootObject *origin, const RootObject *current);
- static JSObject *createRuntimeObject(BindingLanguage language, void *nativeInstance, const RootObject *r = 0);
+ static Instance* createBindingForLanguageInstance(BindingLanguage, void* nativeInstance, const RootObject* = 0);
+ static void* createLanguageInstanceForValue(ExecState*, BindingLanguage, JSObject* value, const RootObject* origin, const RootObject* current);
+ static JSObject* createRuntimeObject(BindingLanguage, void* nativeInstance, const RootObject* = 0);
Instance() : _executionContext(0) {}
@@ -151,18 +152,18 @@
virtual Class *getClass() const = 0;
- virtual JSValue *getValueOfField(ExecState *exec, const Field *aField) const;
- virtual JSValue *getValueOfUndefinedField(ExecState *exec, const Identifier &property, Type hint) const { return jsUndefined(); }
- virtual void setValueOfField(ExecState *exec, const Field *aField, JSValue *aValue) const;
+ virtual JSValue* getValueOfField(ExecState*, const Field*) const;
+ virtual JSValue* getValueOfUndefinedField(ExecState*, const Identifier& property, Type hint) const { return jsUndefined(); }
+ virtual void setValueOfField(ExecState*, const Field*, JSValue*) const;
virtual bool supportsSetValueOfUndefinedField() { return false; }
- virtual void setValueOfUndefinedField(ExecState *exec, const Identifier &property, JSValue *aValue) {}
+ virtual void setValueOfUndefinedField(ExecState*, const Identifier& property, JSValue*) {}
- virtual JSValue *invokeMethod(ExecState *exec, const MethodList &method, const List &args) = 0;
- virtual JSValue *invokeDefaultMethod(ExecState *exec, const List &args) = 0;
+ virtual JSValue* invokeMethod(ExecState*, const MethodList&, const List& args) = 0;
+ virtual JSValue* invokeDefaultMethod(ExecState*, const List& args) = 0;
- virtual JSValue *defaultValue(Type hint) const = 0;
+ virtual JSValue* defaultValue(Type hint) const = 0;
- virtual JSValue *valueOf() const { return jsString(getClass()->name()); }
+ virtual JSValue* valueOf() const { return jsString(getClass()->name()); }
void setExecutionContext(const RootObject *r) { _executionContext = r; }
const RootObject *executionContext() const { return _executionContext; }
@@ -170,19 +171,19 @@
virtual ~Instance() {}
protected:
- const RootObject *_executionContext;
+ const RootObject* _executionContext;
};
class Array
{
public:
- virtual void setValueAt(ExecState *, unsigned index, JSValue *) const = 0;
- virtual JSValue *valueAt(ExecState *, unsigned index) const = 0;
+ virtual void setValueAt(ExecState *, unsigned index, JSValue*) const = 0;
+ virtual JSValue* valueAt(ExecState *, unsigned index) const = 0;
virtual unsigned int getLength() const = 0;
virtual ~Array() {}
};
-const char *signatureForParameters(const List &aList);
+const char *signatureForParameters(const List&);
} // namespace Bindings
1.20 +1 -0 JavaScriptCore/bindings/runtime_object.h
Index: runtime_object.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime_object.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- runtime_object.h 13 Dec 2005 21:24:48 -0000 1.19
+++ runtime_object.h 19 Dec 2005 19:53:10 -0000 1.20
@@ -27,6 +27,7 @@
#define KJS_RUNTIME_OBJECT_H
#include "runtime.h"
+#include "object.h"
namespace KJS {
1.6 +22 -23 JavaScriptCore/bindings/jni/jni_jsobject.h
Index: jni_jsobject.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jni_jsobject.h 11 Dec 2005 02:05:36 -0000 1.5
+++ jni_jsobject.h 19 Dec 2005 19:53:11 -0000 1.6
@@ -22,13 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _JNI_JSOBJECT_H_
-#define _JNI_JSOBJECT_H_
-#include <CoreFoundation/CoreFoundation.h>
+#ifndef JAVASCRIPTCORE_BINDINGS_JNI_JSOBJECT_H
+#define JAVASCRIPTCORE_BINDINGS_JNI_JSOBJECT_H
-#include <JavaScriptCore/interpreter.h>
-#include <JavaScriptCore/object.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <JavaVM/jni.h>
@@ -38,6 +36,10 @@
namespace KJS {
+class List;
+class JSObject;
+class JSValue;
+
namespace Bindings {
class RootObject;
@@ -67,9 +69,6 @@
jvalue result;
};
-
-typedef struct JSObjectCallContext JSObjectCallContext;
-
class JavaJSObject
{
public:
@@ -86,11 +85,11 @@
jstring toString() const;
void finalize() const;
- static jvalue invoke (JSObjectCallContext *context);
+ static jvalue invoke(JSObjectCallContext*);
- jobject convertValueToJObject (JSValue *value) const;
- JSValue *convertJObjectToValue (jobject theObject) const;
- List listFromJArray(jobjectArray jArray) const;
+ jobject convertValueToJObject(JSValue*) const;
+ JSValue* convertJObjectToValue(jobject) const;
+ List listFromJArray(jobjectArray) const;
private:
const RootObject *_root;
@@ -105,17 +104,17 @@
extern "C" {
// Functions called from the Java VM when making calls to the JavaJSObject class.
-jlong KJS_JSCreateNativeJSObject (JNIEnv *env, jclass clazz, jstring jurl, jlong nativeHandle, jboolean ctx);
-void KJS_JSObject_JSFinalize (JNIEnv *env, jclass jsClass, jlong nativeJSObject);
-jobject KJS_JSObject_JSObjectCall (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jstring methodName, jobjectArray args, jboolean ctx);
-jobject KJS_JSObject_JSObjectEval (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jstring jscript, jboolean ctx);
-jobject KJS_JSObject_JSObjectGetMember (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jstring jname, jboolean ctx);
-void KJS_JSObject_JSObjectSetMember (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jstring jname, jobject value, jboolean ctx);
-void KJS_JSObject_JSObjectRemoveMember (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jstring jname, jboolean ctx);
-jobject KJS_JSObject_JSObjectGetSlot (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jint jindex, jboolean ctx);
-void KJS_JSObject_JSObjectSetSlot (JNIEnv *env, jclass jsClass, jlong nativeJSObject, jstring jurl, jint jindex, jobject value, jboolean ctx);
-jstring KJS_JSObject_JSObjectToString (JNIEnv *env, jclass clazz, jlong nativeJSObject);
+jlong KJS_JSCreateNativeJSObject(JNIEnv*, jclass, jstring jurl, jlong nativeHandle, jboolean ctx);
+void KJS_JSObject_JSFinalize(JNIEnv*, jclass, jlong nativeJSObject);
+jobject KJS_JSObject_JSObjectCall(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jstring methodName, jobjectArray args, jboolean ctx);
+jobject KJS_JSObject_JSObjectEval(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jstring jscript, jboolean ctx);
+jobject KJS_JSObject_JSObjectGetMember(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jstring jname, jboolean ctx);
+void KJS_JSObject_JSObjectSetMember(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jstring jname, jobject value, jboolean ctx);
+void KJS_JSObject_JSObjectRemoveMember(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jstring jname, jboolean ctx);
+jobject KJS_JSObject_JSObjectGetSlot(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jint jindex, jboolean ctx);
+void KJS_JSObject_JSObjectSetSlot(JNIEnv*, jclass, jlong nativeJSObject, jstring jurl, jint jindex, jobject value, jboolean ctx);
+jstring KJS_JSObject_JSObjectToString(JNIEnv*, jclass, jlong nativeJSObject);
}
-#endif
\ No newline at end of file
+#endif
1.17 +1 -1 JavaScriptCore/bindings/objc/objc_runtime.h
Index: objc_runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_runtime.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- objc_runtime.h 11 Dec 2005 02:05:39 -0000 1.16
+++ objc_runtime.h 19 Dec 2005 19:53:11 -0000 1.17
@@ -29,7 +29,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include "runtime.h"
-#include "ustring.h"
+#include "object.h"
#include "objc_header.h"
1.22 +2 -21 JavaScriptCore/kjs/simple_number.h
Index: simple_number.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/simple_number.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- simple_number.h 11 Dec 2005 02:05:48 -0000 1.21
+++ simple_number.h 19 Dec 2005 19:53:12 -0000 1.22
@@ -22,27 +22,8 @@
#ifndef KJS_SIMPLE_NUMBER_H
#define KJS_SIMPLE_NUMBER_H
-// We include these headers here because simple_number.h is the most low-level header we have.
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <string.h>
-
-// Workaround for a bug in GCC library headers.
-// We'd prefer to just use math.h.
-#if !WIN32
-#include <cmath>
-using std::isfinite;
-using std::isinf;
-using std::isnan;
-using std::signbit;
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ > 3)
-#define ALWAYS_INLINE __attribute__ ((always_inline))
-#else
-#define ALWAYS_INLINE inline
-#endif
+#include <stdlib.h>
+#include "kxmlcore/AlwaysInline.h"
namespace KJS {
1.1 JavaScriptCore/kxmlcore/AlwaysInline.h
Index: AlwaysInline.h
===================================================================
/*
* This file is part of the KDE libraries
* Copyright (C) 2005 Apple Computer, Inc
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
#ifndef ALWAYS_INLINE
#if defined(__GNUC__) && (__GNUC__ > 3)
#define ALWAYS_INLINE __attribute__ ((__always_inline__))
#else
#define ALWAYS_INLINE inline
#endif
#endif
More information about the webkit-changes
mailing list