<!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>[175105] branches/safari-600.3-branch/Source/WebKit2</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/175105">175105</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 02:22:38 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172646">r172646</a>. rdar://problem/18428706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175104 => 175105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:22:38 UTC (rev 175105)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-10-23 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172646.
+
+ 2014-08-15 Gavin Barraclough <barraclough@apple.com>
+
+ Fix plugin visibility check.
+ https://bugs.webkit.org/show_bug.cgi?id=135991
+
+ Unreviewed typo fix.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::PluginControllerProxy):
+ (WebKit::PluginControllerProxy::visibilityDidChange):
+ (WebKit::PluginControllerProxy::windowVisibilityChanged):
+ (WebKit::PluginControllerProxy::updateVisiblityActivity):
+ * PluginProcess/PluginControllerProxy.h:
+
+2014-10-23 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172645.
</span><span class="cx">
</span><span class="cx"> 2014-08-15 Gavin Barraclough <barraclough@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175104 => 175105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:22:38 UTC (rev 175105)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> , m_isPrivateBrowsingEnabled(creationParameters.isPrivateBrowsingEnabled)
</span><span class="cx"> , m_isAcceleratedCompositingEnabled(creationParameters.isAcceleratedCompositingEnabled)
</span><span class="cx"> , m_isInitializing(false)
</span><del>- , m_isVisibile(false)
- , m_isWindowVisibile(false)
</del><ins>+ , m_isVisible(false)
+ , m_isWindowVisible(false)
</ins><span class="cx"> , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint)
</span><span class="cx"> , m_pluginDestructionProtectCount(0)
</span><span class="cx"> , m_pluginDestroyTimer(RunLoop::main(), this, &PluginControllerProxy::destroy)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::visibilityDidChange(bool isVisible)
</span><span class="cx"> {
</span><del>- m_isVisibile = isVisible;
</del><ins>+ m_isVisible = isVisible;
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_plugin);
</span><span class="cx"> m_plugin->visibilityDidChange(isVisible);
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::windowVisibilityChanged(bool isVisible)
</span><span class="cx"> {
</span><del>- m_isWindowVisibile = isVisible;
</del><ins>+ m_isWindowVisible = isVisible;
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_plugin);
</span><span class="cx"> m_plugin->windowVisibilityChanged(isVisible);
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::updateVisiblityActivity()
</span><span class="cx"> {
</span><del>- if (m_isVisibile && m_isWindowVisibile)
</del><ins>+ if (m_isVisible && m_isWindowVisible)
</ins><span class="cx"> m_visiblityActivity.start();
</span><span class="cx"> else
</span><span class="cx"> m_visiblityActivity.stop();
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175104 => 175105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:22:38 UTC (rev 175105)
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> bool m_isPrivateBrowsingEnabled;
</span><span class="cx"> bool m_isAcceleratedCompositingEnabled;
</span><span class="cx"> bool m_isInitializing;
</span><del>- bool m_isVisibile;
- bool m_isWindowVisibile;
</del><ins>+ bool m_isVisible;
+ bool m_isWindowVisible;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> m_initializationReply;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>