<!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>[38611] 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/38611">38611</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2008-11-19 18:33:09 -0800 (Wed, 19 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebKit/mac:

2008-11-19  Anders Carlsson  &lt;andersca@apple.com&gt;

        Reviewed by Dan Bernstein.

        Test: plugins/netscape-plugin-setwindow-size-2.html
        
        Fix bug where NPP_SetWindow wasn't getting called for some plug-ins.
        
        * Plugins/WebNetscapePluginView.mm:
        (-[WebNetscapePluginView updateAndSetWindow]):
        Don't bail if the drawing model is not the CA drawing model. Remove some code 
        that was doing the wrong thing.

LayoutTests:

2008-11-19  Anders Carlsson  &lt;andersca@apple.com&gt;

        Reviewed by Dan Bernstein.

        Add NPP_SetWindow test.
        
        * plugins/netscape-plugin-setwindow-size-2-expected.txt: Added.
        * plugins/netscape-plugin-setwindow-size-2.html: Copied from plugins/netscape-plugin-setwindow-size.html.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacPluginsWebNetscapePluginViewmm">trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspluginsnetscapepluginsetwindowsize2expectedtxt">trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestspluginsnetscapepluginsetwindowsize2html">trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (38610 => 38611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-11-20 02:05:41 UTC (rev 38610)
+++ trunk/LayoutTests/ChangeLog        2008-11-20 02:33:09 UTC (rev 38611)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2008-11-19  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Add NPP_SetWindow test.
+        
+        * plugins/netscape-plugin-setwindow-size-2-expected.txt: Added.
+        * plugins/netscape-plugin-setwindow-size-2.html: Copied from plugins/netscape-plugin-setwindow-size.html.
+
</ins><span class="cx"> 2008-11-19  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestspluginsnetscapepluginsetwindowsize2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2-expected.txt (0 => 38611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2-expected.txt                                (rev 0)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2-expected.txt        2008-11-20 02:33:09 UTC (rev 38611)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PLUGIN: NPP_SetWindow: 200 200
+This tests that a hidden plug-in gets a correct NPP_SetWindow the first time.
</ins></span></pre></div>
<a id="trunkLayoutTestspluginsnetscapepluginsetwindowsize2htmlfromrev38603trunkLayoutTestspluginsnetscapepluginsetwindowsizehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html (from rev 38603, trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html) (0 => 38611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html                                (rev 0)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html        2008-11-20 02:33:09 UTC (rev 38611)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.setWindowIsKey(false);
+    }
+    
+&lt;/script&gt;
+&lt;body&gt;
+&lt;embed style=&quot;visibility:hidden&quot; id=&quot;testPlugin&quot; type=&quot;application/x-webkit-test-netscape&quot; logfirstsetwindow=&quot;true&quot; width=&quot;200&quot; height=&quot;200&quot;&gt;&lt;/embed&gt;
+&lt;div&gt;
+    This tests that a hidden plug-in gets a correct NPP_SetWindow the first time.
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestspluginsnetscapepluginsetwindowsize2html"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (38610 => 38611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2008-11-20 02:05:41 UTC (rev 38610)
+++ trunk/WebKit/mac/ChangeLog        2008-11-20 02:33:09 UTC (rev 38611)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-11-19  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Test: plugins/netscape-plugin-setwindow-size-2.html
+        
+        Fix bug where NPP_SetWindow wasn't getting called for some plug-ins.
+        
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView updateAndSetWindow]):
+        Don't bail if the drawing model is not the CA drawing model. Remove some code 
+        that was doing the wrong thing.
+
</ins><span class="cx"> 2008-11-19  Darin Fisher  &lt;darin@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Geoff Garen.
</span></span></pre></div>
<a id="trunkWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm (38610 => 38611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2008-11-20 02:05:41 UTC (rev 38610)
+++ trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm        2008-11-20 02:33:09 UTC (rev 38611)
</span><span class="lines">@@ -901,9 +901,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)updateAndSetWindow
</span><span class="cx"> {
</span><del>-    if (drawingModel != NPDrawingModelCoreAnimation)
-        return;
-
</del><span class="cx">     // A plug-in can only update if it's (1) already been started (2) isn't stopped
</span><span class="cx">     // and (3) is able to draw on-screen. To meet condition (3) the plug-in must not
</span><span class="cx">     // be hidden and be attached to a window. QuickDraw plug-ins are an important
</span><span class="lines">@@ -912,6 +909,10 @@
</span><span class="cx">     // NPP_SetWindow() with an empty NPWindow struct.
</span><span class="cx">     if (!_isStarted)
</span><span class="cx">         return;
</span><ins>+    
+    if (drawingModel == NPDrawingModelCoreAnimation)
+        return;
+    
</ins><span class="cx"> #ifdef NP_NO_QUICKDRAW
</span><span class="cx">     if (![self canDraw])
</span><span class="cx">         return;
</span><span class="lines">@@ -924,15 +925,7 @@
</span><span class="cx"> #endif // NP_NO_QUICKDRAW
</span><span class="cx">     
</span><span class="cx">     BOOL didLockFocus = [NSView focusView] != self &amp;&amp; [self lockFocusIfCanDraw];
</span><del>-    
-    if (drawingModel == NPDrawingModelCoreGraphics || isDrawingModelQuickDraw(drawingModel)) {
-        [self setWindowIfNecessary];
-        if (didLockFocus)
-            [self unlockFocus];
</del><span class="cx"> 
</span><del>-        return;
-    }
-    
</del><span class="cx">     PortState portState = [self saveAndSetNewPortState];
</span><span class="cx">     if (portState) {
</span><span class="cx">         [self setWindowIfNecessary];
</span></span></pre>
</div>
</div>

</body>
</html>