<!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>[56247] 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/56247">56247</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2010-03-19 11:19:12 -0700 (Fri, 19 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=36337
        Log an error when an OOP plug-in sends an unknown object id

        Making these LOG_ERROR and not ASSERTs, because I don't want early returns to look
        temporary or redundant.

        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
        (WebKit::NetscapePluginInstanceProxy::evaluate):
        (WebKit::NetscapePluginInstanceProxy::invoke):
        (WebKit::NetscapePluginInstanceProxy::invokeDefault):
        (WebKit::NetscapePluginInstanceProxy::construct):
        (WebKit::NetscapePluginInstanceProxy::getProperty):
        (WebKit::NetscapePluginInstanceProxy::setProperty):
        (WebKit::NetscapePluginInstanceProxy::removeProperty):
        (WebKit::NetscapePluginInstanceProxy::hasProperty):
        (WebKit::NetscapePluginInstanceProxy::hasMethod):
        (WebKit::NetscapePluginInstanceProxy::enumerate):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (56246 => 56247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2010-03-19 18:16:55 UTC (rev 56246)
+++ trunk/WebKit/mac/ChangeLog        2010-03-19 18:19:12 UTC (rev 56247)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2010-03-18  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36337
+        Log an error when an OOP plug-in sends an unknown object id
+
+        Making these LOG_ERROR and not ASSERTs, because I don't want early returns to look
+        temporary or redundant.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::evaluate):
+        (WebKit::NetscapePluginInstanceProxy::invoke):
+        (WebKit::NetscapePluginInstanceProxy::invokeDefault):
+        (WebKit::NetscapePluginInstanceProxy::construct):
+        (WebKit::NetscapePluginInstanceProxy::getProperty):
+        (WebKit::NetscapePluginInstanceProxy::setProperty):
+        (WebKit::NetscapePluginInstanceProxy::removeProperty):
+        (WebKit::NetscapePluginInstanceProxy::hasProperty):
+        (WebKit::NetscapePluginInstanceProxy::hasMethod):
+        (WebKit::NetscapePluginInstanceProxy::enumerate):
+
</ins><span class="cx"> 2010-03-16  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (56246 => 56247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2010-03-19 18:16:55 UTC (rev 56246)
+++ trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2010-03-19 18:19:12 UTC (rev 56247)
</span><span class="lines">@@ -829,8 +829,10 @@
</span><span class="cx">     resultData = 0;
</span><span class="cx">     resultLength = 0;
</span><span class="cx"> 
</span><del>-    if (!m_localObjects.contains(objectID))
</del><ins>+    if (!m_localObjects.contains(objectID)) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::evaluate: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -872,8 +874,10 @@
</span><span class="cx">         return false;
</span><span class="cx">     
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::invoke: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -906,8 +910,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::invokeDefault: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -939,8 +945,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::construct: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -973,8 +981,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::getProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -992,8 +1002,10 @@
</span><span class="cx"> bool NetscapePluginInstanceProxy::getProperty(uint32_t objectID, unsigned propertyName, data_t&amp; resultData, mach_msg_type_number_t&amp; resultLength)
</span><span class="cx"> {
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::getProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1014,8 +1026,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::setProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1038,8 +1052,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::setProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1061,8 +1077,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::removeProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1086,8 +1104,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::removeProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1111,8 +1131,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::hasProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1131,8 +1153,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::hasProperty: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1151,8 +1175,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::hasMethod: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -1171,8 +1197,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     JSObject* object = m_localObjects.get(objectID);
</span><del>-    if (!object)
</del><ins>+    if (!object) {
+        LOG_ERROR(&quot;NetscapePluginInstanceProxy::enumerate: local object %u doesn't exist.&quot;, objectID);
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx">     
</span><span class="cx">     Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx">     if (!frame)
</span></span></pre>
</div>
</div>

</body>
</html>