Changeset 69857 in webkit
- Timestamp:
- Oct 15, 2010 9:30:01 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r69850 r69857 1 2010-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 1 11 2010-10-15 Nikolas Zimmermann <nzimmermann@rim.com> 2 12 -
trunk/WebKit/chromium/WebKit.gyp
r69809 r69857 983 983 }], 984 984 }, 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, but1001 # that name is already used by the fork of this plugin in1002 # 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 }1016 985 ], 1017 986 }], -
trunk/WebKitTools/ChangeLog
r69843 r69857 1 2010-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 1 20 2010-10-15 Adam Barth <abarth@webkit.org> 2 21 -
trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gypi
r69809 r69857 45 45 'chromium/WebViewHost.h', 46 46 ], 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 ],61 47 'conditions': [ 62 48 ['OS=="win"', { -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
r69809 r69857 76 76 getEntryPointsWasCalled = true; 77 77 78 #if defXP_MACOSX78 #if XP_MACOSX 79 79 // Simulate Silverlight's behavior of crashing when NP_GetEntryPoints is called before NP_Initialize. 80 80 if (!initializeWasCalled) … … 112 112 bool forceCarbon = false; 113 113 114 #if defXP_MACOSX114 #if XP_MACOSX 115 115 NPEventModel eventModel; 116 116 … … 159 159 instance->pdata = obj; 160 160 161 #if defXP_MACOSX161 #if XP_MACOSX 162 162 obj->eventModel = eventModel; 163 163 #if !defined(BUILDING_ON_TIGER) … … 199 199 obj->testWindowOpen = TRUE; 200 200 else if (strcasecmp(argn[i], "drawingmodel") == 0) { 201 #if defined(XP_MACOSX)&& !defined(BUILDING_ON_TIGER)201 #if XP_MACOSX && !defined(BUILDING_ON_TIGER) 202 202 const char* value = argv[i]; 203 203 if (strcasecmp(value, "coreanimation") == 0) { … … 235 235 } 236 236 237 #if defXP_MACOSX237 #if XP_MACOSX 238 238 browser->setvalue(instance, NPPVpluginDrawingModel, (void *)drawingModelToUse); 239 239 #if !defined(BUILDING_ON_TIGER) … … 277 277 pluginLog(instance, "NPP_Destroy"); 278 278 279 #if defined(XP_MACOSX)&& !defined(BUILDING_ON_TIGER)279 #if XP_MACOSX && !defined(BUILDING_ON_TIGER) 280 280 if (obj->coreAnimationLayer) 281 281 CFRelease(obj->coreAnimationLayer); … … 401 401 } 402 402 403 #if defXP_MACOSX403 #if XP_MACOSX 404 404 #ifndef NP_NO_CARBON 405 405 static int16_t handleEventCarbon(NPP instance, PluginObject* obj, EventRecord* event) … … 549 549 return 0; 550 550 551 #if defXP_MACOSX551 #if XP_MACOSX 552 552 #ifndef NP_NO_CARBON 553 553 if (obj->eventModel == NPEventModelCarbon) … … 589 589 } 590 590 591 #if defined(XP_MACOSX)&& !defined(BUILDING_ON_TIGER)591 #if XP_MACOSX && !defined(BUILDING_ON_TIGER) 592 592 if (variable == NPPVpluginCoreAnimationLayer) { 593 593 if (!obj->coreAnimationLayer)
Note: See TracChangeset
for help on using the changeset viewer.