diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitExamplePlugins | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKitExamplePlugins')
| -rw-r--r-- | WebKitExamplePlugins/ChangeLog | 10 | ||||
| -rw-r--r-- | WebKitExamplePlugins/NetscapeInputMethodPlugin/main.m | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/WebKitExamplePlugins/ChangeLog b/WebKitExamplePlugins/ChangeLog index 5421249..6133243 100644 --- a/WebKitExamplePlugins/ChangeLog +++ b/WebKitExamplePlugins/ChangeLog @@ -1,3 +1,13 @@ +2010-03-02 Anders Carlsson <andersca@apple.com> + + Reviewed by Kevin Decker. + + NPWindow is now null in the Cocoa event model. + + * NetscapeInputMethodPlugin/main.m: + (handleDraw): + (NPP_HandleEvent): + 2009-07-10 Adam Roben <aroben@apple.com> Sort all our Xcode projects diff --git a/WebKitExamplePlugins/NetscapeInputMethodPlugin/main.m b/WebKitExamplePlugins/NetscapeInputMethodPlugin/main.m index ce5df45..0adc21b 100644 --- a/WebKitExamplePlugins/NetscapeInputMethodPlugin/main.m +++ b/WebKitExamplePlugins/NetscapeInputMethodPlugin/main.m @@ -207,11 +207,11 @@ 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]; @@ -356,7 +356,7 @@ int16 NPP_HandleEvent(NPP instance, void* event) switch (cocoaEvent->type) { case NPCocoaEventDrawRect: - handleDraw(obj); + handleDraw(obj, cocoaEvent); return 1; case NPCocoaEventFocusChanged: handleFocusChanged(cocoaEvent, obj); |