diff options
Diffstat (limited to 'WebKitExamplePlugins/NetscapeCocoaPlugin')
| -rw-r--r-- | WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | WebKitExamplePlugins/NetscapeCocoaPlugin/main.m | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj b/WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj index 9703a2d..1c78769 100644 --- a/WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj +++ b/WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj @@ -66,9 +66,9 @@ 08FB77AFFE84173DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 1A624E580DCBC7F6006898C8 /* main.m */, 1AAD6A070DD0DC52003985DA /* MenuHandler.h */, 1AAD6A080DD0DC52003985DA /* MenuHandler.m */, - 1A624E580DCBC7F6006898C8 /* main.m */, ); name = Source; sourceTree = "<group>"; @@ -135,8 +135,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1AAD6A090DD0DC52003985DA /* MenuHandler.m in Sources */, 1A624E590DCBC7F6006898C8 /* main.m in Sources */, + 1AAD6A090DD0DC52003985DA /* MenuHandler.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WebKitExamplePlugins/NetscapeCocoaPlugin/main.m b/WebKitExamplePlugins/NetscapeCocoaPlugin/main.m index 1f66ac1..afe29c6 100644 --- a/WebKitExamplePlugins/NetscapeCocoaPlugin/main.m +++ b/WebKitExamplePlugins/NetscapeCocoaPlugin/main.m @@ -194,14 +194,13 @@ void NPP_Print(NPP instance, NPPrint* platformPrint) } -static void handleDraw(PluginObject *obj) +static void handleDraw(PluginObject *obj, NPCocoaEvent *event) { NSGraphicsContext *oldContext = [[NSGraphicsContext currentContext] retain]; - NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithGraphicsPort:((NP_CGContext *)obj->window.window)->context + NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithGraphicsPort:event->data.draw.context flipped:YES]; - [NSGraphicsContext setCurrentContext:context]; NSRect rect = NSMakeRect(0, 0, obj->window.width, obj->window.height); @@ -289,7 +288,6 @@ static void handleMouseEvent(PluginObject *obj, NPCocoaEvent *event) obj->menuHandler = [[MenuHandler alloc] initWithBrowserFuncs:browser instance:obj->npp]; browser->popupcontextmenu(obj->npp, (NPNSMenu *)[obj->menuHandler menu]); - NSLog(@"foo"); } } @@ -328,7 +326,7 @@ int16 NPP_HandleEvent(NPP instance, void* event) return 1; case NPCocoaEventDrawRect: - handleDraw(obj); + handleDraw(obj, cocoaEvent); return 1; case NPCocoaEventKeyDown: |