Changeset 25000 in webkit


Ignore:
Timestamp:
Aug 10, 2007, 4:24:24 PM (18 years ago)
Author:
thatcher
Message:

JavaScriptCore:

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.
Location:
trunk
Files:
1 deleted
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r24976 r25000  
     12007-08-10  Timothy Hatcher  <[email protected]>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit
     6
     7        Disable the NPAPI for 64-bit on Mac OS X.
     8
     9        * Configurations/JavaScriptCore.xcconfig: Use the 64-bit export file.
     10        * JavaScriptCore.xcodeproj/project.pbxproj: Create a 64-bit export file
     11        that filters out the NPN fnctions.
     12        * bindings/NP_jsobject.cpp: #ifdef out this for 64-bit on Mac OS X
     13        * bindings/NP_jsobject.h: Ditto.
     14        * bindings/c/c_class.cpp: Ditto.
     15        * bindings/c/c_class.h: Ditto.
     16        * bindings/c/c_instance.cpp: Ditto.
     17        * bindings/c/c_instance.h: Ditto.
     18        * bindings/c/c_runtime.cpp: Ditto.
     19        * bindings/c/c_runtime.h: Ditto.
     20        * bindings/c/c_utility.cpp: Ditto.
     21        * bindings/c/c_utility.h: Ditto.
     22        * bindings/npapi.h: Ditto.
     23        * bindings/npruntime.cpp: Ditto.
     24        * bindings/npruntime.h: Ditto.
     25        * bindings/npruntime_impl.h: Ditto.
     26        * bindings/npruntime_priv.h: Ditto.
     27        * bindings/runtime.cpp:
     28        (KJS::Bindings::Instance::createBindingForLanguageInstance):
     29         don't creat an NPObject on Mac OS X in 64-bit.
     30
    1312007-08-09  Mark Rowe  <[email protected]>
    232

  • trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r20445 r25000  
    11#include "Version.xcconfig"
    2 EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
     2EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
     3EXPORTED_SYMBOLS_FILE_ = JavaScriptCore.exp;
     4EXPORTED_SYMBOLS_FILE_i386 = JavaScriptCore.exp;
     5EXPORTED_SYMBOLS_FILE_ppc = JavaScriptCore.exp;
     6EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp;
     7EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp;
     8FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
    39OTHER_LDFLAGS = -lobjc -sub_library libobjc -Wl,-Y,3;
    410GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;

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

    r24976 r25000  
    13061306                                9319586B09D9F91A00A56FD4 /* Check For Global Initializers */,
    13071307                                932F5BD20822A1C700736975 /* Frameworks */,
     1308                                1C395CBC0C6BCC16000D1E52 /* Generate 64-bit Export File */,
    13081309                        );
    13091310                        buildRules = (
    … …  
    14081409                        shellPath = /bin/sh;
    14091410                        shellScript = "cp \"${SRCROOT}/API/testapi.js\" \"${BUILT_PRODUCTS_DIR}\"";
     1411                };
     1412                1C395CBC0C6BCC16000D1E52 /* Generate 64-bit Export File */ = {
     1413                        isa = PBXShellScriptBuildPhase;
     1414                        buildActionMask = 2147483647;
     1415                        files = (
     1416                        );
     1417                        inputPaths = (
     1418                                "$(SRCROOT)/JavaScriptCore.exp",
     1419                        );
     1420                        name = "Generate 64-bit Export File";
     1421                        outputPaths = (
     1422                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp",
     1423                        );
     1424                        runOnlyForDeploymentPostprocessing = 0;
     1425                        shellPath = /bin/sh;
     1426                        shellScript = "# exclude NPN functions on 64-bit\nsed -e s/^.\\*NPN.\\*$// \"${SRCROOT}/JavaScriptCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp\"\n";
    14101427                };
    14111428                5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */ = {

  • trunk/JavaScriptCore/bindings/NP_jsobject.cpp

    r23526 r25000  
    2525
    2626#include "config.h"
     27
     28#if !PLATFORM(DARWIN) || !defined(__LP64__)
     29
    2730#include "NP_jsobject.h"
    2831
    … …  
    440443    return false;
    441444}
     445
     446#endif

  • trunk/JavaScriptCore/bindings/NP_jsobject.h

    r19183 r25000  
    2727#define NP_JSOBJECT_H
    2828
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
     30
    2931#include "npruntime.h"
    3032#include <wtf/Forward.h>
    … …  
    5153
    5254#endif
     55#endif

  • trunk/JavaScriptCore/bindings/c/c_class.cpp

    r23479 r25000  
    2525
    2626#include "config.h"
     27
     28#if !PLATFORM(DARWIN) || !defined(__LP64__)
     29
    2730#include "c_class.h"
    2831
    … …  
    117120
    118121} } // namespace KJS::Bindings
     122
     123#endif

  • trunk/JavaScriptCore/bindings/c/c_class.h

    r23473 r25000  
    2323 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
     25
     26#if !PLATFORM(DARWIN) || !defined(__LP64__)
    2527
    2628#ifndef BINDINGS_C_CLASS_H_
    … …  
    5658
    5759#endif
     60#endif

  • trunk/JavaScriptCore/bindings/c/c_instance.cpp

    r23512 r25000  
    2525
    2626#include "config.h"
     27
     28#if !PLATFORM(DARWIN) || !defined(__LP64__)
     29
    2730#include "c_instance.h"
    2831
    … …  
    205208}
    206209}
     210
     211#endif

  • trunk/JavaScriptCore/bindings/c/c_instance.h

    r22056 r25000  
    2626#ifndef BINDINGS_C_INSTANCE_H_
    2727#define BINDINGS_C_INSTANCE_H_
     28
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
    2830
    2931#include "runtime.h"
    … …  
    7375
    7476#endif
     77#endif

  • trunk/JavaScriptCore/bindings/c/c_runtime.cpp

    r23512 r25000  
    2525
    2626#include "config.h"
     27
     28#if !PLATFORM(DARWIN) || !defined(__LP64__)
     29
    2730#include "c_runtime.h"
    2831
    … …  
    9093
    9194} }
     95
     96#endif

  • trunk/JavaScriptCore/bindings/c/c_runtime.h

    r23482 r25000  
    2626#ifndef BINDINGS_C_RUNTIME_H_
    2727#define BINDINGS_C_RUNTIME_H_
     28
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
    2830
    2931#include "npruntime.h"
    … …  
    6264
    6365#endif
     66#endif

  • trunk/JavaScriptCore/bindings/c/c_utility.cpp

    r23538 r25000  
    2626
    2727#include "config.h"
     28
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
     30
    2831#include "c_utility.h"
    2932
    … …  
    192195
    193196} }
     197
     198#endif

  • trunk/JavaScriptCore/bindings/c/c_utility.h

    r23512 r25000  
    2626#ifndef C_UTILITY_H_
    2727#define C_UTILITY_H_
     28
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
    2830
    2931#include "npruntime.h"
    … …  
    6870
    6971#endif
     72#endif

  • trunk/JavaScriptCore/bindings/npapi.h

    r20867 r25000  
    9797
    9898#if defined(XP_MACOSX) && defined(__LP64__)
    99     #define NP_NO_QUICKDRAW
     99#error 64-bit Netscape plug-ins are not supported on Mac OS X
    100100#endif
    101101

  • trunk/JavaScriptCore/bindings/npruntime.cpp

    r20004 r25000  
    2525
    2626#include "config.h"
     27
     28#if !PLATFORM(DARWIN) || !defined(__LP64__)
     29
    2730#include "npruntime.h"
    2831#include "npruntime_impl.h"
    … …  
    207210    }
    208211}
     212
     213#endif

  • trunk/JavaScriptCore/bindings/npruntime.h

    r21178 r25000  
    7676#include "npapi.h"
    7777
     78#if defined(XP_MACOSX) && defined(__LP64__)
     79#error 64-bit Netscape plug-ins are not supported on Mac OS X
     80#endif
     81
    7882/*
    7983    This API is used to facilitate binding code written in C to script

  • trunk/JavaScriptCore/bindings/npruntime_impl.h

    r20613 r25000  
    2626#ifndef _NP_RUNTIME_IMPL_H_
    2727#define _NP_RUNTIME_IMPL_H_
     28
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
    2830
    2931#include "npruntime.h"
    … …  
    6062
    6163#endif
     64#endif

  • trunk/JavaScriptCore/bindings/npruntime_priv.h

    r13455 r25000  
    2727#define NP_RUNTIME_PRIV_H_
    2828
     29#if !PLATFORM(DARWIN) || !defined(__LP64__)
     30
    2931#include "npruntime.h"
    3032
    … …  
    3638
    3739#endif
     40#endif
     41

  • trunk/JavaScriptCore/bindings/runtime.cpp

    r23512 r25000  
    9898        }
    9999#endif
     100#if !PLATFORM(DARWIN) || !defined(__LP64__)
    100101        case Instance::CLanguage: {
    101102            newInstance = new Bindings::CInstance((NPObject *)nativeInstance, rootObject);
    102103            break;
    103104        }
     105#endif
    104106#if PLATFORM(QT)
    105107        case Instance::QtLanguage: {

  • trunk/WebCore/ChangeLog

    r24999 r25000  
     12007-08-10  Timothy Hatcher  <[email protected]>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit
     6
     7        Disable NPObject use in 64-bit on Mac OS X.
     8
     9        * Configurations/WebCore.xcconfig: Add a framework search path to the sub-framworks of Carbon.
     10        * WebCore.xcodeproj/project.pbxproj: Filter out the Frame::windowScriptNPObject() symbol in 64-bit.
     11        * bindings/objc/DOM.mm:
     12        (-[DOMElement _NPObject]): Return null in 64-bit.
     13        * config.h: Set WTF_USE_NPOBJECT to 0 in 64-bit Mac OS X.
     14        * page/Frame.cpp:
     15        (WebCore::Frame::cleanupScriptObjects): Add more #if USE(NPOBJECT) blocks where needed.
     16        * page/Frame.h: Ditto.
     17        * page/mac/FrameMac.mm:
     18        (WebCore::Frame::createScriptInstanceForWidget): Ditto.
     19        * page/mac/WebCoreFrameBridge.h: Ditto.
     20        * page/mac/WebCoreFrameBridge.mm: Ditto.
     21
    1222007-08-10  Mitz Pettel  <[email protected]>
    223

  • trunk/WebCore/Configurations/WebCore.xcconfig

    r20445 r25000  
    99GCC_PREFIX_HEADER = WebCorePrefix.h;
    1010GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
     11FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
    1112HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" $(HEADER_SEARCH_PATHS);
    1213INFOPLIST_FILE = Info.plist;

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r24994 r25000  
    1183911839                        runOnlyForDeploymentPostprocessing = 0;
    1184011840                        shellPath = /bin/sh;
    11841                         shellScript = "sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ \"${SRCROOT}/WebCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
     11841                        shellScript = "# corrections for 64-bit\nsed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ -e s/^__ZN7WebCore5Frame20windowScriptNPObjectEv$// \"${SRCROOT}/WebCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
    1184211842                };
    1184311843                5D2F7DA00C6879C600B5B72B /* Update Info.plist with version information */ = {

  • trunk/WebCore/bindings/objc/DOM.mm

    r24415 r25000  
    558558- (void *)_NPObject
    559559{
     560#if USE(NPOBJECT)
    560561    WebCore::Element* element = [self _element];
    561562    if (element->hasTagName(WebCore::HTMLNames::appletTag) || element->hasTagName(WebCore::HTMLNames::embedTag) || element->hasTagName(WebCore::HTMLNames::objectTag))
    562563        return static_cast<WebCore::HTMLPlugInElement*>(element)->getNPObject();
     564#endif
    563565    return 0;
    564566}

  • trunk/WebCore/config.h

    r24291 r25000  
    8484#if PLATFORM(MAC)
    8585#define WTF_USE_JAVASCRIPTCORE_BINDINGS 1
     86#ifdef __LP64__
     87#define WTF_USE_NPOBJECT 0
     88#else
    8689#define WTF_USE_NPOBJECT 1
     90#endif
    8791#endif
    8892

  • trunk/WebCore/page/Frame.cpp

    r24951 r25000  
    11481148}
    11491149
     1150#if USE(NPOBJECT)
    11501151NPObject* Frame::windowScriptNPObject()
    11511152{
    … …  
    11681169    return d->m_windowScriptNPObject;
    11691170}
    1170 
     1171#endif
     1172   
    11711173void Frame::clearScriptProxy()
    11721174{
    … …  
    12081210    }
    12091211
     1212#if USE(NPOBJECT)
    12101213    if (d->m_windowScriptNPObject) {
    12111214        // Call _NPN_DeallocateObject() instead of _NPN_ReleaseObject() so that we don't leak if a plugin fails to release the window
    … …  
    12151218        d->m_windowScriptNPObject = 0;
    12161219    }
     1220#endif
    12171221}
    12181222

  • trunk/WebCore/page/Frame.h

    r24951 r25000  
    205205    WebScriptObject* windowScriptObject();
    206206#endif
     207
     208#if USE(NPOBJECT)
    207209    NPObject* windowScriptNPObject();
     210#endif   
    208211   
    209212    void setDocument(PassRefPtr<Document>);

  • trunk/WebCore/page/mac/FrameMac.mm

    r24415 r25000  
    659659        return 0;
    660660    } else if ([aView respondsToSelector:@selector(createPluginScriptableObject)]) {
     661#if USE(NPOBJECT)
    661662        NPObject* npObject = [aView createPluginScriptableObject];
    662663        if (npObject) {
    … …  
    667668            return instance;
    668669        }
     670#endif
    669671        return 0;
    670672    }

  • trunk/WebCore/page/mac/WebCoreFrameBridge.h

    r24616 r25000  
    2525
    2626#import <Cocoa/Cocoa.h>
    27 #import <JavaScriptCore/npruntime.h>
    2827#import <JavaVM/jni.h>
    2928#import <WebCore/WebCoreKeyboardUIMode.h>
    … …  
    3231#import <WebCore/TextAffinity.h>
    3332#import <WebCore/TextGranularity.h>
     33
     34#if USE(NPOBJECT)
     35#import <JavaScriptCore/npruntime.h>
     36#endif
    3437
    3538namespace WebCore {

  • trunk/WebCore/page/mac/WebCoreFrameBridge.mm

    r24833 r25000  
    8888#import "markup.h"
    8989#import "visible_units.h"
     90#import <OpenScripting/ASRegistry.h>
    9091#import <JavaScriptCore/array_instance.h>
    9192#import <JavaScriptCore/date_object.h>

  • trunk/WebKit/ChangeLog

    r24998 r25000  
     12007-08-10  Timothy Hatcher  <[email protected]>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit
     6
     7        Disable NPObject use in 64-bit on Mac OS X. Also generate the 64-bit export file.
     8
     9        * Configurations/WebKit.xcconfig: Point to the generated 64-bit export file.
     10        * Plugins/WebBasePluginPackage.h:
     11        * Plugins/npfunctions.h: #ifdef out this header in 64-bit on Mac OS X.
     12        * WebKit.LP64.exp: Removed.
     13        * WebKit.xcodeproj/project.pbxproj: Generate the the 64-bit export file.
     14        * WebKitPrefix.h: Define WTF_USE_NPOBJECT.
     15
    1162007-08-10  Anders Carlsson  <[email protected]>
    217

  • trunk/WebKit/Configurations/WebKit.xcconfig

    r23977 r25000  
    44EXPORTED_SYMBOLS_FILE_i386 = WebKit.exp;
    55EXPORTED_SYMBOLS_FILE_ppc = WebKit.exp;
    6 EXPORTED_SYMBOLS_FILE_ppc64 = WebKit.LP64.exp;
    7 EXPORTED_SYMBOLS_FILE_x86_64 = WebKit.LP64.exp;
     6EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
     7EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
    88FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
    99FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);

  • trunk/WebKit/Plugins/WebBasePluginPackage.h

    r15896 r25000  
    2828
    2929#import <WebCore/WebCoreViewFactory.h>
     30
     31#if USE(NPOBJECT)
    3032#import <WebKit/npfunctions.h>
     33#else
     34typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
     35#endif
    3136
    3237@class WebPluginDatabase;

  • trunk/WebKit/Plugins/npfunctions.h

    r20613 r25000  
    44#include <WebKit/npruntime.h>
    55#include <WebKit/npapi.h>
     6
     7#if defined(XP_MACOSX) && defined(__LP64__)
     8#error 64-bit Netscape plug-ins are not supported on Mac OS X
     9#endif
    610
    711#ifdef __cplusplus

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r24976 r25000  
    331331                1CA57D610AED6A470009BDD0 /* WebGraphicsExtras.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = WebGraphicsExtras.c; sourceTree = "<group>"; };
    332332                1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
    333                 1CE502600C4D48E000F0494E /* WebKit.LP64.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = WebKit.LP64.exp; sourceTree = "<group>"; };
    334333                2203984A0922D765009C3FFC /* WebBaseNetscapePluginViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebBaseNetscapePluginViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    335334                224100F2091818D900D2D266 /* WebPluginsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    633632                                1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */,
    634633                                F5F732D202FF4D4F01A80180 /* WebKit.exp */,
    635                                 1CE502600C4D48E000F0494E /* WebKit.LP64.exp */,
    636634                                F5C283730284676D018635CA /* WebKitPrefix.h */,
    637635                                6508A4A7099B375F00BCBF45 /* Default Delegates */,
    … …  
    13021300                                939D054F09DA02D500984996 /* Check For Global Initializers */,
    13031301                                939811270824BF01008DF038 /* Frameworks */,
     1302                                1C395DE20C6BE8E0000D1E52 /* ShellScript */,
    13041303                        );
    13051304                        buildRules = (
    … …  
    13611360
    13621361/* Begin PBXShellScriptBuildPhase section */
     1362                1C395DE20C6BE8E0000D1E52 /* ShellScript */ = {
     1363                        isa = PBXShellScriptBuildPhase;
     1364                        buildActionMask = 2147483647;
     1365                        files = (
     1366                        );
     1367                        inputPaths = (
     1368                                "$(SRCROOT)/WebKit.exp",
     1369                        );
     1370                        outputPaths = (
     1371                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
     1372                        );
     1373                        runOnlyForDeploymentPostprocessing = 0;
     1374                        shellPath = /bin/sh;
     1375                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${SRCROOT}/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
     1376                };
    13631377                1C5BFFFE0BAF8AEA004FF4F5 /* Check Bundle Version */ = {
    13641378                        isa = PBXShellScriptBuildPhase;

  • trunk/WebKit/WebKitPrefix.h

    r24745 r25000  
    6767#include <JavaScriptCore/Platform.h>
    6868
     69#ifdef __LP64__
     70#define WTF_USE_NPOBJECT 0
     71#else
     72#define WTF_USE_NPOBJECT 1
     73#endif
     74
    6975#ifdef __cplusplus
    7076#include <wtf/FastMalloc.h>
Note: See TracChangeset for help on using the changeset viewer.