[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:27:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f391063e188fdc378168ac46708b1e7f2eba6928
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 5 00:41:21 2003 +0000
Reviewed by Maciej.
- got rid of some framework initialization (working on bug 2959353)
* kjs/identifier.h: Turn Identifier:null into Identifier:null().
* kjs/identifier.cpp: Removed Identifier:null and added Identifier:null().
* kjs/internal.cpp: Made NaN_Bytes and Inf_Bytes const.
* kjs/completion.h: Use Identifier:null() instead of Identifier:null.
* kjs/function.h: Ditto.
* kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
* kjs/nodes.cpp: (FuncExprNode::evaluate): Use Identifier:null() instead of Identifier:null.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e36d7ff..2b4686a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2003-03-04 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - got rid of some framework initialization (working on bug 2959353)
+
+ * kjs/identifier.h: Turn Identifier:null into Identifier:null().
+ * kjs/identifier.cpp: Removed Identifier:null and added Identifier:null().
+
+ * kjs/internal.cpp: Made NaN_Bytes and Inf_Bytes const.
+
+ * kjs/completion.h: Use Identifier:null() instead of Identifier:null.
+ * kjs/function.h: Ditto.
+ * kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
+ * kjs/nodes.cpp: (FuncExprNode::evaluate): Use Identifier:null() instead of Identifier:null.
+
2003-03-02 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index e36d7ff..2b4686a 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-03-04 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - got rid of some framework initialization (working on bug 2959353)
+
+ * kjs/identifier.h: Turn Identifier:null into Identifier:null().
+ * kjs/identifier.cpp: Removed Identifier:null and added Identifier:null().
+
+ * kjs/internal.cpp: Made NaN_Bytes and Inf_Bytes const.
+
+ * kjs/completion.h: Use Identifier:null() instead of Identifier:null.
+ * kjs/function.h: Ditto.
+ * kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
+ * kjs/nodes.cpp: (FuncExprNode::evaluate): Use Identifier:null() instead of Identifier:null.
+
2003-03-02 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
diff --git a/JavaScriptCore/kjs/completion.h b/JavaScriptCore/kjs/completion.h
index 2eeb9f8..23da0b8 100644
--- a/JavaScriptCore/kjs/completion.h
+++ b/JavaScriptCore/kjs/completion.h
@@ -48,7 +48,7 @@ namespace KJS {
class Completion : private Value {
public:
Completion(ComplType c = Normal, const Value& v = Value(),
- const Identifier &t = Identifier::null)
+ const Identifier &t = Identifier::null())
: comp(c), val(v), tar(t) { }
ComplType complType() const { return comp; }
diff --git a/JavaScriptCore/kjs/function.h b/JavaScriptCore/kjs/function.h
index b6d39c2..8279d7a 100644
--- a/JavaScriptCore/kjs/function.h
+++ b/JavaScriptCore/kjs/function.h
@@ -38,7 +38,7 @@ namespace KJS {
friend class Function;
friend class ActivationImp;
public:
- FunctionImp(ExecState *exec, const Identifier &n = Identifier::null);
+ FunctionImp(ExecState *exec, const Identifier &n = Identifier::null());
virtual ~FunctionImp();
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
diff --git a/JavaScriptCore/kjs/function_object.cpp b/JavaScriptCore/kjs/function_object.cpp
index 7e83e65..a981ee9 100644
--- a/JavaScriptCore/kjs/function_object.cpp
+++ b/JavaScriptCore/kjs/function_object.cpp
@@ -236,7 +236,7 @@ Object FunctionObjectImp::construct(ExecState *exec, const List &args)
scopeChain.push(exec->interpreter()->globalObject().imp());
FunctionBodyNode *bodyNode = progNode;
- FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null, bodyNode,
+ FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), bodyNode,
scopeChain);
Object ret(fimp); // protect from GC
diff --git a/JavaScriptCore/kjs/identifier.cpp b/JavaScriptCore/kjs/identifier.cpp
index 4e896a5..ff09e5a 100644
--- a/JavaScriptCore/kjs/identifier.cpp
+++ b/JavaScriptCore/kjs/identifier.cpp
@@ -43,8 +43,6 @@ IdentifierStatisticsExitLogger::~IdentifierStatisticsExitLogger()
#endif
-Identifier Identifier::null;
-
extern const Identifier argumentsPropertyName("arguments");
extern const Identifier calleePropertyName("callee");
extern const Identifier constructorPropertyName("constructor");
@@ -296,4 +294,10 @@ void Identifier::rehash(int newTableSize)
free(oldTable);
}
+const Identifier &Identifier::null()
+{
+ static Identifier null;
+ return null;
+}
+
} // namespace KJS
diff --git a/JavaScriptCore/kjs/identifier.h b/JavaScriptCore/kjs/identifier.h
index 18b2ce0..21695f6 100644
--- a/JavaScriptCore/kjs/identifier.h
+++ b/JavaScriptCore/kjs/identifier.h
@@ -52,7 +52,7 @@ namespace KJS {
uint32_t toUInt32(bool *ok) const { return _ustring.toUInt32(ok); }
double toDouble() const { return _ustring.toDouble(); }
- static Identifier null;
+ static const Identifier &null();
friend bool operator==(const Identifier &, const Identifier &);
friend bool operator!=(const Identifier &, const Identifier &);
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 10b3775..2c5a221 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -56,14 +56,14 @@ using namespace KJS;
namespace KJS {
#ifdef WORDS_BIGENDIAN
- unsigned char NaN_Bytes[] = { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 };
- unsigned char Inf_Bytes[] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 };
+ const unsigned char NaN_Bytes[] = { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 };
+ const unsigned char Inf_Bytes[] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 };
#elif defined(arm)
- unsigned char NaN_Bytes[] = { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 };
- unsigned char Inf_Bytes[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 };
+ const unsigned char NaN_Bytes[] = { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 };
+ const unsigned char Inf_Bytes[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 };
#else
- unsigned char NaN_Bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f };
- unsigned char Inf_Bytes[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
+ const unsigned char NaN_Bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f };
+ const unsigned char Inf_Bytes[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
#endif
const double NaN = *(const double*) NaN_Bytes;
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 11b9f08..7b694f8 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -2833,7 +2833,7 @@ bool FuncExprNode::deref()
// ECMA 13
Value FuncExprNode::evaluate(ExecState *exec)
{
- FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null, body, exec->context().imp()->scopeChain());
+ FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), body, exec->context().imp()->scopeChain());
Value ret(fimp);
List empty;
Value proto = exec->interpreter()->builtinObject().construct(exec,empty);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list