<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43009] trunk/WebKit/mac</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/43009">43009</a></dd>
<dt>Author</dt> <dd>kdecker@apple.com</dd>
<dt>Date</dt> <dd>2009-04-29 13:55:39 -0700 (Wed, 29 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Anders Carlson.

        Allow WKN_CheckIfAllowedToLoadURL() to take an optional void* context parameter.
        
        * Plugins/WebNetscapeContainerCheckContextInfo.h:
        * Plugins/WebNetscapeContainerCheckContextInfo.mm:
        (-[WebNetscapeContainerCheckContextInfo initWithCheckRequestID:callbackFunc:context:]):
        (-[WebNetscapeContainerCheckContextInfo callback]):
        (-[WebNetscapeContainerCheckContextInfo context]):
        * Plugins/WebNetscapeContainerCheckPrivate.h:
        * Plugins/WebNetscapeContainerCheckPrivate.mm:
        (browserContainerCheckFuncs):
        * Plugins/WebNetscapePluginView.h:
        * Plugins/WebNetscapePluginView.mm:
        (-[WebNetscapePluginView checkIfAllowedToLoadURL:frame:callbackFunc:context:]):
        (-[WebNetscapePluginView _containerCheckResult:contextInfo:]):
        * Plugins/npapi.mm:
        (WKN_CheckIfAllowedToLoadURL):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckContextInfoh">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckContextInfomm">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckPrivateh">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckPrivatemm">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginViewh">trunk/WebKit/mac/Plugins/WebNetscapePluginView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginViewmm">trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkWebKitmacPluginsnpapimm">trunk/WebKit/mac/Plugins/npapi.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/ChangeLog        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2009-04-29  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Anders Carlson.
+
+        Allow WKN_CheckIfAllowedToLoadURL() to take an optional void* context parameter.
+        
+        * Plugins/WebNetscapeContainerCheckContextInfo.h:
+        * Plugins/WebNetscapeContainerCheckContextInfo.mm:
+        (-[WebNetscapeContainerCheckContextInfo initWithCheckRequestID:callbackFunc:context:]):
+        (-[WebNetscapeContainerCheckContextInfo callback]):
+        (-[WebNetscapeContainerCheckContextInfo context]):
+        * Plugins/WebNetscapeContainerCheckPrivate.h:
+        * Plugins/WebNetscapeContainerCheckPrivate.mm:
+        (browserContainerCheckFuncs):
+        * Plugins/WebNetscapePluginView.h:
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView checkIfAllowedToLoadURL:frame:callbackFunc:context:]):
+        (-[WebNetscapePluginView _containerCheckResult:contextInfo:]):
+        * Plugins/npapi.mm:
+        (WKN_CheckIfAllowedToLoadURL):
+
</ins><span class="cx"> 2009-04-29  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by John Sullivan.
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckContextInfoh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -30,11 +30,13 @@
</span><span class="cx"> 
</span><span class="cx"> @interface WebNetscapeContainerCheckContextInfo : NSObject {
</span><span class="cx">     uint32 _checkRequestID;
</span><del>-    void (*_callback)(NPP npp, uint32, NPBool);
</del><ins>+    void (*_callback)(NPP npp, uint32, NPBool, void *);
+    void *_context;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (id)initWithCheckRequestID:(uint32)checkRequestID callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc;
</del><ins>+- (id)initWithCheckRequestID:(uint32)checkRequestID callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed, void* context))callbackFunc context:(void*)context;
</ins><span class="cx"> - (uint32)checkRequestID;
</span><del>-- (void (*)(NPP npp, uint32, NPBool))callback;
</del><ins>+- (void (*)(NPP npp, uint32, NPBool, void*))callback;
+- (void*)context;
</ins><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckContextInfomm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> @implementation WebNetscapeContainerCheckContextInfo
</span><span class="cx"> 
</span><del>-- (id)initWithCheckRequestID:(uint32)checkRequestID callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc;
</del><ins>+- (id)initWithCheckRequestID:(uint32)checkRequestID callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed, void* context))callbackFunc context:(void*)context
</ins><span class="cx"> {
</span><span class="cx">     self = [super init];
</span><span class="cx">     if (!self)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">     
</span><span class="cx">     _checkRequestID = checkRequestID;
</span><span class="cx">     _callback = callbackFunc;
</span><ins>+    _context = context;
</ins><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -43,9 +44,14 @@
</span><span class="cx">     return _checkRequestID;   
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void (*)(NPP npp, uint32, NPBool))callback
</del><ins>+- (void (*)(NPP npp, uint32, NPBool, void*))callback
</ins><span class="cx"> {
</span><span class="cx">     return _callback;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void*)context
+{
+    return _context;
+}
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -36,11 +36,12 @@
</span><span class="cx"> #endif
</span><span class="cx">     
</span><span class="cx"> #define WKNVBrowserContainerCheckFuncs 1701
</span><ins>+#define WKNVBrowserContainerCheckFuncsVersion 1
</ins><span class="cx"> 
</span><del>-typedef uint32 (*WKN_CheckIfAllowedToLoadURLProcPtr)(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed));
</del><ins>+typedef uint32 (*WKN_CheckIfAllowedToLoadURLProcPtr)(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed, void* context), void* context);
</ins><span class="cx"> typedef void  (*WKN_CancelCheckIfAllowedToLoadURLProcPtr)(NPP npp, uint32);
</span><span class="cx"> 
</span><del>-uint32 WKN_CheckIfAllowedToLoadURL(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed));
</del><ins>+uint32 WKN_CheckIfAllowedToLoadURL(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed, void* context), void* context);
</ins><span class="cx"> void WKN_CancelCheckIfAllowedToLoadURL(NPP npp, uint32);
</span><span class="cx"> 
</span><span class="cx"> typedef struct _WKNBrowserContainerCheckFuncs {
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckPrivatemm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> {
</span><span class="cx">     static WKNBrowserContainerCheckFuncs funcs = {
</span><span class="cx">         sizeof(WKNBrowserContainerCheckFuncs),
</span><del>-        0,
</del><ins>+        WKNVBrowserContainerCheckFuncsVersion,
</ins><span class="cx">         WKN_CheckIfAllowedToLoadURL,
</span><span class="cx">         WKN_CancelCheckIfAllowedToLoadURL
</span><span class="cx">     };
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.h (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.h        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.h        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> - (void)didCallPlugInFunction;
</span><span class="cx"> 
</span><span class="cx"> - (void)handleMouseMoved:(NSEvent *)event;
</span><del>-- (uint32)checkIfAllowedToLoadURL:(const char*) url frame:(const char*) frame callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc;
</del><ins>+- (uint32)checkIfAllowedToLoadURL:(const char*)urlCString frame:(const char*)frameNameCString callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed, void* context))callbackFunc context:(void*)context;
</ins><span class="cx"> - (void)cancelCheckIfAllowedToLoadURL:(uint32)checkID;
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -1213,7 +1213,9 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (uint32)checkIfAllowedToLoadURL:(const char*)urlCString frame:(const char*)frameNameCString callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc
</del><ins>+- (uint32)checkIfAllowedToLoadURL:(const char*)urlCString frame:(const char*)frameNameCString 
+                     callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed, void* context))callbackFunc 
+                           context:(void*)context
</ins><span class="cx"> {
</span><span class="cx">     if (!_containerChecksInProgress) 
</span><span class="cx">         _containerChecksInProgress = [[NSMutableDictionary alloc] init];
</span><span class="lines">@@ -1221,7 +1223,9 @@
</span><span class="cx">     NSString *frameName = frameNameCString ? [NSString stringWithCString:frameNameCString encoding:NSISOLatin1StringEncoding] : nil;
</span><span class="cx">     
</span><span class="cx">     ++_currentContainerCheckRequestID;
</span><del>-    WebNetscapeContainerCheckContextInfo *contextInfo = [[WebNetscapeContainerCheckContextInfo alloc] initWithCheckRequestID:_currentContainerCheckRequestID callbackFunc:callbackFunc];
</del><ins>+    WebNetscapeContainerCheckContextInfo *contextInfo = [[WebNetscapeContainerCheckContextInfo alloc] initWithCheckRequestID:_currentContainerCheckRequestID 
+                                                                                                                callbackFunc:callbackFunc
+                                                                                                                      context:context];
</ins><span class="cx">     
</span><span class="cx">     WebPluginContainerCheck *check = [WebPluginContainerCheck checkWithRequest:[self requestWithURLCString:urlCString]
</span><span class="cx">                                                                         target:frameName
</span><span class="lines">@@ -1240,14 +1244,14 @@
</span><span class="cx"> - (void)_containerCheckResult:(PolicyAction)policy contextInfo:(id)contextInfo
</span><span class="cx"> {
</span><span class="cx">     ASSERT([contextInfo isKindOfClass:[WebNetscapeContainerCheckContextInfo class]]);
</span><del>-    void (*pluginCallback)(NPP npp, uint32, NPBool) = [contextInfo callback];
</del><ins>+    void (*pluginCallback)(NPP npp, uint32, NPBool, void*) = [contextInfo callback];
</ins><span class="cx">     
</span><span class="cx">     if (!pluginCallback) {
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    pluginCallback([self plugin], [contextInfo checkRequestID], (policy == PolicyUse));
</del><ins>+    pluginCallback([self plugin], [contextInfo checkRequestID], (policy == PolicyUse), [contextInfo context]);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)cancelCheckIfAllowedToLoadURL:(uint32)checkID
</span></span></pre></div>
<a id="trunkWebKitmacPluginsnpapimm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/npapi.mm (43008 => 43009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/npapi.mm        2009-04-29 20:43:34 UTC (rev 43008)
+++ trunk/WebKit/mac/Plugins/npapi.mm        2009-04-29 20:55:39 UTC (rev 43009)
</span><span class="lines">@@ -217,9 +217,9 @@
</span><span class="cx">     return [pluginViewForInstance(instance) convertFromX:sourceX andY:sourceY space:sourceSpace toX:destX andY:destY space:destSpace];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-uint32 WKN_CheckIfAllowedToLoadURL(NPP instance, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool))
</del><ins>+uint32 WKN_CheckIfAllowedToLoadURL(NPP instance, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool, void*), void* context)
</ins><span class="cx"> {
</span><del>-    return [pluginViewForInstance(instance) checkIfAllowedToLoadURL:url frame:frame callbackFunc:callbackFunc];
</del><ins>+    return [pluginViewForInstance(instance) checkIfAllowedToLoadURL:url frame:frame callbackFunc:callbackFunc context:context];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WKN_CancelCheckIfAllowedToLoadURL(NPP instance, uint32 checkID)
</span></span></pre>
</div>
</div>

</body>
</html>