<!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>[169820] trunk/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/169820">169820</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 12:59:24 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't snapshot offscreen plugins that would normally be considered primary plugins after they are moved in view.
https://bugs.webkit.org/show_bug.cgi?id=133667.
<rdar://problem/16743250>
Reviewed by Tim Horton.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::PluginView):
(WebKit::PluginView::pluginSnapshotTimerFired):
Set the display state to Playing if the following is true:
The plugin in question is large enough to be considered the primary snapshot and either:
a) The maximum number of snapshot retries has been reached and no good snapshot has been found.
b) The plugin is moved to be on-screen while the snapshot attempts are in progress.
* WebProcess/Plugins/PluginView.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::plugInIntersectsSearchRect): Re-factor out intersection logic.
(WebKit::WebPage::plugInIsPrimarySize): Re-factor out primary plugin size logic.
(WebKit::WebPage::determinePrimarySnapshottedPlugIn): Use the above two methods here.
* WebProcess/WebPage/WebPage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169819 => 169820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-11 19:55:44 UTC (rev 169819)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-11 19:59:24 UTC (rev 169820)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-06-11 Roger Fong <roger_fong@apple.com>
+
+ Don't snapshot offscreen plugins that would normally be considered primary plugins after they are moved in view.
+ https://bugs.webkit.org/show_bug.cgi?id=133667.
+ <rdar://problem/16743250>
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::PluginView):
+ (WebKit::PluginView::pluginSnapshotTimerFired):
+ Set the display state to Playing if the following is true:
+ The plugin in question is large enough to be considered the primary snapshot and either:
+ a) The maximum number of snapshot retries has been reached and no good snapshot has been found.
+ b) The plugin is moved to be on-screen while the snapshot attempts are in progress.
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::plugInIntersectsSearchRect): Re-factor out intersection logic.
+ (WebKit::WebPage::plugInIsPrimarySize): Re-factor out primary plugin size logic.
+ (WebKit::WebPage::determinePrimarySnapshottedPlugIn): Use the above two methods here.
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2014-06-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move more WKPreferences to WKWebViewConfiguration
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (169819 => 169820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-11 19:55:44 UTC (rev 169819)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-11 19:59:24 UTC (rev 169820)
</span><span class="lines">@@ -286,6 +286,7 @@
</span><span class="cx"> , m_isWaitingUntilMediaCanStart(false)
</span><span class="cx"> , m_isBeingDestroyed(false)
</span><span class="cx"> , m_pluginProcessHasCrashed(false)
</span><ins>+ , m_didPlugInStartOffScreen(false)
</ins><span class="cx"> , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_npRuntimeObjectMap(this)
</span><span class="lines">@@ -1688,6 +1689,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_plugin);
</span><span class="cx">
</span><ins>+ HTMLPlugInImageElement* plugInImageElement = toHTMLPlugInImageElement(m_pluginElement.get());
+ bool isPlugInOnScreen = m_webPage->plugInIntersectsSearchRect(*plugInImageElement);
+ if (!m_countSnapshotRetries)
+ m_didPlugInStartOffScreen = !isPlugInOnScreen;
+
+ bool plugInCameOnScreen = isPlugInOnScreen && m_didPlugInStartOffScreen;
+ bool snapshotFound = false;
+
</ins><span class="cx"> if (m_plugin->supportsSnapshotting()) {
</span><span class="cx"> // Snapshot might be 0 if plugin size is 0x0.
</span><span class="cx"> RefPtr<ShareableBitmap> snapshot = m_plugin->snapshot();
</span><span class="lines">@@ -1695,19 +1704,25 @@
</span><span class="cx"> if (snapshot)
</span><span class="cx"> snapshotImage = snapshot->createImage();
</span><span class="cx"> m_pluginElement->updateSnapshot(snapshotImage.get());
</span><ins>+ bool snapshotIsAlmostSolidColor = isAlmostSolidColor(toBitmapImage(snapshotImage.get()));
+ snapshotFound = snapshotImage && !snapshotIsAlmostSolidColor;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> unsigned maximumSnapshotRetries = frame() ? frame()->settings().maximumPlugInSnapshotAttempts() : 0;
</span><del>- if (snapshotImage && isAlmostSolidColor(toBitmapImage(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) {
</del><ins>+ if (snapshotImage && snapshotIsAlmostSolidColor && m_countSnapshotRetries < maximumSnapshotRetries && !plugInCameOnScreen) {
</ins><span class="cx"> ++m_countSnapshotRetries;
</span><span class="cx"> m_pluginSnapshotTimer.restart();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>- // Even if there is no snapshot we still set the state to DisplayingSnapshot
- // since we just want to display the default empty box.
- m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot);
</del><ins>+ unsigned candidateArea = 0;
+ bool noSnapshotFoundAfterMaxRetries = m_countSnapshotRetries == frame()->settings().maximumPlugInSnapshotAttempts() && !isPlugInOnScreen && !snapshotFound;
+ if (m_webPage->plugInIsPrimarySize(*plugInImageElement, candidateArea)
+ && (noSnapshotFoundAfterMaxRetries || plugInCameOnScreen))
+ m_pluginElement->setDisplayState(HTMLPlugInElement::Playing);
+ else
+ m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::beginSnapshottingRunningPlugin()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (169819 => 169820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-11 19:55:44 UTC (rev 169819)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-11 19:59:24 UTC (rev 169820)
</span><span class="lines">@@ -238,6 +238,7 @@
</span><span class="cx"> bool m_isWaitingUntilMediaCanStart;
</span><span class="cx"> bool m_isBeingDestroyed;
</span><span class="cx"> bool m_pluginProcessHasCrashed;
</span><ins>+ bool m_didPlugInStartOffScreen;
</ins><span class="cx">
</span><span class="cx"> // Pending URLRequests that the plug-in has made.
</span><span class="cx"> Deque<RefPtr<URLRequest>> m_pendingURLRequests;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169819 => 169820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-11 19:55:44 UTC (rev 169819)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-11 19:59:24 UTC (rev 169820)
</span><span class="lines">@@ -4472,14 +4472,12 @@
</span><span class="cx"> if (!pluginRenderer || !pluginRenderer->isBox())
</span><span class="cx"> continue;
</span><span class="cx"> auto& pluginRenderBox = toRenderBox(*pluginRenderer);
</span><ins>+ if (!plugInIntersectsSearchRect(plugInImageElement))
+ continue;
+
</ins><span class="cx"> IntRect plugInRectRelativeToView = plugInImageElement.clientRect();
</span><del>- if (plugInRectRelativeToView.isEmpty())
- continue;
</del><span class="cx"> IntSize scrollOffset = mainFrame.view()->documentScrollOffsetRelativeToViewOrigin();
</span><span class="cx"> IntRect plugInRectRelativeToTopDocument(plugInRectRelativeToView.location() + scrollOffset, plugInRectRelativeToView.size());
</span><del>- if (!plugInRectRelativeToTopDocument.intersects(searchRect))
- continue;
-
</del><span class="cx"> HitTestResult hitTestResult(plugInRectRelativeToTopDocument.center());
</span><span class="cx"> mainRenderView.hitTest(request, hitTestResult);
</span><span class="cx">
</span><span class="lines">@@ -4504,14 +4502,9 @@
</span><span class="cx"> LOG(Plugins, "Primary Plug-In Detection: Plug-in is hidden by an image that is roughly aligned with it, autoplaying regardless of whether or not it's actually the primary plug-in.");
</span><span class="cx"> plugInImageElement.restartSnapshottedPlugIn();
</span><span class="cx"> }
</span><del>- if (pluginRenderBox.contentWidth() < primarySnapshottedPlugInMinimumWidth || pluginRenderBox.contentHeight() < primarySnapshottedPlugInMinimumHeight)
- continue;
</del><span class="cx">
</span><del>- LayoutUnit contentArea = pluginRenderBox.contentWidth() * pluginRenderBox.contentHeight();
- if (contentArea > candidatePlugInArea * primarySnapshottedPlugInSearchBucketSize) {
</del><ins>+ if (plugInIsPrimarySize(plugInImageElement, candidatePlugInArea))
</ins><span class="cx"> candidatePlugIn = &plugInImageElement;
</span><del>- candidatePlugInArea = contentArea;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!candidatePlugIn) {
</span><span class="lines">@@ -4547,6 +4540,40 @@
</span><span class="cx">
</span><span class="cx"> return (pageOrigin == m_primaryPlugInPageOrigin && pluginOrigin == m_primaryPlugInOrigin && mimeType == m_primaryPlugInMimeType);
</span><span class="cx"> }
</span><ins>+
+bool WebPage::plugInIntersectsSearchRect(HTMLPlugInImageElement& plugInImageElement)
+{
+ MainFrame& mainFrame = corePage()->mainFrame();
+ if (!mainFrame.view())
+ return false;
+ if (!mainFrame.view()->renderView())
+ return false;
+
+ IntRect searchRect = IntRect(IntPoint(), corePage()->mainFrame().view()->contentsSize());
+ searchRect.intersect(IntRect(IntPoint(), IntSize(primarySnapshottedPlugInSearchLimit, primarySnapshottedPlugInSearchLimit)));
+
+ IntRect plugInRectRelativeToView = plugInImageElement.clientRect();
+ if (plugInRectRelativeToView.isEmpty())
+ return false;
+ IntSize scrollOffset = mainFrame.view()->documentScrollOffsetRelativeToViewOrigin();
+ IntRect plugInRectRelativeToTopDocument(plugInRectRelativeToView.location() + scrollOffset, plugInRectRelativeToView.size());
+
+ return plugInRectRelativeToTopDocument.intersects(searchRect);
+}
+
+bool WebPage::plugInIsPrimarySize(WebCore::HTMLPlugInImageElement& plugInImageElement, unsigned& candidatePlugInArea)
+{
+ auto& pluginRenderBox = toRenderBox(*(plugInImageElement.renderer()));
+ if (pluginRenderBox.contentWidth() < primarySnapshottedPlugInMinimumWidth || pluginRenderBox.contentHeight() < primarySnapshottedPlugInMinimumHeight)
+ return false;
+
+ LayoutUnit contentArea = pluginRenderBox.contentWidth() * pluginRenderBox.contentHeight();
+ if (contentArea > candidatePlugInArea * primarySnapshottedPlugInSearchBucketSize) {
+ candidatePlugInArea = contentArea;
+ return true;
+ }
+ return false;
+}
</ins><span class="cx"> #endif // ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> WebPage::currentSelectionAsRange()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (169819 => 169820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-11 19:55:44 UTC (rev 169819)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-11 19:59:24 UTC (rev 169820)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class FrameView;
</span><span class="cx"> class HTMLPlugInElement;
</span><ins>+class HTMLPlugInImageElement;
</ins><span class="cx"> class IntPoint;
</span><span class="cx"> class KeyboardEvent;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -791,6 +792,8 @@
</span><span class="cx"> void determinePrimarySnapshottedPlugInTimerFired();
</span><span class="cx"> void resetPrimarySnapshottedPlugIn();
</span><span class="cx"> bool matchesPrimaryPlugIn(const String& pageOrigin, const String& pluginOrigin, const String& mimeType) const;
</span><ins>+ bool plugInIntersectsSearchRect(WebCore::HTMLPlugInImageElement& pluginImageElement);
+ bool plugInIsPrimarySize(WebCore::HTMLPlugInImageElement& pluginImageElement, unsigned &pluginArea);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> unsigned extendIncrementalRenderingSuppression();
</span></span></pre>
</div>
</div>
</body>
</html>