-
thatcher authored
Reviewed by Adam. <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit Disable the NPAPI for 64-bit on Mac OS X. * Configurations/JavaScriptCore.xcconfig: Use the 64-bit export file. * JavaScriptCore.xcodeproj/project.pbxproj: Create a 64-bit export file that filters out the NPN fnctions. * bindings/NP_jsobject.cpp: #ifdef out this for 64-bit on Mac OS X * bindings/NP_jsobject.h: Ditto. * bindings/c/c_class.cpp: Ditto. * bindings/c/c_class.h: Ditto. * bindings/c/c_instance.cpp: Ditto. * bindings/c/c_instance.h: Ditto. * bindings/c/c_runtime.cpp: Ditto. * bindings/c/c_runtime.h: Ditto. * bindings/c/c_utility.cpp: Ditto. * bindings/c/c_utility.h: Ditto. * bindings/npapi.h: Ditto. * bindings/npruntime.cpp: Ditto. * bindings/npruntime.h: Ditto. * bindings/npruntime_impl.h: Ditto. * bindings/npruntime_priv.h: Ditto. * bindings/runtime.cpp: (KJS::Bindings::Instance::createBindingForLanguageInstance): don't creat an NPObject on Mac OS X in 64-bit. WebCore: Reviewed by Adam. <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit Disable NPObject use in 64-bit on Mac OS X. * Configurations/WebCore.xcconfig: Add a framework search path to the sub-framworks of Carbon. * WebCore.xcodeproj/project.pbxproj: Filter out the Frame::windowScriptNPObject() symbol in 64-bit. * bindings/objc/DOM.mm: (-[DOMElement _NPObject]): Return null in 64-bit. * config.h: Set WTF_USE_NPOBJECT to 0 in 64-bit Mac OS X. * page/Frame.cpp: (WebCore::Frame::cleanupScriptObjects): Add more #if USE(NPOBJECT) blocks where needed. * page/Frame.h: Ditto. * page/mac/FrameMac.mm: (WebCore::Frame::createScriptInstanceForWidget): Ditto. * page/mac/WebCoreFrameBridge.h: Ditto. * page/mac/WebCoreFrameBridge.mm: Ditto. WebKit: Reviewed by Adam. <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit Disable NPObject use in 64-bit on Mac OS X. Also generate the 64-bit export file. * Configurations/WebKit.xcconfig: Point to the generated 64-bit export file. * Plugins/WebBasePluginPackage.h: * Plugins/npfunctions.h: #ifdef out this header in 64-bit on Mac OS X. * WebKit.LP64.exp: Removed. * WebKit.xcodeproj/project.pbxproj: Generate the the 64-bit export file. * WebKitPrefix.h: Define WTF_USE_NPOBJECT. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@25000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
43a079ef