<!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>[42782] trunk/WebKit</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/42782">42782</a></dd>
<dt>Author</dt> <dd>kdecker@apple.com</dd>
<dt>Date</dt> <dd>2009-04-23 11:06:06 -0700 (Thu, 23 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Anders Carlsson.
        
        First part of &lt;rdar://problem/6352982&gt;

        * Plugins/WebBaseNetscapePluginView.h: Imported #WebNetscapeContainerCheckPrivate.h; Added two new method:
        checkIfAllowedToLoadURL:url:frame:callbackFunc: and cancelCheckIfAllowedToLoadURL:
        * Plugins/WebBaseNetscapePluginView.mm:
        (-[WebBaseNetscapePluginView checkIfAllowedToLoadURL:frame:callbackFunc:]): Added skeleton method, does nothing interesting
        yet.
        (-[WebBaseNetscapePluginView cancelCheckIfAllowedToLoadURL:]): Likewise.
        * Plugins/WebNetscapeContainerCheckPrivate.h: Added.
        * Plugins/WebNetscapeContainerCheckPrivate.mm: Added.
        (browserContainerCheckFuncs): Added. 
        * Plugins/WebNetscapePluginView.h: Imported #WebNetscapeContainerCheckPrivate.h;
        * Plugins/WebNetscapePluginView.mm: Imported #WebNetscapeContainerCheckPrivate.h; added WKN_CheckIfAllowedToLoadURL
        and WKN_CancelCheckIfAllowedToLoadURL functions.
        (-[WebNetscapePluginView getVariable:value:]): Return vtable for container check functions.
        * Plugins/npapi.mm:
        (WKN_CheckIfAllowedToLoadURL): Added new private function.
        (WKN_CancelCheckIfAllowedToLoadURL): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitWebKitxcodeprojprojectpbxproj">trunk/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacPluginsWebBaseNetscapePluginViewh">trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebBaseNetscapePluginViewmm">trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.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>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckPrivateh">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapeContainerCheckPrivatemm">trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/ChangeLog        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2009-04-23  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Anders Carlsson.
+
+        * WebKit.xcodeproj/project.pbxproj: Added WebNetscapeContainerCheckPrivate.mm and header to the project.
+
</ins><span class="cx"> 2009-04-21  Adam Roben  &lt;aroben@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update StringsNotToBeLocalized.txt for recent changes
</span></span></pre></div>
<a id="trunkWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebKit.xcodeproj/project.pbxproj (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebKit.xcodeproj/project.pbxproj        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/WebKit.xcodeproj/project.pbxproj        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx">                 065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */; };
</span><span class="cx">                 06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 06693DDA0BFBA85200216072 /* WebInspectorClient.h */; };
</span><span class="cx">                 06693DDD0BFBA85200216072 /* WebInspectorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */; };
</span><ins>+                0AEBFF630F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */; };
+                0AEBFF640F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */; };
</ins><span class="cx">                 14D8252F0AF955090004F057 /* WebChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D8252D0AF955090004F057 /* WebChromeClient.h */; };
</span><span class="cx">                 14D825300AF955090004F057 /* WebChromeClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14D8252E0AF955090004F057 /* WebChromeClient.mm */; };
</span><span class="cx">                 1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A20D08A0ED384F20043FA9F /* QuartzCore.framework */; };
</span><span class="lines">@@ -325,6 +327,8 @@
</span><span class="cx">                 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 06693DDA0BFBA85200216072 /* WebInspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspectorClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorClient.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = WebNetscapeContainerCheckPrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
+                0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapeContainerCheckPrivate.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A20D08A0ED384F20043FA9F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = &quot;&lt;absolute&gt;&quot;; };
</span><span class="lines">@@ -974,6 +978,8 @@
</span><span class="cx">                                 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */,
</span><span class="cx">                                 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */,
</span><span class="cx">                                 F5F717230288493C018635CA /* npapi.mm */,
</span><ins>+                                0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */,
+                                0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */,
</ins><span class="cx">                         );
</span><span class="cx">                         name = &quot;Netscape Plug-ins&quot;;
</span><span class="cx">                         sourceTree = &quot;&lt;group&gt;&quot;;
</span><span class="lines">@@ -1402,6 +1408,7 @@
</span><span class="cx">                                 FEF52DFB0F6748F200FF70EE /* WebGeolocationInternal.h in Headers */,
</span><span class="cx">                                 FEF52DFC0F6748F200FF70EE /* WebGeolocationPrivate.h in Headers */,
</span><span class="cx">                                 AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */,
</span><ins>+                                0AEBFF630F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h in Headers */,
</ins><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span><span class="lines">@@ -1710,6 +1717,7 @@
</span><span class="cx">                                 1A2DBEA00F251E3A0036F8A6 /* ProxyInstance.mm in Sources */,
</span><span class="cx">                                 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */,
</span><span class="cx">                                 FEF52DFA0F6748F200FF70EE /* WebGeolocation.mm in Sources */,
</span><ins>+                                0AEBFF640F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm in Sources */,
</ins><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/ChangeLog        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2009-04-23  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Anders Carlsson.
+        
+        First part of &lt;rdar://problem/6352982&gt;
+
+        * Plugins/WebBaseNetscapePluginView.h: Imported #WebNetscapeContainerCheckPrivate.h; Added two new method:
+        checkIfAllowedToLoadURL:url:frame:callbackFunc: and cancelCheckIfAllowedToLoadURL:
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView checkIfAllowedToLoadURL:frame:callbackFunc:]): Added skeleton method, does nothing interesting
+        yet.
+        (-[WebBaseNetscapePluginView cancelCheckIfAllowedToLoadURL:]): Likewise.
+        * Plugins/WebNetscapeContainerCheckPrivate.h: Added.
+        * Plugins/WebNetscapeContainerCheckPrivate.mm: Added.
+        (browserContainerCheckFuncs): Added. 
+        * Plugins/WebNetscapePluginView.h: Imported #WebNetscapeContainerCheckPrivate.h;
+        * Plugins/WebNetscapePluginView.mm: Imported #WebNetscapeContainerCheckPrivate.h; added WKN_CheckIfAllowedToLoadURL
+        and WKN_CancelCheckIfAllowedToLoadURL functions.
+        (-[WebNetscapePluginView getVariable:value:]): Return vtable for container check functions.
+        * Plugins/npapi.mm:
+        (WKN_CheckIfAllowedToLoadURL): Added new private function.
+        (WKN_CancelCheckIfAllowedToLoadURL): Ditto.
+
</ins><span class="cx"> 2009-04-22  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebBaseNetscapePluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -104,8 +104,12 @@
</span><span class="cx"> - (void)addWindowObservers;
</span><span class="cx"> - (void)removeWindowObservers;
</span><span class="cx"> 
</span><ins>+- (uint32)checkIfAllowedToLoadURL:(const char*) url frame:(const char*) frame callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc;
+- (void)cancelCheckIfAllowedToLoadURL:(uint32)checkID;
+
</ins><span class="cx"> - (BOOL)convertFromX:(double)sourceX andY:(double)sourceY space:(NPCoordinateSpace)sourceSpace
</span><span class="cx">                  toX:(double *)destX andY:(double *)destY space:(NPCoordinateSpace)destSpace;
</span><ins>+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -722,6 +722,18 @@
</span><span class="cx">     return TRUE;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+
+- (uint32)checkIfAllowedToLoadURL:(const char*) url frame:(const char*) frame callbackFunc:(void (*)(NPP npp, uint32 checkID, NPBool allowed))callbackFunc
+{
+    // Not yet implemented
+    return 0;
+}
+
+- (void)cancelCheckIfAllowedToLoadURL:(uint32)checkID
+{
+    // Not yet implemented
+}
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -827,7 +839,7 @@
</span><span class="cx">     
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+    
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> #endif //  ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckPrivateh"></a>
<div class="addfile"><h4>Added: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h (0 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h                                (rev 0)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2009 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebNetscapeContainerCheckPrivate_h
+#define WebNetscapeContainerCheckPrivate_h
+
+#include &lt;WebKit/npapi.h&gt;
+
+#ifdef __cplusplus
+extern &quot;C&quot; {
+#endif
+    
+#define WKNVBrowserContainerCheckFuncs 1701
+
+typedef uint32 (*WKN_CheckIfAllowedToLoadURLProcPtr)(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed));
+typedef void  (*WKN_CancelCheckIfAllowedToLoadURLProcPtr)(NPP npp, uint32);
+
+uint32 WKN_CheckIfAllowedToLoadURL(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool allowed));
+void WKN_CancelCheckIfAllowedToLoadURL(NPP npp, uint32);
+
+typedef struct _WKNBrowserContainerCheckFuncs {
+    uint16 size;
+    uint16 version;
+    
+    WKN_CheckIfAllowedToLoadURLProcPtr checkIfAllowedToLoadURL;
+    WKN_CancelCheckIfAllowedToLoadURLProcPtr cancelCheckIfAllowedToLoadURL;
+} WKNBrowserContainerCheckFuncs;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // WebNetscapeContainerCheckPrivate_h
</ins></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapeContainerCheckPrivatemm"></a>
<div class="addfile"><h4>Added: trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm (0 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm                                (rev 0)
+++ trunk/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2009 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import &quot;WebNetscapeContainerCheckPrivate.h&quot;
+
+#import &quot;WebNetscapePluginView.h&quot;
+
+WKNBrowserContainerCheckFuncs *browserContainerCheckFuncs()
+{
+    static WKNBrowserContainerCheckFuncs funcs = {
+        sizeof(WKNBrowserContainerCheckFuncs),
+        0,
+        WKN_CheckIfAllowedToLoadURL,
+        WKN_CancelCheckIfAllowedToLoadURL
+    };
+    
+    return &amp;funcs;
+}
</ins></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.h (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.h        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.h        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import &quot;WebBaseNetscapePluginView.h&quot;
</span><span class="cx"> 
</span><ins>+#import &quot;WebNetscapeContainerCheckPrivate.h&quot;
</ins><span class="cx"> #import &lt;WebKit/npfunctions.h&gt;
</span><span class="cx"> #import &lt;WebKit/npapi.h&gt;
</span><span class="cx"> #import &lt;wtf/HashMap.h&gt;
</span><span class="lines">@@ -171,5 +172,7 @@
</span><span class="cx">                                     password:(char**)password passwordLength:(uint32*)passwordLength;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+WKNBrowserContainerCheckFuncs *browserContainerCheckFuncs();
+
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import &quot;WebGraphicsExtras.h&quot;
</span><span class="cx"> #import &quot;WebKitErrorsPrivate.h&quot;
</span><span class="cx"> #import &quot;WebKitLogging.h&quot;
</span><ins>+#import &quot;WebNetscapeContainerCheckPrivate.h&quot;
</ins><span class="cx"> #import &quot;WebKitNSStringExtras.h&quot;
</span><span class="cx"> #import &quot;WebKitSystemInterface.h&quot;
</span><span class="cx"> #import &quot;WebNSDataExtras.h&quot;
</span><span class="lines">@@ -1947,6 +1948,11 @@
</span><span class="cx">             return NPERR_NO_ERROR;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        case WKNVBrowserContainerCheckFuncs:
+        {
+            *(WKNBrowserContainerCheckFuncs **)value = browserContainerCheckFuncs();
+            return NPERR_NO_ERROR;
+        }
</ins><span class="cx">         default:
</span><span class="cx">             break;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkWebKitmacPluginsnpapimm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/npapi.mm (42781 => 42782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/npapi.mm        2009-04-23 16:42:59 UTC (rev 42781)
+++ trunk/WebKit/mac/Plugins/npapi.mm        2009-04-23 18:06:06 UTC (rev 42782)
</span><span class="lines">@@ -217,4 +217,14 @@
</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><ins>+uint32 WKN_CheckIfAllowedToLoadURL(NPP instance, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32, NPBool))
+{
+    return [pluginViewForInstance(instance) checkIfAllowedToLoadURL:url frame:frame callbackFunc:callbackFunc];
+}
+
+void WKN_CancelCheckIfAllowedToLoadURL(NPP instance, uint32 checkID)
+{
+    [pluginViewForInstance(instance) cancelCheckIfAllowedToLoadURL:checkID];
+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>