[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:03:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3cb62605290ae9df08c25ec695c893c39551c9fc
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 5 01:15:57 2002 +0000
2002-04-04 Chris Blumenberg <cblu at apple.com>
* src/kwq/WCPlugin.mm: (-[WCPlugin load]):
* src/kwq/npapi.h:
* src/kwq/npapi.mm: (NPN_GetJavaEnv), (NPN_GetJavaPeer):
Added stubs for NPN_GetJavaEnv and NPN_GetJavaPeer. This fixes a flash crasher.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@969 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a7ac6c4..9b99be0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
2002-04-04 Chris Blumenberg <cblu at apple.com>
+ * src/kwq/WCPlugin.mm: (-[WCPlugin load]):
+ * src/kwq/npapi.h:
+ * src/kwq/npapi.mm: (NPN_GetJavaEnv), (NPN_GetJavaPeer):
+
+ Added stubs for NPN_GetJavaEnv and NPN_GetJavaPeer. This fixes a flash crasher.
+
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
* src/kdelibs/khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a7ac6c4..9b99be0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
2002-04-04 Chris Blumenberg <cblu at apple.com>
+ * src/kwq/WCPlugin.mm: (-[WCPlugin load]):
+ * src/kwq/npapi.h:
+ * src/kwq/npapi.mm: (NPN_GetJavaEnv), (NPN_GetJavaPeer):
+
+ Added stubs for NPN_GetJavaEnv and NPN_GetJavaPeer. This fixes a flash crasher.
+
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
* src/kdelibs/khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a7ac6c4..9b99be0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
2002-04-04 Chris Blumenberg <cblu at apple.com>
+ * src/kwq/WCPlugin.mm: (-[WCPlugin load]):
+ * src/kwq/npapi.h:
+ * src/kwq/npapi.mm: (NPN_GetJavaEnv), (NPN_GetJavaPeer):
+
+ Added stubs for NPN_GetJavaEnv and NPN_GetJavaPeer. This fixes a flash crasher.
+
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
* src/kdelibs/khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
diff --git a/WebCore/kwq/WCPlugin.mm b/WebCore/kwq/WCPlugin.mm
index 39fe253..5beedbe 100644
--- a/WebCore/kwq/WCPlugin.mm
+++ b/WebCore/kwq/WCPlugin.mm
@@ -212,6 +212,9 @@
browserFuncs.invalidaterect = tVectorForFunctionPointer(NPN_InvalidateRect);
browserFuncs.invalidateregion = tVectorForFunctionPointer(NPN_InvalidateRegion);
browserFuncs.forceredraw = tVectorForFunctionPointer(NPN_ForceRedraw);
+ browserFuncs.getJavaEnv = tVectorForFunctionPointer(NPN_GetJavaEnv);
+ browserFuncs.getJavaPeer = tVectorForFunctionPointer(NPN_GetJavaPeer);
+
npErr = pluginMainFunc(&browserFuncs, &pluginFuncs, &NPP_Shutdown);
@@ -254,6 +257,8 @@
browserFuncs.invalidaterect = NPN_InvalidateRect;
browserFuncs.invalidateregion = NPN_InvalidateRegion;
browserFuncs.forceredraw = NPN_ForceRedraw;
+ browserFuncs.getJavaEnv = NPN_GetJavaEnv;
+ browserFuncs.getJavaPeer = NPN_GetJavaPeer;
NPP_Initialize(&browserFuncs);
NPP_GetEntryPoints(&pluginFuncs);
diff --git a/WebCore/kwq/npapi.h b/WebCore/kwq/npapi.h
index af86dc2..513b3a5 100644
--- a/WebCore/kwq/npapi.h
+++ b/WebCore/kwq/npapi.h
@@ -220,8 +220,8 @@ typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* url, const char* window);
typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
-typedef ProcPtr NPN_GetJavaEnvProcPtr;
-typedef ProcPtr NPN_GetJavaPeerProcPtr;
+typedef void* (*NPN_GetJavaEnvProcPtr)(void);
+typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
typedef NPError (*NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
typedef NPError (*NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
@@ -363,6 +363,8 @@ void* NPN_MemAlloc(uint32 size);
void NPN_MemFree(void* ptr);
uint32 NPN_MemFlush(uint32 size);
void NPN_ReloadPlugins(NPBool reloadPages);
+void* NPN_GetJavaEnv(void);
+void* NPN_GetJavaPeer(NPP instance);
NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value);
NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value);
void NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
diff --git a/WebCore/kwq/npapi.mm b/WebCore/kwq/npapi.mm
index d39669c..dd87bae 100644
--- a/WebCore/kwq/npapi.mm
+++ b/WebCore/kwq/npapi.mm
@@ -170,6 +170,16 @@ void NPN_ForceRedraw(NPP instance){
[plugin forceRedraw];
}
+void* NPN_GetJavaEnv(void)
+{
+ return NULL;
+}
+
+void* NPN_GetJavaPeer(NPP instance)
+{
+ return NULL;
+}
+
// function pointer converters
void *functionPointerForTVector(void *tvp) {
diff --git a/WebCore/src/kwq/WCPlugin.mm b/WebCore/src/kwq/WCPlugin.mm
index 39fe253..5beedbe 100644
--- a/WebCore/src/kwq/WCPlugin.mm
+++ b/WebCore/src/kwq/WCPlugin.mm
@@ -212,6 +212,9 @@
browserFuncs.invalidaterect = tVectorForFunctionPointer(NPN_InvalidateRect);
browserFuncs.invalidateregion = tVectorForFunctionPointer(NPN_InvalidateRegion);
browserFuncs.forceredraw = tVectorForFunctionPointer(NPN_ForceRedraw);
+ browserFuncs.getJavaEnv = tVectorForFunctionPointer(NPN_GetJavaEnv);
+ browserFuncs.getJavaPeer = tVectorForFunctionPointer(NPN_GetJavaPeer);
+
npErr = pluginMainFunc(&browserFuncs, &pluginFuncs, &NPP_Shutdown);
@@ -254,6 +257,8 @@
browserFuncs.invalidaterect = NPN_InvalidateRect;
browserFuncs.invalidateregion = NPN_InvalidateRegion;
browserFuncs.forceredraw = NPN_ForceRedraw;
+ browserFuncs.getJavaEnv = NPN_GetJavaEnv;
+ browserFuncs.getJavaPeer = NPN_GetJavaPeer;
NPP_Initialize(&browserFuncs);
NPP_GetEntryPoints(&pluginFuncs);
diff --git a/WebCore/src/kwq/npapi.h b/WebCore/src/kwq/npapi.h
index af86dc2..513b3a5 100644
--- a/WebCore/src/kwq/npapi.h
+++ b/WebCore/src/kwq/npapi.h
@@ -220,8 +220,8 @@ typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* url, const char* window);
typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
-typedef ProcPtr NPN_GetJavaEnvProcPtr;
-typedef ProcPtr NPN_GetJavaPeerProcPtr;
+typedef void* (*NPN_GetJavaEnvProcPtr)(void);
+typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
typedef NPError (*NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
typedef NPError (*NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
@@ -363,6 +363,8 @@ void* NPN_MemAlloc(uint32 size);
void NPN_MemFree(void* ptr);
uint32 NPN_MemFlush(uint32 size);
void NPN_ReloadPlugins(NPBool reloadPages);
+void* NPN_GetJavaEnv(void);
+void* NPN_GetJavaPeer(NPP instance);
NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value);
NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value);
void NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
diff --git a/WebCore/src/kwq/npapi.mm b/WebCore/src/kwq/npapi.mm
index d39669c..dd87bae 100644
--- a/WebCore/src/kwq/npapi.mm
+++ b/WebCore/src/kwq/npapi.mm
@@ -170,6 +170,16 @@ void NPN_ForceRedraw(NPP instance){
[plugin forceRedraw];
}
+void* NPN_GetJavaEnv(void)
+{
+ return NULL;
+}
+
+void* NPN_GetJavaPeer(NPP instance)
+{
+ return NULL;
+}
+
// function pointer converters
void *functionPointerForTVector(void *tvp) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list