JavaScriptCore:
authorggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2006 08:42:21 +0000 (08:42 +0000)
committerggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2006 08:42:21 +0000 (08:42 +0000)
        Reviewed by eric.

        - Fixed build. As it goes without saying, I will not mention that I
        blame Kevin.

        * JavaScriptCore.xcodeproj/project.pbxproj:
        * kjs/JSImmediate.cpp:
        (KJS::JSImmediate::toObject):

JavaScriptGlue:

        Reviewed by eric.

        - Fixed build.

        * UserObjectImp.cpp:
        (UserObjectImp::toPrimitive):
        * UserObjectImp.h:

WebCore:

        Reviewed by eric.

        - Fixed build.

        * bridge/mac/WebCoreFrameBridge.mm:
        * khtml/ecma/kjs_binding.h:
        (KJS::DOMFunction::toPrimitive):
        * khtml/ecma/kjs_dom.cpp:
        (KJS::DOMNode::toPrimitive):
        (KJS::DOMNodeList::toPrimitive):
        * khtml/ecma/kjs_dom.h:
        * khtml/ecma/kjs_window.cpp:
        (KJS::Location::toPrimitive):
        (KJS::Selection::toPrimitive):
        * khtml/ecma/kjs_window.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12729 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/kjs/JSImmediate.cpp
JavaScriptGlue/ChangeLog
JavaScriptGlue/UserObjectImp.cpp
JavaScriptGlue/UserObjectImp.h
WebCore/ChangeLog
WebCore/bridge/mac/WebCoreFrameBridge.mm
WebCore/khtml/ecma/kjs_binding.h
WebCore/khtml/ecma/kjs_dom.cpp
WebCore/khtml/ecma/kjs_dom.h
WebCore/khtml/ecma/kjs_window.cpp
WebCore/khtml/ecma/kjs_window.h

index d816deafacf2ffa588266d1dac659f2bd0ab3fe9..d87a4a987a4aca9ca2a516724a00e09f14a7e58c 100644 (file)
@@ -1,3 +1,14 @@
+2006-02-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by eric.
+        
+        - Fixed build. As it goes without saying, I will not mention that I
+        blame Kevin.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * kjs/JSImmediate.cpp:
+        (KJS::JSImmediate::toObject):
+
 2006-02-09  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by mjs.
index 3b0b66a6e290380e7e59e40d4a63a5999d9c087f..6a6733260fd664e3e65999345e9af4f3af3392a3 100644 (file)
 
 /* Begin PBXBuildFile section */
                14760864099C633800437128 /* JSImmediate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14760863099C633800437128 /* JSImmediate.cpp */; };
-               1483B58A099BC1950016E4F0 /* JSImmediate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1483B589099BC1950016E4F0 /* JSImmediate.h */; };
+               1483B58A099BC1950016E4F0 /* JSImmediate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1483B589099BC1950016E4F0 /* JSImmediate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                148A1627095D16BB00666D0D /* ListRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A1626095D16BB00666D0D /* ListRefPtr.h */; };
-               14ABB36F099C076400E2A24F /* value.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* value.h */; };
-               14ABB455099C2A0F00E2A24F /* JSType.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB454099C2A0F00E2A24F /* JSType.h */; };
+               14ABB36F099C076400E2A24F /* value.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* value.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               14ABB455099C2A0F00E2A24F /* JSType.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB454099C2A0F00E2A24F /* JSType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                652C107F08DA7B1E0020887D /* protected_reference.h in Headers */ = {isa = PBXBuildFile; fileRef = 652C107E08DA7B1E0020887D /* protected_reference.h */; };
                6541BD7208E80A17002CBEE7 /* TCPageMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD6E08E80A17002CBEE7 /* TCPageMap.h */; };
                6541BD7308E80A17002CBEE7 /* TCSpinLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */; };
index d32485089b18c4805ff0d4d82d8c12ab9d1d64e2..ebf77127f95bd095cea8568d45dff04ec81846a0 100644 (file)
@@ -28,7 +28,7 @@ namespace KJS {
 
 JSObject *JSImmediate::toObject(const JSValue *v, ExecState *exec)
 {
-    assert(is(v));
+    assert(isImmediate(v));
     if (v == jsNull())
         return throwError(exec, TypeError, "Null value");
     else if (v == jsUndefined())
index 0920ca77565dc091d8bae155d05e8e23f50a715b..e65fd7d44ac79100bee04372958586a49c2be4d7 100644 (file)
@@ -1,3 +1,13 @@
+2006-02-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by eric.
+
+        - Fixed build.
+
+        * UserObjectImp.cpp:
+        (UserObjectImp::toPrimitive):
+        * UserObjectImp.h:
+
 2006-02-03  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Justin.
index bba8062c0b24a64447d85f8e9d5ddcb73e65ff6c..2d663c8a67aca041acad736ea7915c158f0e362a 100644 (file)
@@ -198,7 +198,7 @@ JSUserObject* UserObjectImp::GetJSUserObject() const
     return fJSUserObject;
 }
 
-JSValue *UserObjectImp::toPrimitive(ExecState *exec, Type preferredType) const
+JSValue *UserObjectImp::toPrimitive(ExecState *exec, JSType preferredType) const
 {
     JSValue *result = jsUndefined();
     JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec), exec);
index f8efe904d4e7a932766010af3bf8e80cf8a630fe..318c18bafc58eb0170d4957af109cfd3f61de2ff 100644 (file)
@@ -50,7 +50,7 @@ public:
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
 
-    JSValue *toPrimitive(ExecState *exec, Type preferredType = UnspecifiedType) const;
+    JSValue *toPrimitive(ExecState *exec, JSType preferredType = UnspecifiedType) const;
     virtual bool toBoolean(ExecState *exec) const;
     virtual double toNumber(ExecState *exec) const;
     virtual UString toString(ExecState *exec) const;
index f2e6abc1e7d1fd531573b8fa9c5894b53b73c735..d820eb8aa39d2f895dc9f9f89d530901f714497b 100644 (file)
@@ -1,3 +1,21 @@
+2006-02-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by eric.
+
+        - Fixed build.
+
+        * bridge/mac/WebCoreFrameBridge.mm:
+        * khtml/ecma/kjs_binding.h:
+        (KJS::DOMFunction::toPrimitive):
+        * khtml/ecma/kjs_dom.cpp:
+        (KJS::DOMNode::toPrimitive):
+        (KJS::DOMNodeList::toPrimitive):
+        * khtml/ecma/kjs_dom.h:
+        * khtml/ecma/kjs_window.cpp:
+        (KJS::Location::toPrimitive):
+        (KJS::Selection::toPrimitive):
+        * khtml/ecma/kjs_window.h:
+
 2006-02-09  Darin Adler  <darin@apple.com>
 
         Reviewed by Hyatt.
index aa11d27477feab014ddce1845100053383cb57e9..99ec69b45505f003394309a35a65f2d9c693905a 100644 (file)
@@ -115,7 +115,7 @@ using KJS::GetterSetterType;
 using KJS::UString;
 using KJS::Identifier;
 using KJS::List;
-using KJS::Type;
+using KJS::JSType;
 using KJS::DateInstance;
 
 using KJS::Bindings::RootObject;
index bc791a563a5a0f9a81899f6ca3e54cb3be96b1e4..b93e3fff79df4a97c6a340caa6d25d431d92f91c 100644 (file)
@@ -57,7 +57,7 @@ namespace KJS {
   public:
     virtual bool implementsCall() const { return true; }
     virtual bool toBoolean(ExecState *) const { return true; }
-    virtual JSValue *toPrimitive(ExecState *exec, Type) const { return jsString(toString(exec)); }
+    virtual JSValue *toPrimitive(ExecState *exec, JSType) const { return jsString(toString(exec)); }
     virtual UString toString(ExecState *) const { return UString("[function]"); }
   };
 
index 1351eb5645d5786c3dd04ceb97f546b3e2a5b9ca..3582da388725f0200453f281078be144a6652faa 100644 (file)
@@ -583,7 +583,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, JSValue *value, int /
   }
 }
 
-JSValue *DOMNode::toPrimitive(ExecState *exec, Type /*preferred*/) const
+JSValue *DOMNode::toPrimitive(ExecState *exec, JSType) const
 {
   if (!m_impl)
     return jsNull();
@@ -715,7 +715,7 @@ DOMNodeList::~DOMNodeList()
   ScriptInterpreter::forgetDOMObject(m_impl.get());
 }
 
-JSValue *DOMNodeList::toPrimitive(ExecState *exec, Type /*preferred*/) const
+JSValue *DOMNodeList::toPrimitive(ExecState *exec, JSType) const
 {
   if (!m_impl)
     return jsNull();
index 70ea8ab2e8a5295fdb91134bf1aa1ec940dbe9f0..5ad9109b58c014aace0235b970f0d3069a8fcea8 100644 (file)
@@ -59,7 +59,7 @@ namespace KJS {
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
 
-    virtual JSValue *toPrimitive(ExecState *exec, Type preferred = UndefinedType) const;
+    virtual JSValue *toPrimitive(ExecState *exec, JSType preferred = UndefinedType) const;
     virtual UString toString(ExecState *exec) const;
     void setListener(ExecState *exec, const DOM::AtomicString &eventType, JSValue *func) const;
     JSValue *getListener(const DOM::AtomicString &eventType) const;
@@ -105,7 +105,7 @@ namespace KJS {
     enum { Length, Item };
     DOM::NodeListImpl *impl() const { return m_impl.get(); }
 
-    virtual JSValue *toPrimitive(ExecState *exec, Type preferred = UndefinedType) const;
+    virtual JSValue *toPrimitive(ExecState *exec, JSType preferred = UndefinedType) const;
 
   private:
     static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
index 219389427055dbfa8266577a34020c0e4e95fcef..d2d69ccb77fd43ec1f632cdc8ecad84438e50fa3 100644 (file)
@@ -2224,7 +2224,7 @@ void Location::put(ExecState *exec, const Identifier &p, JSValue *v, int attr)
   }
 }
 
-JSValue *Location::toPrimitive(ExecState *exec, Type) const
+JSValue *Location::toPrimitive(ExecState *exec, JSType) const
 {
   return jsString(toString(exec));
 }
@@ -2369,7 +2369,7 @@ bool Selection::getOwnPropertySlot(ExecState *exec, const Identifier& propertyNa
   return getStaticPropertySlot<SelectionFunc, Selection, JSObject>(exec, &SelectionTable, this, propertyName, slot);
 }
 
-JSValue *Selection::toPrimitive(ExecState *exec, Type) const
+JSValue *Selection::toPrimitive(ExecState *exec, JSType) const
 {
   return jsString(toString(exec));
 }
index 92da63dfbefb8bb076b654f487a4055c90767f0e..6b8674add14db5769fd7ab84b5cd84263be5d2e7 100644 (file)
@@ -244,7 +244,7 @@ namespace KJS {
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     JSValue *getValueProperty(ExecState *exec, int token) const;
     virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
-    virtual JSValue *toPrimitive(ExecState *exec, Type preferred) const;
+    virtual JSValue *toPrimitive(ExecState *exec, JSType preferred) const;
     virtual UString toString(ExecState*) const;
     enum { Hash, Href, Hostname, Host, Pathname, Port, Protocol, Search, EqualEqual,
            Replace, Reload, ToString, Assign };
@@ -261,7 +261,7 @@ namespace KJS {
   public:
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     JSValue *getValueProperty(ExecState *exec, int token) const;
-    virtual JSValue *toPrimitive(ExecState *exec, Type preferred) const;
+    virtual JSValue *toPrimitive(ExecState *exec, JSType preferred) const;
     virtual UString toString(ExecState*) const;
     enum { AnchorNode, AnchorOffset, FocusNode, FocusOffset, BaseNode, BaseOffset, ExtentNode, ExtentOffset, 
            IsCollapsed, _Type, EqualEqual, Collapse, CollapseToEnd, CollapseToStart, Empty, ToString,