[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[andersca at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 766b899bb45a0efedb6ebd3d049d85d73fd26231
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 00:09:55 2010 +0000

    NPWindow is now null in the Cocoa event model.
    
    Reviewed by Kevin Decker.
    
    * NetscapeInputMethodPlugin/main.m:
    (handleDraw):
    (NPP_HandleEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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 at 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 at 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);

-- 
WebKit Debian packaging