[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 ae38b6e209bc15747a74e5c9d70c06485427a60f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 15 18:57:10 2002 +0000

    Flash seems to require a plug-in instance struct to be created. Otherwise, crash
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/npapi.mm b/WebCore/kwq/npapi.mm
index c59a3a6..38055e4 100644
--- a/WebCore/kwq/npapi.mm
+++ b/WebCore/kwq/npapi.mm
@@ -51,13 +51,13 @@ const char* NPN_UserAgent(NPP instance){
 }
 
 void* NPN_MemAlloc(UInt32 size){
-    KWQDebug("NPN_MemAlloc\n");
+    //KWQDebug("NPN_MemAlloc\n");
     return malloc(size);
 
 }
 
 void NPN_MemFree(void* ptr){
-    KWQDebug("NPN_MemFree\n");
+    //KWQDebug("NPN_MemFree\n");
     free(ptr);
 
 }
diff --git a/WebCore/src/kwq/npapi.mm b/WebCore/src/kwq/npapi.mm
index c59a3a6..38055e4 100644
--- a/WebCore/src/kwq/npapi.mm
+++ b/WebCore/src/kwq/npapi.mm
@@ -51,13 +51,13 @@ const char* NPN_UserAgent(NPP instance){
 }
 
 void* NPN_MemAlloc(UInt32 size){
-    KWQDebug("NPN_MemAlloc\n");
+    //KWQDebug("NPN_MemAlloc\n");
     return malloc(size);
 
 }
 
 void NPN_MemFree(void* ptr){
-    KWQDebug("NPN_MemFree\n");
+    //KWQDebug("NPN_MemFree\n");
     free(ptr);
 
 }
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index eda2e5d..e28192f 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -37,7 +37,8 @@ typedef struct _StreamData{
     NPP instance;
     NPWindow window;
     NP_Port nPort;
-    
+    NPP_t instanceStruct;
+
     char **cAttributes, **cValues;
     bool isFlipped, transferred, hidden, stopped;
             
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 04c810e..604500f 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -50,7 +50,8 @@
     uint i;
         
     [super initWithFrame: r];
-    instance = malloc(sizeof(NPP_t));
+    //instance = malloc(sizeof(NPP_t)); // this doesn't work for Flash, so I have create a NPP_t and point to it
+    instance = &instanceStruct;
     instance->ndata = self;
 
     mime = mimeType;
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index eda2e5d..e28192f 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -37,7 +37,8 @@ typedef struct _StreamData{
     NPP instance;
     NPWindow window;
     NP_Port nPort;
-    
+    NPP_t instanceStruct;
+
     char **cAttributes, **cValues;
     bool isFlipped, transferred, hidden, stopped;
             
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 04c810e..604500f 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -50,7 +50,8 @@
     uint i;
         
     [super initWithFrame: r];
-    instance = malloc(sizeof(NPP_t));
+    //instance = malloc(sizeof(NPP_t)); // this doesn't work for Flash, so I have create a NPP_t and point to it
+    instance = &instanceStruct;
     instance->ndata = self;
 
     mime = mimeType;

-- 
WebKit Debian packaging