Changeset 69809 in webkit


Ignore:
Timestamp:
Oct 14, 2010 3:32:49 PM (14 years ago)
Author:
tony@chromium.org
Message:

2010-10-14 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] compile TestNetscapePlugIn on Chromium mac
​https://bugs.webkit.org/show_bug.cgi?id=47633

  • WebKit.gyp: Add a mac specific target for compiling TestNetscapePlugIn

2010-10-14 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] compile TestNetscapePlugIn on Chromium mac
​https://bugs.webkit.org/show_bug.cgi?id=47633

  • DumpRenderTree/DumpRenderTree.gypi: files to compile
  • DumpRenderTree/TestNetscapePlugIn/main.cpp: Use ifdef because gcc was complaining (NP_GetEntryPoints): (NPP_New): (NPP_Destroy): (NPP_HandleEvent): (NPP_GetValue):
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Added.
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Added.
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Added.
Location:
trunk
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r69724 r69809  
     12010-10-14  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        [chromium] compile TestNetscapePlugIn on Chromium mac
     6        https://bugs.webkit.org/show_bug.cgi?id=47633
     7
     8        * WebKit.gyp:  Add a mac specific target for compiling TestNetscapePlugIn
     9
    1102010-10-13  Kinuko Yasuda  <kinuko@chromium.org>
    211

  • trunk/WebKit/chromium/WebKit.gyp

    r69673 r69809  
    983983                    }],
    984984                },
     985                {
     986                    'target_name': 'TestNetscapePlugIn',
     987                    'type': 'loadable_module',
     988                    'sources': [ '<@(test_plugin_files)' ],
     989                    'dependencies': [
     990                        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
     991                    ],
     992                    'include_dirs': [
     993                        '.',
     994                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
     995                        '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
     996                    ],
     997
     998                    # Mac specific stuff.
     999                    'mac_bundle': 1,
     1000                    # It would be nice to name this TestNetscapePlugIn, but
     1001                    # that name is already used by the fork of this plugin in
     1002                    # Chromium.
     1003                    'product_name': 'WebKitTestNetscapePlugIn',
     1004                    'product_extension': 'plugin',
     1005                    'link_settings': {
     1006                        'libraries': [
     1007                            '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
     1008                            '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
     1009                            '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
     1010                        ]
     1011                    },
     1012                    'xcode_settings': {
     1013                        'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
     1014                    }
     1015                }
    9851016            ],
    9861017        }],

  • trunk/WebKitTools/ChangeLog

    r69806 r69809  
     12010-10-14  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        [chromium] compile TestNetscapePlugIn on Chromium mac
     6        https://bugs.webkit.org/show_bug.cgi?id=47633
     7
     8        * DumpRenderTree/DumpRenderTree.gypi: files to compile
     9        * DumpRenderTree/TestNetscapePlugIn/main.cpp: Use ifdef because gcc was complaining
     10        (NP_GetEntryPoints):
     11        (NPP_New):
     12        (NPP_Destroy):
     13        (NPP_HandleEvent):
     14        (NPP_GetValue):
     15        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Added.
     16        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Added.
     17        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Added.
     18
    1192010-10-14  Victor Wang  <victorw@chromium.org>
    220

  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gypi

    r67809 r69809  
    4545            'chromium/WebViewHost.h',
    4646        ],
     47        'test_plugin_files': [
     48            'TestNetscapePlugIn/PluginObject.cpp',
     49            'TestNetscapePlugIn/PluginObject.h',
     50            'TestNetscapePlugIn/PluginObjectMac.mm',
     51            'TestNetscapePlugIn/PluginTest.cpp',
     52            'TestNetscapePlugIn/PluginTest.h',
     53            'TestNetscapePlugIn/TestObject.cpp',
     54            'TestNetscapePlugIn/TestObject.h',
     55            'TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp',
     56            'TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp',
     57            'TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp',
     58            'TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp',
     59            'TestNetscapePlugIn/main.cpp',
     60        ],
    4761        'conditions': [
    4862            ['OS=="win"', {

  • trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp

    r68630 r69809  
    7676    getEntryPointsWasCalled = true;
    7777
    78 #if XP_MACOSX
     78#ifdef XP_MACOSX
    7979    // Simulate Silverlight's behavior of crashing when NP_GetEntryPoints is called before NP_Initialize.
    8080    if (!initializeWasCalled)
    … …  
    112112    bool forceCarbon = false;
    113113
    114 #if XP_MACOSX
     114#ifdef XP_MACOSX
    115115    NPEventModel eventModel;
    116116   
    … …  
    159159    instance->pdata = obj;
    160160
    161 #if XP_MACOSX
     161#ifdef XP_MACOSX
    162162    obj->eventModel = eventModel;
    163163#if !defined(BUILDING_ON_TIGER)
    … …  
    199199            obj->testWindowOpen = TRUE;
    200200        else if (strcasecmp(argn[i], "drawingmodel") == 0) {
    201 #if XP_MACOSX && !defined(BUILDING_ON_TIGER)
     201#if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
    202202            const char* value = argv[i];
    203203            if (strcasecmp(value, "coreanimation") == 0) {
    … …  
    235235    }
    236236
    237 #if XP_MACOSX
     237#ifdef XP_MACOSX
    238238    browser->setvalue(instance, NPPVpluginDrawingModel, (void *)drawingModelToUse);
    239239#if !defined(BUILDING_ON_TIGER)
    … …  
    277277            pluginLog(instance, "NPP_Destroy");
    278278
    279 #if XP_MACOSX && !defined(BUILDING_ON_TIGER)
     279#if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
    280280        if (obj->coreAnimationLayer)
    281281            CFRelease(obj->coreAnimationLayer);
    … …  
    401401}
    402402
    403 #if XP_MACOSX
     403#ifdef XP_MACOSX
    404404#ifndef NP_NO_CARBON
    405405static int16_t handleEventCarbon(NPP instance, PluginObject* obj, EventRecord* event)
    … …  
    549549        return 0;
    550550
    551 #if XP_MACOSX
     551#ifdef XP_MACOSX
    552552#ifndef NP_NO_CARBON
    553553    if (obj->eventModel == NPEventModelCarbon)
    … …  
    589589    }
    590590   
    591 #if XP_MACOSX && !defined(BUILDING_ON_TIGER)
     591#if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
    592592    if (variable == NPPVpluginCoreAnimationLayer) {
    593593        if (!obj->coreAnimationLayer)
Note: See TracChangeset for help on using the changeset viewer.