<!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>[37984] 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/37984">37984</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2008-10-29 16:47:52 -0700 (Wed, 29 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-29  Anders Carlsson  &lt;andersca@apple.com&gt;

        Reviewed by Sam Weinig.

        Remove WebNetscapePluginEmbeddedView, it adds nothing extra now. 
        
        Remove WebNetscapePlugInStreamLoaderClient since WebNetscapePluginStream is the client now.
        
        * Plugins/WebBaseNetscapePluginStream.h:
        * Plugins/WebBaseNetscapePluginStream.mm:
        * Plugins/WebBaseNetscapePluginView.h:
        * Plugins/WebKitPluginContainerView.h:
        * Plugins/WebNetscapePluginEmbeddedView.h: Removed.
        * Plugins/WebNetscapePluginEmbeddedView.mm: Removed.
        * Plugins/WebNetscapePluginEventHandler.h:
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (NetscapePluginWidget::NetscapePluginWidget):
        (NetscapePluginWidget::handleEvent):
        (WebFrameLoaderClient::createPlugin):
        * WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h: Removed.
        * WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm: Removed.
        * WebView/WebHTMLView.mm:
        (-[NSArray _web_makePluginViewsPerformSelector:withObject:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacPluginsWebBaseNetscapePluginStreamh">trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebBaseNetscapePluginStreammm">trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm</a></li>
<li><a href="#trunkWebKitmacPluginsWebBaseNetscapePluginViewh">trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebKitPluginContainerViewh">trunk/WebKit/mac/Plugins/WebKitPluginContainerView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginEventHandlerh">trunk/WebKit/mac/Plugins/WebNetscapePluginEventHandler.h</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkWebKitmacWebViewWebHTMLViewmm">trunk/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginEmbeddedViewh">trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginEmbeddedViewmm">trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebNetscapePlugInStreamLoaderClienth">trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebNetscapePlugInStreamLoaderClientmm">trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/ChangeLog        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -2,6 +2,30 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><span class="cx"> 
</span><ins>+        Remove WebNetscapePluginEmbeddedView, it adds nothing extra now. 
+        
+        Remove WebNetscapePlugInStreamLoaderClient since WebNetscapePluginStream is the client now.
+        
+        * Plugins/WebBaseNetscapePluginStream.h:
+        * Plugins/WebBaseNetscapePluginStream.mm:
+        * Plugins/WebBaseNetscapePluginView.h:
+        * Plugins/WebKitPluginContainerView.h:
+        * Plugins/WebNetscapePluginEmbeddedView.h: Removed.
+        * Plugins/WebNetscapePluginEmbeddedView.mm: Removed.
+        * Plugins/WebNetscapePluginEventHandler.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (NetscapePluginWidget::NetscapePluginWidget):
+        (NetscapePluginWidget::handleEvent):
+        (WebFrameLoaderClient::createPlugin):
+        * WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h: Removed.
+        * WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm: Removed.
+        * WebView/WebHTMLView.mm:
+        (-[NSArray _web_makePluginViewsPerformSelector:withObject:]):
+
+2008-10-29  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+
</ins><span class="cx">         Remove the WebBaseNetscapePluginStream Objective-C object.
</span><span class="cx">         
</span><span class="cx">         * Plugins/WebBaseNetscapePluginStream.h:
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebBaseNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> #import &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><ins>+#import &quot;WebBaseNetscapePluginView.h&quot;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">     class FrameLoader;
</span><span class="cx">     class NetscapePlugInStreamLoader;
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebBaseNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #import &quot;WebNSURLExtras.h&quot;
</span><span class="cx"> #import &quot;WebNSURLRequestExtras.h&quot;
</span><span class="cx"> #import &quot;WebNetscapePluginPackage.h&quot;
</span><del>-#import &quot;WebNetscapePlugInStreamLoaderClient.h&quot;
</del><span class="cx"> #import &lt;Foundation/NSURLResponse.h&gt;
</span><span class="cx"> #import &lt;kjs/JSLock.h&gt;
</span><span class="cx"> #import &lt;WebCore/DocumentLoader.h&gt;
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebBaseNetscapePluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -55,6 +55,11 @@
</span><span class="cx"> 
</span><span class="cx"> typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
</span><span class="cx"> 
</span><ins>+// Because the Adobe 7.x Acrobat plug-in has a hard coded check for a view named 
+// &quot;WebNetscapePluginDocumentView&quot;, this class must retain the old name in order 
+// for the plug-in to function correctly. (rdar://problem/4699455)
+#define WebBaseNetscapePluginView WebNetscapePluginDocumentView
+
</ins><span class="cx"> @interface WebBaseNetscapePluginView : NSView &lt;WebPluginManualLoader, NSTextInput&gt;
</span><span class="cx"> {
</span><span class="cx">     WebNetscapePluginPackage *pluginPackage;
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebKitPluginContainerViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebKitPluginContainerView.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebKitPluginContainerView.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebKitPluginContainerView.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> @class DOMElement;
</span><span class="cx"> 
</span><span class="cx"> @interface WebKitPluginContainerView : NSView
</span><del>-{   
</del><ins>+{
</ins><span class="cx">     DOMElement *_element;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginEmbeddedViewh"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005 Apple Computer, 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.
- */
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#import &lt;WebKit/WebBaseNetscapePluginView.h&gt;
-
-// Because the Adobe 7.x Acrobat plug-in has a hard coded check for a view named 
-// &quot;WebNetscapePluginDocumentView&quot;, this class must retain the old name in order 
-// for the plug-in to function correctly. (rdar://problem/4699455)
-#define WebNetscapePluginEmbeddedView WebNetscapePluginDocumentView
-
-@interface WebNetscapePluginEmbeddedView : WebBaseNetscapePluginView 
-{
-}
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginEmbeddedViewmm"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005 Apple Computer, 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.
- */
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#import &quot;WebNetscapePluginEmbeddedView.h&quot;
-
-#import &quot;WebBaseNetscapePluginViewPrivate.h&quot;
-#import &quot;WebDataSource.h&quot;
-#import &quot;WebFrame.h&quot;
-#import &quot;WebFrameInternal.h&quot;
-#import &quot;WebFrameView.h&quot;
-#import &quot;WebNSURLExtras.h&quot;
-#import &quot;WebNSURLRequestExtras.h&quot;
-#import &quot;WebNSViewExtras.h&quot;
-#import &quot;WebNetscapePluginPackage.h&quot;
-#import &quot;WebBaseNetscapePluginStream.h&quot;
-#import &quot;WebView.h&quot;
-#import &lt;WebCore/Frame.h&gt;
-#import &lt;WebCore/FrameLoader.h&gt;
-#import &lt;wtf/Assertions.h&gt;
-
-@implementation WebNetscapePluginEmbeddedView
-
-@end
-#endif
</del></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginEventHandler.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginEventHandler.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginEventHandler.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WebNetscapePluginEventHandler_h
</span><span class="cx"> #define WebNetscapePluginEventHandler_h
</span><span class="cx"> 
</span><ins>+#import &quot;WebBaseNetscapePluginView.h&quot;
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> 
</span><span class="cx"> @class NSEvent;
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> #import &quot;WebKitLogging.h&quot;
</span><span class="cx"> #import &quot;WebKitNSStringExtras.h&quot;
</span><span class="cx"> #import &quot;WebNSURLExtras.h&quot;
</span><del>-#import &quot;WebNetscapePluginEmbeddedView.h&quot;
</del><ins>+#import &quot;WebBaseNetscapePluginView.h&quot;
</ins><span class="cx"> #import &quot;WebNetscapePluginPackage.h&quot;
</span><span class="cx"> #import &quot;WebNullPluginView.h&quot;
</span><span class="cx"> #import &quot;WebPanelAuthenticationHandler.h&quot;
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> 
</span><span class="cx"> class NetscapePluginWidget : public PluginWidget {
</span><span class="cx"> public:
</span><del>-    NetscapePluginWidget(WebNetscapePluginEmbeddedView *view)
</del><ins>+    NetscapePluginWidget(WebBaseNetscapePluginView *view)
</ins><span class="cx">         : PluginWidget(view)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx">         
</span><span class="cx">         NSEvent* event = frame-&gt;eventHandler()-&gt;currentNSEvent();
</span><span class="cx">         if ([event type] == NSMouseMoved)
</span><del>-            [(WebNetscapePluginEmbeddedView *)platformWidget() handleMouseMoved:event];
</del><ins>+            [(WebBaseNetscapePluginView *)platformWidget() handleMouseMoved:event];
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx"> };
</span><span class="lines">@@ -1341,7 +1341,7 @@
</span><span class="cx">             
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">         else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><del>-            WebNetscapePluginEmbeddedView *embeddedView = [[[WebNetscapePluginEmbeddedView alloc]
</del><ins>+            WebBaseNetscapePluginView *embeddedView = [[[WebBaseNetscapePluginView alloc]
</ins><span class="cx">                 initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
</span><span class="cx">                 pluginPackage:(WebNetscapePluginPackage *)pluginPackage
</span><span class="cx">                 URL:URL
</span><span class="lines">@@ -1390,8 +1390,8 @@
</span><span class="cx">     NSView *pluginView = pluginWidget-&gt;platformWidget();
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-    if ([pluginView isKindOfClass:[WebNetscapePluginEmbeddedView class]])
-        [representation _redirectDataToManualLoader:(WebNetscapePluginEmbeddedView *)pluginView forPluginView:pluginView];
</del><ins>+    if ([pluginView isKindOfClass:[WebBaseNetscapePluginView class]])
+        [representation _redirectDataToManualLoader:(WebBaseNetscapePluginView *)pluginView forPluginView:pluginView];
</ins><span class="cx">     else {
</span><span class="cx"> #else
</span><span class="cx">     {
</span><span class="lines">@@ -1434,7 +1434,7 @@
</span><span class="cx">         } 
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">         else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><del>-            view = [[[WebNetscapePluginEmbeddedView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
</del><ins>+            view = [[[WebBaseNetscapePluginView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
</ins><span class="cx">                 pluginPackage:(WebNetscapePluginPackage *)pluginPackage
</span><span class="cx">                 URL:nil
</span><span class="cx">                 baseURL:baseURL
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebNetscapePlugInStreamLoaderClienth"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.h        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 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 &lt;WebKit/WebPlugInStreamLoaderDelegate.h&gt;
-#import &lt;WebCore/NetscapePlugInStreamLoader.h&gt;
-#import &lt;wtf/RetainPtr.h&gt;
-
-namespace WebCore {
-    class NetscapePlugInStreamLoader;
-    class ResourceResponse;
-};
-
-typedef id &lt;WebPlugInStreamLoaderDelegate&gt; PlugInStreamLoaderDelegate;
-
-class WebNetscapePlugInStreamLoaderClient : public WebCore::NetscapePlugInStreamLoaderClient {
-public:
-    WebNetscapePlugInStreamLoaderClient(PlugInStreamLoaderDelegate delegate) : m_stream(delegate) { }
-    virtual void didReceiveResponse(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceResponse&amp;);
-    virtual void didReceiveData(WebCore::NetscapePlugInStreamLoader*, const char*, int);
-    virtual void didFail(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceError&amp;);
-    virtual void didFinishLoading(WebCore::NetscapePlugInStreamLoader*);
-    virtual bool wantsAllStreams() const;
-    
-private:
-    RetainPtr&lt;PlugInStreamLoaderDelegate&gt; m_stream;
-};
</del></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebNetscapePlugInStreamLoaderClientmm"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/WebCoreSupport/WebNetscapePlugInStreamLoaderClient.mm        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 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 &lt;WebKit/WebNetscapePlugInStreamLoaderClient.h&gt;
-#import &lt;WebCore/NetscapePlugInStreamLoader.h&gt;
-#import &lt;WebCore/ResourceResponse.h&gt;
-
-using namespace WebCore;
-
-void WebNetscapePlugInStreamLoaderClient::didReceiveResponse(NetscapePlugInStreamLoader*, const ResourceResponse&amp; theResponse)
-{
-    [m_stream.get() startStreamWithResponse:theResponse.nsURLResponse()];
-}
-
-void WebNetscapePlugInStreamLoaderClient::didReceiveData(NetscapePlugInStreamLoader*, const char* data, int length)
-{
-    NSData *nsData = [[NSData alloc] initWithBytesNoCopy:(void*)data length:length freeWhenDone:NO];
-    [m_stream.get() receivedData:nsData];
-    [nsData release];
-}
-
-void WebNetscapePlugInStreamLoaderClient::didFail(NetscapePlugInStreamLoader*, const ResourceError&amp; error)
-{
-    [m_stream.get() destroyStreamWithError:error];
-    m_stream = 0;
-}
-
-void WebNetscapePlugInStreamLoaderClient::didFinishLoading(NetscapePlugInStreamLoader*)
-{
-    [m_stream.get() finishedLoading];
-    m_stream = 0;
-}
-
-bool WebNetscapePlugInStreamLoaderClient::wantsAllStreams() const
-{
-    return [m_stream.get() wantsAllStreams];
-}
</del></span></pre></div>
<a id="trunkWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebHTMLView.mm (37983 => 37984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebHTMLView.mm        2008-10-29 22:53:09 UTC (rev 37983)
+++ trunk/WebKit/mac/WebView/WebHTMLView.mm        2008-10-29 23:47:52 UTC (rev 37984)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> #import &quot;WebNSPrintOperationExtras.h&quot;
</span><span class="cx"> #import &quot;WebNSURLExtras.h&quot;
</span><span class="cx"> #import &quot;WebNSViewExtras.h&quot;
</span><del>-#import &quot;WebNetscapePluginEmbeddedView.h&quot;
</del><span class="cx"> #import &quot;WebPluginController.h&quot;
</span><span class="cx"> #import &quot;WebPreferences.h&quot;
</span><span class="cx"> #import &quot;WebPreferencesPrivate.h&quot;
</span><span class="lines">@@ -4543,9 +4542,9 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">     NSEnumerator *enumerator = [self objectEnumerator];
</span><del>-    WebNetscapePluginEmbeddedView *view;
</del><ins>+    WebBaseNetscapePluginView *view;
</ins><span class="cx">     while ((view = [enumerator nextObject]) != nil)
</span><del>-        if ([view isKindOfClass:[WebNetscapePluginEmbeddedView class]])
</del><ins>+        if ([view isKindOfClass:[WebBaseNetscapePluginView class]])
</ins><span class="cx">             [view performSelector:selector withObject:object];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>