[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 385365713fefa3458ca6e3817c8d76a539ccb74a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 8 20:51:10 2002 +0000

    Plug-ins now rendering
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/WKPluginView.h b/WebCore/kwq/WKPluginView.h
index 1918d9c..29c30bb 100644
--- a/WebCore/kwq/WKPluginView.h
+++ b/WebCore/kwq/WKPluginView.h
@@ -37,6 +37,8 @@ typedef struct EventRecord EventRecord;
     NSString *url, *mime;
     WKPlugin *plugin;
     bool transferred;
+    NPWindow window;
+    NP_Port nPort;
     
     NPP_NewProcPtr NPP_New;
     NPP_DestroyProcPtr NPP_Destroy;
diff --git a/WebCore/kwq/WKPluginView.mm b/WebCore/kwq/WKPluginView.mm
index a81d15f..7a73304 100644
--- a/WebCore/kwq/WKPluginView.mm
+++ b/WebCore/kwq/WKPluginView.mm
@@ -44,8 +44,6 @@
 
 - (void)drawRect:(NSRect)rect {
     NPError npErr;
-    NPWindow window;
-    NP_Port nPort;
     char cMime[200], cURL[800];
     uint16 stype;
     id <WCURICache> cache;
@@ -67,10 +65,6 @@
     window.clipRect.right = (uint16)rect.size.width;
     window.type = NPWindowTypeDrawable;
     
-    SetPort(nPort.port);
-    LineTo((int)rect.size.width, (int)rect.size.height);
-    MoveTo(0,0);
-    
     npErr = NPP_SetWindow(instance, &window);
     KWQDebug("NPP_SetWindow: %d rect.size.height=%d rect.size.width=%d port=%d rect.origin.x=%f rect.origin.y=%f\n", npErr, (int)rect.size.height, (int)rect.size.width, (int)nPort.port, rect.origin.x, rect.origin.y);
     KWQDebug("frame.size.height=%d frame.size.width=%d frame.origin.x=%f frame.origin.y=%f\n", (int)frame.size.height, (int)frame.size.width, frame.origin.x, frame.origin.y);
diff --git a/WebCore/src/kwq/WKPluginView.h b/WebCore/src/kwq/WKPluginView.h
index 1918d9c..29c30bb 100644
--- a/WebCore/src/kwq/WKPluginView.h
+++ b/WebCore/src/kwq/WKPluginView.h
@@ -37,6 +37,8 @@ typedef struct EventRecord EventRecord;
     NSString *url, *mime;
     WKPlugin *plugin;
     bool transferred;
+    NPWindow window;
+    NP_Port nPort;
     
     NPP_NewProcPtr NPP_New;
     NPP_DestroyProcPtr NPP_Destroy;
diff --git a/WebCore/src/kwq/WKPluginView.mm b/WebCore/src/kwq/WKPluginView.mm
index a81d15f..7a73304 100644
--- a/WebCore/src/kwq/WKPluginView.mm
+++ b/WebCore/src/kwq/WKPluginView.mm
@@ -44,8 +44,6 @@
 
 - (void)drawRect:(NSRect)rect {
     NPError npErr;
-    NPWindow window;
-    NP_Port nPort;
     char cMime[200], cURL[800];
     uint16 stype;
     id <WCURICache> cache;
@@ -67,10 +65,6 @@
     window.clipRect.right = (uint16)rect.size.width;
     window.type = NPWindowTypeDrawable;
     
-    SetPort(nPort.port);
-    LineTo((int)rect.size.width, (int)rect.size.height);
-    MoveTo(0,0);
-    
     npErr = NPP_SetWindow(instance, &window);
     KWQDebug("NPP_SetWindow: %d rect.size.height=%d rect.size.width=%d port=%d rect.origin.x=%f rect.origin.y=%f\n", npErr, (int)rect.size.height, (int)rect.size.width, (int)nPort.port, rect.origin.x, rect.origin.y);
     KWQDebug("frame.size.height=%d frame.size.width=%d frame.origin.x=%f frame.origin.y=%f\n", (int)frame.size.height, (int)frame.size.width, frame.origin.x, frame.origin.y);

-- 
WebKit Debian packaging