Changeset 20867 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 12, 2007, 9:32:51 PM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Darin Adler.

​http://bugs.webkit.org/show_bug.cgi?id=13029
rdar://problem/4994849
Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.
This doesn't actually change JavaScriptCore, but that's where npapi.h is.

• bindings/npapi.h: Add headers member to NPStream struct. Also increase NP_VERSION_MINOR to 18. Increasing to >= 17 allows plug-ins to safely detect whether to look for NPStream::headers. Increasing from 17 to 18 reflects presence of NPObject enumeration, which was added in a prior patch, and which has been agreed to constitute version 18 by the plugin-futures list. Also add other missing bits of npapi.h to catch up from 14 to 18. This includes features that are not implemented in WebKit, but those are safely stubbed.

LayoutTests:

Reviewed by Darin Adler.

​http://bugs.webkit.org/show_bug.cgi?id=13029
rdar://problem/4994849
Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.

• http/tests/plugins/npapi-response-headers-expected.txt: Added.
• http/tests/plugins/npapi-response-headers.html: Added.
• http/tests/plugins/resources/load-me-1.txt: Added.
• http/tests/plugins/resources/load-me-2.txt: Added.

WebKit:

Reviewed by Darin Adler.

​http://bugs.webkit.org/show_bug.cgi?id=13029
rdar://problem/4994849
Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.

• Plugins/WebBaseNetscapePluginStream.h: declarations.
• Plugins/WebBaseNetscapePluginStream.mm: main implementation. (-[WebBaseNetscapePluginStream dealloc]): cleanup. (-[WebBaseNetscapePluginStream finalize]): cleanup. (-[WebBaseNetscapePluginStream startStreamResponseURL:expectedContentLength:lastModifiedDate:MIMEType:headers:]): Pass headers along. (-[WebBaseNetscapePluginStream startStreamWithResponse:]): Main work is here. Extract headers from NSHTTPURLResponse object into a byte sequence. See comments here about how it would be nice to have low-level access to the HTTP response. (-[WebBaseNetscapePluginStream _destroyStream]): cleanup.
• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView evaluateJavaScriptPluginRequest:]): Conform to new startStream params. Not applicable here, pass nil.

WebKitTools:

Reviewed by Darin Adler.

​http://bugs.webkit.org/show_bug.cgi?id=13029
rdar://problem/4994849
Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.
Changes in WebKitTools are only for the NPAPI test plugin.

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: main test logic. (pluginInvoke): support null window argument for NPStream creation. (pluginAllocate): initialization. (pluginDeallocate): cleanup. (handleCallback): add second JS callback arg: header dump. (notifyStream): added; hook from NPP_NewStream to record headers.
• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h: declarations.
• DumpRenderTree/TestNetscapePlugIn.subproj/main.c: call new header hook. (NPP_NewStream): call new header hook.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• bindings/npapi.h (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-04-12  Deneb Meketa  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        http://bugs.webkit.org/show_bug.cgi?id=13029
+        rdar://problem/4994849
+        Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.
+        This doesn't actually change JavaScriptCore, but that's where npapi.h is.
+
+        * bindings/npapi.h:
+        Add headers member to NPStream struct.  Also increase NP_VERSION_MINOR to 18.
+        Increasing to >= 17 allows plug-ins to safely detect whether to look for
+        NPStream::headers.  Increasing from 17 to 18 reflects presence of NPObject
+        enumeration, which was added in a prior patch, and which has been agreed to
+        constitute version 18 by the plugin-futures list.  Also add other missing
+        bits of npapi.h to catch up from 14 to 18.  This includes features that are
+        not implemented in WebKit, but those are safely stubbed.
+
 2007-04-10  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1390 +1390 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
@@ -1396 +1395 @@
                         projectDirPath = "";
                         projectRoot = "";
-                        shouldCheckCompatibility = 1;
                         targets = (
                                 932F5BE30822A1C700736975 /* All */,

trunk/JavaScriptCore/bindings/npapi.h

@@ -105 +105 @@
 
 #define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 17
+#define NP_VERSION_MINOR 18
 
 
@@ -188 +188 @@
     uint32       lastmodified;
     void*        notifyData;
+    const char*  headers;      /* Response headers from host.
+                                * Exists only for >= NPVERS_HAS_RESPONSE_HEADERS.
+                                * Used for HTTP only; NULL for non-HTTP.
+                                * Available from NPP_NewStream onwards.
+                                * Plugin should copy this data before storing it.
+                                * Includes HTTP status line and all headers,
+                                * preferably verbatim as received from server,
+                                * headers formatted as in HTTP ("Header: Value"),
+                                * and newlines (\n, NOT \r\n) separating lines.
+                                * Terminated by \n\0 (NOT \n\n\0). */
 } NPStream;
 
@@ -315 +325 @@
 
     /* Get the NPObject for scripting the plugin. */
-    NPPVpluginScriptableNPObject  = 15
+    NPPVpluginScriptableNPObject  = 15,
+
+    /* Get the plugin value (as \0-terminated UTF-8 string data) for
+     * form submission if the plugin is part of a form. Use
+     * NPN_MemAlloc() to allocate memory for the string data.
+     */
+    NPPVformValue = 16    /* Not implemented in WebKit */
 } NPPVariable;
 
@@ -588 +604 @@
 #define NPVERS_68K_HAS_LIVECONNECT    11
 #define NPVERS_HAS_WINDOWLESS       11
+#define NPVERS_HAS_XPCONNECT_SCRIPTING    13  /* Not implemented in WebKit */
+#define NPVERS_HAS_NPRUNTIME_SCRIPTING    14
+#define NPVERS_HAS_FORM_VALUES            15  /* Not implemented in WebKit; see bug 13061 */
+#define NPVERS_HAS_POPUPS_ENABLED_STATE   16  /* Not implemented in WebKit */
+#define NPVERS_HAS_RESPONSE_HEADERS       17
+#define NPVERS_HAS_NPOBJECT_ENUM          18