<!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>[56362] trunk</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/56362">56362</a></dd>
<dt>Author</dt> <dd>kdecker@apple.com</dd>
<dt>Date</dt> <dd>2010-03-22 15:05:32 -0700 (Mon, 22 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>
        Reviewed by Simon Fraser.

        https://bugs.webkit.org/show_bug.cgi?id=36328

        * rendering/RenderEmbeddedObject.cpp:
        (WebCore::RenderEmbeddedObject::RenderEmbeddedObject): Fix a find/repalce mistake from my earlier patch.
        Rename m_setShowsMissingPluginIndicator -&gt; m_showsMissingPluginIndicator. 
        (WebCore::RenderEmbeddedObject::updateWidget): Don't update the widget if we're showing
        the missing plug-in indicator.
        (WebCore::RenderEmbeddedObject::paint):Fix a find/repalce mistake from my earlier patch.
        Rename m_setShowsMissingPluginIndicator -&gt; m_showsMissingPluginIndicator. 
        (WebCore::RenderEmbeddedObject::paintReplaced): Ditto.
        * rendering/RenderEmbeddedObject.h: Ditto.
        (WebCore::RenderEmbeddedObject::setShowsMissingPluginIndicator): Ditto.
        (WebCore::RenderEmbeddedObject::showsMissingPluginIndicator): Ditto.

        * Plugins/WebNetscapePluginView.mm:
        * Plugins/WebNullPluginView.h: Removed.
        * Plugins/WebNullPluginView.mm: Removed.
        * Resources/nullplugin.tiff: Removed.
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::createPlugin): Invoke the resource load delegate if the plug-in failed to load.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderEmbeddedObjectcpp">trunk/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderEmbeddedObjecth">trunk/WebCore/rendering/RenderEmbeddedObject.h</a></li>
<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="#trunkWebKitmacPluginsWebNetscapePluginViewmm">trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitmacPluginsWebNullPluginViewh">trunk/WebKit/mac/Plugins/WebNullPluginView.h</a></li>
<li><a href="#trunkWebKitmacPluginsWebNullPluginViewmm">trunk/WebKit/mac/Plugins/WebNullPluginView.mm</a></li>
<li><a href="#trunkWebKitmacResourcesnullplugintiff">trunk/WebKit/mac/Resources/nullplugin.tiff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebCore/ChangeLog        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2010-03-22  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36328
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::RenderEmbeddedObject): Fix a find/repalce mistake from my earlier patch.
+        Rename m_setShowsMissingPluginIndicator -&gt; m_showsMissingPluginIndicator. 
+        (WebCore::RenderEmbeddedObject::updateWidget): Don't update the widget if we're showing
+        the missing plug-in indicator.
+        (WebCore::RenderEmbeddedObject::paint):Fix a find/repalce mistake from my earlier patch.
+        Rename m_setShowsMissingPluginIndicator -&gt; m_showsMissingPluginIndicator. 
+        (WebCore::RenderEmbeddedObject::paintReplaced): Ditto.
+        * rendering/RenderEmbeddedObject.h: Ditto.
+        (WebCore::RenderEmbeddedObject::setShowsMissingPluginIndicator): Ditto.
+        (WebCore::RenderEmbeddedObject::showsMissingPluginIndicator): Ditto.
+
</ins><span class="cx"> 2010-03-22  Joseph Pecoraro  &lt;joepeck@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Kilzer.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderEmbeddedObject.cpp (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderEmbeddedObject.cpp        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebCore/rendering/RenderEmbeddedObject.cpp        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> 
</span><span class="cx"> RenderEmbeddedObject::RenderEmbeddedObject(Element* element)
</span><span class="cx">     : RenderPartObject(element)
</span><del>-    , m_setShowsMissingPluginIndicator(false)
</del><ins>+    , m_showsMissingPluginIndicator(false)
</ins><span class="cx"> {
</span><span class="cx">     view()-&gt;frameView()-&gt;setIsVisuallyNonEmpty();
</span><span class="cx"> }
</span><span class="lines">@@ -155,6 +155,9 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderEmbeddedObject::updateWidget(bool onlyCreateNonNetscapePlugins)
</span><span class="cx"> {
</span><ins>+    if (m_showsMissingPluginIndicator)
+        return;
+
</ins><span class="cx">     String url;
</span><span class="cx">     String serviceType;
</span><span class="cx">     Vector&lt;String&gt; paramNames;
</span><span class="lines">@@ -347,7 +350,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderEmbeddedObject::paint(PaintInfo&amp; paintInfo, int tx, int ty)
</span><span class="cx"> {
</span><del>-    if (m_setShowsMissingPluginIndicator) {
</del><ins>+    if (m_showsMissingPluginIndicator) {
</ins><span class="cx">         RenderReplaced::paint(paintInfo, tx, ty);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -357,7 +360,7 @@
</span><span class="cx">     
</span><span class="cx"> void RenderEmbeddedObject::paintReplaced(PaintInfo&amp; paintInfo, int tx, int ty)
</span><span class="cx"> {
</span><del>-    if (!m_setShowsMissingPluginIndicator)
</del><ins>+    if (!m_showsMissingPluginIndicator)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     if (paintInfo.phase == PaintPhaseSelection)
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderEmbeddedObjecth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderEmbeddedObject.h (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderEmbeddedObject.h        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebCore/rendering/RenderEmbeddedObject.h        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">     virtual ~RenderEmbeddedObject();
</span><span class="cx"> 
</span><span class="cx">     void updateWidget(bool onlyCreateNonNetscapePlugins);
</span><del>-    void setShowsMissingPluginIndicator(bool showsMissingPluginIndicator) { m_setShowsMissingPluginIndicator = showsMissingPluginIndicator; }
-    bool showsMissingPluginIndicator() const { return m_setShowsMissingPluginIndicator; }
</del><ins>+    void setShowsMissingPluginIndicator(bool showsMissingPluginIndicator) { m_showsMissingPluginIndicator = showsMissingPluginIndicator; }
+    bool showsMissingPluginIndicator() const { return m_showsMissingPluginIndicator; }
</ins><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx">     virtual bool allowsAcceleratedCompositing() const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     virtual void layout();
</span><del>-    bool m_setShowsMissingPluginIndicator;
</del><ins>+    bool m_showsMissingPluginIndicator;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> inline RenderEmbeddedObject* toRenderEmbeddedObject(RenderObject* object)
</span></span></pre></div>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/ChangeLog        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2010-03-22  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36328
+
+        * WebKit.xcodeproj/project.pbxproj: Remove WebNullPluginView and nullplugin.tiff from the project.
+
</ins><span class="cx"> 2010-03-22  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         * StringsNotToBeLocalized.txt: Updated for recent changes.
</span></span></pre></div>
<a id="trunkWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebKit.xcodeproj/project.pbxproj (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebKit.xcodeproj/project.pbxproj        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/WebKit.xcodeproj/project.pbxproj        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx">                 9398102B0824BF01008DF038 /* WebBaseNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A672B90263866E01000102 /* WebBaseNetscapePluginStream.h */; };
</span><span class="cx">                 9398102E0824BF01008DF038 /* WebBasePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF46036652150000E506 /* WebBasePluginPackage.h */; };
</span><span class="cx">                 939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */; };
</span><del>-                939810340824BF01008DF038 /* WebNullPluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = F5883BE0025E5E9D01000102 /* WebNullPluginView.h */; };
</del><span class="cx">                 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx">                 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx">                 939810370824BF01008DF038 /* WebPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8467275C0367158500CA2ACA /* WebPluginController.h */; };
</span><span class="lines">@@ -243,7 +242,6 @@
</span><span class="cx">                 939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */; };
</span><span class="cx">                 939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */; };
</span><del>-                939810B60824BF01008DF038 /* nullplugin.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5883BDE025E5C6A01000102 /* nullplugin.tiff */; };
</del><span class="cx">                 939810B70824BF01008DF038 /* url_icon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5B67130023EDF8901C1A525 /* url_icon.tiff */; };
</span><span class="cx">                 939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */; };
</span><span class="cx">                 939810BC0824BF01008DF038 /* WebBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */; };
</span><span class="lines">@@ -265,7 +263,6 @@
</span><span class="cx">                 939810D10824BF01008DF038 /* WebBaseNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A672BA0263866E01000102 /* WebBaseNetscapePluginStream.mm */; };
</span><span class="cx">                 939810D30824BF01008DF038 /* WebBasePluginPackage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E4AF47036652150000E506 /* WebBasePluginPackage.mm */; };
</span><span class="cx">                 939810D60824BF01008DF038 /* WebNetscapePluginPackage.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5F7171F0288493C018635CA /* WebNetscapePluginPackage.mm */; };
</span><del>-                939810D90824BF01008DF038 /* WebNullPluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5883BE1025E5E9D01000102 /* WebNullPluginView.mm */; };
</del><span class="cx">                 939810DA0824BF01008DF038 /* WebPluginController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8467275D0367158500CA2ACA /* WebPluginController.mm */; };
</span><span class="cx">                 939810DB0824BF01008DF038 /* WebPluginDatabase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5F717210288493C018635CA /* WebPluginDatabase.mm */; };
</span><span class="cx">                 939810DC0824BF01008DF038 /* WebPluginPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E4AF4C036659440000E506 /* WebPluginPackage.m */; };
</span><span class="lines">@@ -672,9 +669,6 @@
</span><span class="cx">                 F53444CE02E87CBA018635CA /* WebKitStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitStatistics.h; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><span class="cx">                 F53444CF02E87CBA018635CA /* WebKitStatistics.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitStatistics.m; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><span class="cx">                 F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitStatisticsPrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><del>-                F5883BDE025E5C6A01000102 /* nullplugin.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = nullplugin.tiff; sourceTree = &quot;&lt;group&gt;&quot;; };
-                F5883BE0025E5E9D01000102 /* WebNullPluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNullPluginView.h; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
-                F5883BE1025E5E9D01000102 /* WebNullPluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNullPluginView.mm; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</del><span class="cx">                 F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitErrors.h; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><span class="cx">                 F59668C802AD2923018635CA /* WebStringTruncator.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebStringTruncator.h; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><span class="cx">                 F59668C902AD2923018635CA /* WebStringTruncator.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebStringTruncator.mm; sourceTree = &quot;&lt;group&gt;&quot;; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -799,7 +793,6 @@
</span><span class="cx">                                 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */,
</span><span class="cx">                                 939811320824BF01008DF038 /* Info.plist */,
</span><span class="cx">                                 5DE83A7D0D0F7FAD00CAD12A /* Localizable.strings */,
</span><del>-                                F5883BDE025E5C6A01000102 /* nullplugin.tiff */,
</del><span class="cx">                                 ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */,
</span><span class="cx">                                 F5B67130023EDF8901C1A525 /* url_icon.tiff */,
</span><span class="cx">                                 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */,
</span><span class="lines">@@ -1272,8 +1265,6 @@
</span><span class="cx">                                 848DFF430365F71500CA2ACA /* WebKit Plug-ins */,
</span><span class="cx">                                 83E4AF46036652150000E506 /* WebBasePluginPackage.h */,
</span><span class="cx">                                 83E4AF47036652150000E506 /* WebBasePluginPackage.mm */,
</span><del>-                                F5883BE0025E5E9D01000102 /* WebNullPluginView.h */,
-                                F5883BE1025E5E9D01000102 /* WebNullPluginView.mm */,
</del><span class="cx">                                 F5F717200288493C018635CA /* WebPluginDatabase.h */,
</span><span class="cx">                                 F5F717210288493C018635CA /* WebPluginDatabase.mm */,
</span><span class="cx">                                 224100F2091818D900D2D266 /* WebPluginsPrivate.h */,
</span><span class="lines">@@ -1498,7 +1489,6 @@
</span><span class="cx">                                 65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */,
</span><span class="cx">                                 939810240824BF01008DF038 /* WebNSViewExtras.h in Headers */,
</span><span class="cx">                                 939810250824BF01008DF038 /* WebNSWindowExtras.h in Headers */,
</span><del>-                                939810340824BF01008DF038 /* WebNullPluginView.h in Headers */,
</del><span class="cx">                                 9398102A0824BF01008DF038 /* WebPanelAuthenticationHandler.h in Headers */,
</span><span class="cx">                                 A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers */,
</span><span class="cx">                                 37B6FB4E1063530C000FDB3B /* WebPDFDocumentExtras.h in Headers */,
</span><span class="lines">@@ -1621,7 +1611,6 @@
</span><span class="cx">                         files = (
</span><span class="cx">                                 939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
</span><span class="cx">                                 5DE83A7F0D0F7FAD00CAD12A /* Localizable.strings in Resources */,
</span><del>-                                939810B60824BF01008DF038 /* nullplugin.tiff in Resources */,
</del><span class="cx">                                 939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
</span><span class="cx">                                 939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */,
</span><span class="cx">                                 5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */,
</span><span class="lines">@@ -1876,7 +1865,6 @@
</span><span class="cx">                                 65E0F9E708500F23007E5CB9 /* WebNSUserDefaultsExtras.m in Sources */,
</span><span class="cx">                                 939810C90824BF01008DF038 /* WebNSViewExtras.m in Sources */,
</span><span class="cx">                                 939810CA0824BF01008DF038 /* WebNSWindowExtras.m in Sources */,
</span><del>-                                939810D90824BF01008DF038 /* WebNullPluginView.mm in Sources */,
</del><span class="cx">                                 939810D00824BF01008DF038 /* WebPanelAuthenticationHandler.m in Sources */,
</span><span class="cx">                                 A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources */,
</span><span class="cx">                                 37B6FB4F1063530C000FDB3B /* WebPDFDocumentExtras.mm in Sources */,
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/mac/ChangeLog        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2010-03-22  Kevin Decker  &lt;kdecker@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36328
+
+        This patch entirely WebNullPluginView.
+        
+        * Plugins/WebNetscapePluginView.mm:
+        * Plugins/WebNullPluginView.h: Removed.
+        * Plugins/WebNullPluginView.mm: Removed.
+        * Resources/nullplugin.tiff: Removed.
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::createPlugin): Invoke the resource load delegate if the plug-in failed to load.
+
</ins><span class="cx"> 2010-03-22  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by John Sullivan.
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #import &quot;WebPluginContainerCheck.h&quot;
</span><span class="cx"> #import &quot;WebNetscapeContainerCheckContextInfo.h&quot;
</span><span class="cx"> #import &quot;WebNetscapePluginEventHandler.h&quot;
</span><del>-#import &quot;WebNullPluginView.h&quot;
</del><span class="cx"> #import &quot;WebPreferences.h&quot;
</span><span class="cx"> #import &quot;WebPluginRequest.h&quot;
</span><span class="cx"> #import &quot;WebViewInternal.h&quot;
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNullPluginViewh"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/Plugins/WebNullPluginView.h (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNullPluginView.h        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/mac/Plugins/WebNullPluginView.h        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005, 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;AppKit/AppKit.h&gt;
-
-@class DOMElement;
-
-@interface WebNullPluginView : NSImageView
-{
-    NSError *error;
-    DOMElement *element;
-}
-
-- (id)initWithFrame:(NSRect)frame error:(NSError *)error DOMElement:(DOMElement *)element;
-
-@end
</del></span></pre></div>
<a id="trunkWebKitmacPluginsWebNullPluginViewmm"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit/mac/Plugins/WebNullPluginView.mm (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNullPluginView.mm        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/mac/Plugins/WebNullPluginView.mm        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005, 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 &quot;WebNullPluginView.h&quot;
-
-#import &quot;DOMElementInternal.h&quot;
-#import &quot;WebDelegateImplementationCaching.h&quot;
-#import &quot;WebFrameInternal.h&quot;
-#import &quot;WebViewInternal.h&quot;
-#import &lt;WebCore/Document.h&gt;
-#import &lt;WebCore/Element.h&gt;
-
-@implementation WebNullPluginView
-
-- initWithFrame:(NSRect)frame error:(NSError *)err DOMElement:(DOMElement *)elem
-{    
-    static NSImage *nullPlugInImage;
-    if (!nullPlugInImage) {
-        NSBundle *bundle = [NSBundle bundleForClass:[WebNullPluginView class]];
-        NSString *imagePath = [bundle pathForResource:@&quot;nullplugin&quot; ofType:@&quot;tiff&quot;];
-        nullPlugInImage = [[NSImage alloc] initWithContentsOfFile:imagePath];
-    }
-    
-    self = [super initWithFrame:frame];
-    if (!self)
-        return nil;
-
-    error = [err retain];
-    if (err)
-        element = [elem retain];
-
-    [self setImage:nullPlugInImage];
-
-    return self;
-}
-
-- (void)dealloc
-
-{
-    [error release];
-    [element release];
-    [super dealloc];
-}
-
-- (void)reportFailure
-{
-    NSError *localError = error;
-    DOMElement *localElement = element;
-
-    error = nil;
-    element = nil;
-
-    WebFrame *webFrame = kit(core(localElement)-&gt;document()-&gt;frame());
-    if (webFrame) {
-        WebView *webView = [webFrame webView];
-        WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
-        if (implementations-&gt;plugInFailedWithErrorFunc)
-            CallResourceLoadDelegate(implementations-&gt;plugInFailedWithErrorFunc, webView,
-                @selector(webView:plugInFailedWithError:dataSource:), localError, [webFrame _dataSource]);
-    }
-
-    [localError release];
-    [localElement release];
-}
-
-- (void)viewDidMoveToWindow
-{
-    if (!error)
-        return;
-
-    if ([self window])
-        [self reportFailure];
-}
-
-@end
</del></span></pre></div>
<a id="trunkWebKitmacResourcesnullplugintiff"></a>
<div class="binary"><h4>Deleted: trunk/WebKit/mac/Resources/nullplugin.tiff</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (56361 => 56362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2010-03-22 21:56:45 UTC (rev 56361)
+++ trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2010-03-22 22:05:32 UTC (rev 56362)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> #import &quot;WebNSURLExtras.h&quot;
</span><span class="cx"> #import &quot;WebNetscapePluginView.h&quot;
</span><span class="cx"> #import &quot;WebNetscapePluginPackage.h&quot;
</span><del>-#import &quot;WebNullPluginView.h&quot;
</del><span class="cx"> #import &quot;WebPanelAuthenticationHandler.h&quot;
</span><span class="cx"> #import &quot;WebPluginController.h&quot;
</span><span class="cx"> #import &quot;WebPluginPackage.h&quot;
</span><span class="lines">@@ -1601,17 +1600,21 @@
</span><span class="cx"> 
</span><span class="cx">     if (!errorCode &amp;&amp; !view)
</span><span class="cx">         errorCode = WebKitErrorCannotLoadPlugIn;
</span><ins>+    
+    if (errorCode &amp;&amp; m_webFrame) {
+        WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
+        if (implementations-&gt;plugInFailedWithErrorFunc) {
+            KURL pluginPageURL = document-&gt;completeURL(deprecatedParseURL(parameterValue(paramNames, paramValues, &quot;pluginspage&quot;)));
+            if (!pluginPageURL.protocolInHTTPFamily())
+                pluginPageURL = KURL();
+            NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
+                                                            contentURL:pluginURL pluginPageURL:pluginPageURL pluginName:[pluginPackage name] MIMEType:MIMEType];
+            CallResourceLoadDelegate(implementations-&gt;plugInFailedWithErrorFunc, [m_webFrame.get() webView],
+                                     @selector(webView:plugInFailedWithError:dataSource:), error, [m_webFrame.get() _dataSource]);
+            [error release];
+        }
</ins><span class="cx"> 
</span><del>-    if (errorCode) {
-        KURL pluginPageURL = document-&gt;completeURL(deprecatedParseURL(parameterValue(paramNames, paramValues, &quot;pluginspage&quot;)));
-        if (!pluginPageURL.protocolInHTTPFamily())
-            pluginPageURL = KURL();
-        NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
-            contentURL:pluginURL pluginPageURL:pluginPageURL pluginName:[pluginPackage name] MIMEType:MIMEType];
-        WebNullPluginView *nullView = [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
-            error:error DOMElement:kit(element)] autorelease];
-        view = nullView;
-        [error release];
</del><ins>+        return 0;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     ASSERT(view);
</span><span class="lines">@@ -1692,14 +1695,13 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (!view) {
</span><del>-        NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorJavaUnavailable
-            contentURL:nil
-            pluginPageURL:nil
-            pluginName:[pluginPackage name]
-            MIMEType:MIMEType];
-        view = [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
-            error:error DOMElement:kit(element)] autorelease];
-        [error release];
</del><ins>+        WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(getWebView(m_webFrame.get()));
+        if (implementations-&gt;plugInFailedWithErrorFunc) {
+            NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorJavaUnavailable contentURL:nil pluginPageURL:nil pluginName:[pluginPackage name] MIMEType:MIMEType];
+            CallResourceLoadDelegate(implementations-&gt;plugInFailedWithErrorFunc, [m_webFrame.get() webView],
+                                     @selector(webView:plugInFailedWithError:dataSource:), error, [m_webFrame.get() _dataSource]);
+            [error release];
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     ASSERT(view);
</span></span></pre>
</div>
</div>

</body>
</html>