Changeset 69857 in webkit


Ignore:
Timestamp:
Oct 15, 2010 9:30:01 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r69809.
http://trac.webkit.org/changeset/69809
https://bugs.webkit.org/show_bug.cgi?id=47725

Broke chromium mac compile (Requested by japhet on #webkit).

  • WebKit.gyp:

2010-10-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r69809.
http://trac.webkit.org/changeset/69809
https://bugs.webkit.org/show_bug.cgi?id=47725

Broke chromium mac compile (Requested by japhet on #webkit).

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/TestNetscapePlugIn/main.cpp: (NP_GetEntryPoints): (NPP_New): (NPP_Destroy): (NPP_HandleEvent): (NPP_GetValue):
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Removed.
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Removed.
  • DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Removed.
Location:
trunk
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r69850 r69857  
     12010-10-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r69809.
     4        http://trac.webkit.org/changeset/69809
     5        https://bugs.webkit.org/show_bug.cgi?id=47725
     6
     7        Broke chromium mac compile (Requested by japhet on #webkit).
     8
     9        * WebKit.gyp:
     10
    1112010-10-15  Nikolas Zimmermann  <nzimmermann@rim.com>
    212
  • trunk/WebKit/chromium/WebKit.gyp

    r69809 r69857  
    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                 }
    1016985            ],
    1017986        }],
  • trunk/WebKitTools/ChangeLog

    r69843 r69857  
     12010-10-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r69809.
     4        http://trac.webkit.org/changeset/69809
     5        https://bugs.webkit.org/show_bug.cgi?id=47725
     6
     7        Broke chromium mac compile (Requested by japhet on #webkit).
     8
     9        * DumpRenderTree/DumpRenderTree.gypi:
     10        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
     11        (NP_GetEntryPoints):
     12        (NPP_New):
     13        (NPP_Destroy):
     14        (NPP_HandleEvent):
     15        (NPP_GetValue):
     16        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Removed.
     17        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Removed.
     18        * DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Removed.
     19
    1202010-10-15  Adam Barth  <abarth@webkit.org>
    221
  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gypi

    r69809 r69857  
    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         ],
    6147        'conditions': [
    6248            ['OS=="win"', {
  • trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp

    r69809 r69857  
    7676    getEntryPointsWasCalled = true;
    7777
    78 #ifdef XP_MACOSX
     78#if 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 #ifdef XP_MACOSX
     114#if XP_MACOSX
    115115    NPEventModel eventModel;
    116116   
     
    159159    instance->pdata = obj;
    160160
    161 #ifdef XP_MACOSX
     161#if 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 defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
     201#if XP_MACOSX && !defined(BUILDING_ON_TIGER)
    202202            const char* value = argv[i];
    203203            if (strcasecmp(value, "coreanimation") == 0) {
     
    235235    }
    236236
    237 #ifdef XP_MACOSX
     237#if XP_MACOSX
    238238    browser->setvalue(instance, NPPVpluginDrawingModel, (void *)drawingModelToUse);
    239239#if !defined(BUILDING_ON_TIGER)
     
    277277            pluginLog(instance, "NPP_Destroy");
    278278
    279 #if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
     279#if XP_MACOSX && !defined(BUILDING_ON_TIGER)
    280280        if (obj->coreAnimationLayer)
    281281            CFRelease(obj->coreAnimationLayer);
     
    401401}
    402402
    403 #ifdef XP_MACOSX
     403#if XP_MACOSX
    404404#ifndef NP_NO_CARBON
    405405static int16_t handleEventCarbon(NPP instance, PluginObject* obj, EventRecord* event)
     
    549549        return 0;
    550550
    551 #ifdef XP_MACOSX
     551#if XP_MACOSX
    552552#ifndef NP_NO_CARBON
    553553    if (obj->eventModel == NPEventModelCarbon)
     
    589589    }
    590590   
    591 #if defined(XP_MACOSX) && !defined(BUILDING_ON_TIGER)
     591#if XP_MACOSX && !defined(BUILDING_ON_TIGER)
    592592    if (variable == NPPVpluginCoreAnimationLayer) {
    593593        if (!obj->coreAnimationLayer)
Note: See TracChangeset for help on using the changeset viewer.