Ignore:
Timestamp:
Jul 17, 2006, 5:27:46 PM (19 years ago)
Author:
thatcher
Message:

JavaScriptCore:

Reviewed by Maciej.

<rdar://problem/4634874> WebScriptObject and WebUndefined are no longer defined by WebKit

Moves WebScriptObject and WebUndefined up to WebCore.
This change does create an upwards-dependancy on WebScriptObject existing
in the loaded process, but this code path in JavaScriptCore does not get used
unless it is through WebKit/WebCore. Moving all of the binding code out of
JavaScriptCore might make sense in the future.

  • JavaScriptCore.exp:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • bindings/objc/WebScriptObject.h: Replaced.
  • bindings/objc/WebScriptObject.mm: Removed.
  • bindings/objc/WebScriptObjectPrivate.h: Removed.
  • bindings/objc/objc_class.h:
  • bindings/objc/objc_instance.h:
  • bindings/objc/objc_instance.mm: (ObjcInstance::~ObjcInstance):
  • bindings/objc/objc_runtime.h:
  • bindings/objc/objc_runtime.mm: (convertValueToObjcObject):
  • bindings/objc/objc_utility.mm: (KJS::Bindings::convertValueToObjcValue): (KJS::Bindings::convertObjcValueToValue): (KJS::Bindings::createObjcInstanceForValue):

WebCore:

Reviewed by Maciej.

<rdar://problem/4634874> WebScriptObject and WebUndefined are no longer defined by WebKit

Moves WebScriptObject and WebUndefined to WebCore.

  • WebCore.exp:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/objc/DOM.mm:
  • bindings/objc/DOMCore.h:
  • bindings/objc/DOMInternal.mm:
  • bindings/objc/DOMUtility.mm:
  • bindings/objc/WebScriptObject.mm: Added. (+[WebUndefined allocWithZone:]): (-[WebUndefined initWithCoder:]): (-[WebUndefined encodeWithCoder:]): (-[WebUndefined copyWithZone:]):
  • bindings/objc/WebScriptObjectPrivate.h: Added.
  • bridge/mac/FrameMac.mm:
  • bridge/mac/WebCoreScriptDebugger.mm:

WebKit:

Reviewed by Maciej.

<rdar://problem/4634874> WebScriptObject and WebUndefined are no longer defined by WebKit

Copy WebScriptObject.h from WebCore's private headers, not JavaScriptCore.

  • WebKit.xcodeproj/project.pbxproj:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r15468 r15492  
    7878                14F137590A3A727E00F26F90 /* Context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14F137580A3A727E00F26F90 /* Context.cpp */; };
    7979                14F137830A3A765B00F26F90 /* context.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F137820A3A765B00F26F90 /* context.h */; settings = {ATTRIBUTES = (Private, ); }; };
     80                1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34880A6C421700ABE06E /* WebScriptObject.h */; };
    8081                65400C110A69BAF200509887 /* PropertyNameArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */; };
    8182                65400C120A69BAF200509887 /* PropertyNameArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 65400C100A69BAF200509887 /* PropertyNameArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    165166                932F5B770822A1C700736975 /* runtime_array.h in Headers */ = {isa = PBXBuildFile; fileRef = 7073BE3D0581291E005EE2C9 /* runtime_array.h */; };
    166167                932F5B780822A1C700736975 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 513DF74105C0861F00F89391 /* jni_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    167                 932F5B790822A1C700736975 /* objc_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C4974105C0A5D4006FBFF5 /* objc_runtime.h */; };
    168                 932F5B7A0822A1C700736975 /* objc_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 518CF93605C72271003CF905 /* objc_class.h */; };
    169                 932F5B7B0822A1C700736975 /* objc_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EB0005C85A6300E6DF1B /* objc_instance.h */; };
    170                 932F5B7C0822A1C700736975 /* objc_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC1005C86F3500E6DF1B /* objc_header.h */; };
    171                 932F5B7D0822A1C700736975 /* objc_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC9605C88DC700E6DF1B /* objc_utility.h */; };
     168                932F5B790822A1C700736975 /* objc_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C4974105C0A5D4006FBFF5 /* objc_runtime.h */; settings = {ATTRIBUTES = (Private, ); }; };
     169                932F5B7A0822A1C700736975 /* objc_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 518CF93605C72271003CF905 /* objc_class.h */; settings = {ATTRIBUTES = (Private, ); }; };
     170                932F5B7B0822A1C700736975 /* objc_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EB0005C85A6300E6DF1B /* objc_instance.h */; settings = {ATTRIBUTES = (Private, ); }; };
     171                932F5B7C0822A1C700736975 /* objc_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC1005C86F3500E6DF1B /* objc_header.h */; settings = {ATTRIBUTES = (Private, ); }; };
     172                932F5B7D0822A1C700736975 /* objc_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC9605C88DC700E6DF1B /* objc_utility.h */; settings = {ATTRIBUTES = (Private, ); }; };
    172173                932F5B7F0822A1C700736975 /* runtime_root.h in Headers */ = {isa = PBXBuildFile; fileRef = 5114F47C05E4426200D1BBBD /* runtime_root.h */; settings = {ATTRIBUTES = (Private, ); }; };
    173174                932F5B800822A1C700736975 /* c_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 5182A45705FFCF4B00CBD2F2 /* c_instance.h */; };
    … …  
    178179                932F5B850822A1C700736975 /* npruntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 5199B1BE061B65BC0070C006 /* npruntime.h */; settings = {ATTRIBUTES = (Private, ); }; };
    179180                932F5B880822A1C700736975 /* protect.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C02FBB0637462A003E7EE6 /* protect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    180                 932F5B8A0822A1C700736975 /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 51863F6F065420E800E9E8DD /* WebScriptObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    181                 932F5B8B0822A1C700736975 /* WebScriptObjectPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 700DA117065984CE00747C0B /* WebScriptObjectPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    182181                932F5B8C0822A1C700736975 /* npapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CA3B4F06CC2166005600E3 /* npapi.h */; settings = {ATTRIBUTES = (Private, ); }; };
    183182                932F5B8D0822A1C700736975 /* npruntime_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DFF2C906CC36F6006F1ECC /* npruntime_priv.h */; };
    … …  
    233232                932F5BCA0822A1C700736975 /* c_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5182A53A06012C3000CBD2F2 /* c_class.cpp */; };
    234233                932F5BCB0822A1C700736975 /* npruntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5199B1BD061B65BC0070C006 /* npruntime.cpp */; };
    235                 932F5BCE0822A1C700736975 /* WebScriptObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51863FC406542D3100E9E8DD /* WebScriptObject.mm */; };
    236234                932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517EF37306D695930007C1BA /* jni_objc.mm */; };
    237235                932F5BD30822A1C700736975 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
    … …  
    377375                14F137580A3A727E00F26F90 /* Context.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Context.cpp; sourceTree = "<group>"; };
    378376                14F137820A3A765B00F26F90 /* context.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; };
     377                1CAF34880A6C421700ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.h; sourceTree = "<group>"; };
    379378                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 8; };
    380379                5114F47B05E4426200D1BBBD /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bindings/runtime_root.cpp; sourceTree = "<group>"; tabWidth = 8; };
    … …  
    402401                51856D8F0562EE95008B9D83 /* jni_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_utility.cpp; path = bindings/jni/jni_utility.cpp; sourceTree = "<group>"; tabWidth = 8; };
    403402                51856D900562EE95008B9D83 /* jni_utility.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_utility.h; path = bindings/jni/jni_utility.h; sourceTree = "<group>"; tabWidth = 8; };
    404                 51863F6F065420E800E9E8DD /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.h; sourceTree = "<group>"; tabWidth = 8; };
    405                 51863FC406542D3100E9E8DD /* WebScriptObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebScriptObject.mm; path = bindings/objc/WebScriptObject.mm; sourceTree = "<group>"; tabWidth = 8; };
    406403                518CF93605C72271003CF905 /* objc_class.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_class.h; path = bindings/objc/objc_class.h; sourceTree = "<group>"; tabWidth = 8; };
    407404                518CF93705C72271003CF905 /* objc_class.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_class.mm; path = bindings/objc/objc_class.mm; sourceTree = "<group>"; tabWidth = 8; };
    … …  
    466463                65FB3F4909D11B2400F49DEB /* grammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = grammar.h; sourceTree = "<group>"; };
    467464                65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = regexp_object.lut.h; sourceTree = "<group>"; };
    468                 700DA117065984CE00747C0B /* WebScriptObjectPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObjectPrivate.h; path = bindings/objc/WebScriptObjectPrivate.h; sourceTree = "<group>"; tabWidth = 8; };
    469465                704FD35305697E6D003DBED9 /* bool_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = bool_object.h; sourceTree = "<group>"; tabWidth = 8; };
    470466                704FD44505698F17003DBED9 /* runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime.cpp; path = bindings/runtime.cpp; sourceTree = "<group>"; tabWidth = 8; };
    … …  
    757753                                51F0EC9605C88DC700E6DF1B /* objc_utility.h */,
    758754                                51F0EC9705C88DC700E6DF1B /* objc_utility.mm */,
     755                                1CAF34880A6C421700ABE06E /* WebScriptObject.h */,
    759756                                704FD44505698F17003DBED9 /* runtime.cpp */,
    760757                                511B0870056468730080E486 /* runtime.h */,
    … …  
    767764                                5114F47B05E4426200D1BBBD /* runtime_root.cpp */,
    768765                                5114F47C05E4426200D1BBBD /* runtime_root.h */,
    769                                 51863F6F065420E800E9E8DD /* WebScriptObject.h */,
    770                                 51863FC406542D3100E9E8DD /* WebScriptObject.mm */,
    771                                 700DA117065984CE00747C0B /* WebScriptObjectPrivate.h */,
    772766                        );
    773767                        name = bindings;
    … …  
    10521046                                932F5B850822A1C700736975 /* npruntime.h in Headers */,
    10531047                                932F5B880822A1C700736975 /* protect.h in Headers */,
    1054                                 932F5B8A0822A1C700736975 /* WebScriptObject.h in Headers */,
    1055                                 932F5B8B0822A1C700736975 /* WebScriptObjectPrivate.h in Headers */,
    10561048                                932F5B8C0822A1C700736975 /* npapi.h in Headers */,
    10571049                                932F5B8D0822A1C700736975 /* npruntime_priv.h in Headers */,
    … …  
    11191111                                1440FCE30A51E46B0005F061 /* JSClassRef.h in Headers */,
    11201112                                65400C120A69BAF200509887 /* PropertyNameArray.h in Headers */,
     1113                                1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */,
    11211114                        );
    11221115                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    13711364                                932F5BCA0822A1C700736975 /* c_class.cpp in Sources */,
    13721365                                932F5BCB0822A1C700736975 /* npruntime.cpp in Sources */,
    1373                                 932F5BCE0822A1C700736975 /* WebScriptObject.mm in Sources */,
    13741366                                932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */,
    13751367                                65621E6D089E859700760F35 /* property_slot.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.