<!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>[176420] 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/176420">176420</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 14:56:22 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebPlugInClient::m_webPage can never be null, use a reference
https://bugs.webkit.org/show_bug.cgi?id=138937
Reviewed by Andreas Kling.
* WebProcess/WebCoreSupport/WebPlugInClient.cpp:
(WebKit::WebPlugInClient::WebPlugInClient):
(WebKit::WebPlugInClient::shouldAutoStartFromOrigin):
* WebProcess/WebCoreSupport/WebPlugInClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
* WebProcess/WebProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-20 Anders Carlsson <andersca@apple.com>
+
+ WebPlugInClient::m_webPage can never be null, use a reference
+ https://bugs.webkit.org/show_bug.cgi?id=138937
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebCoreSupport/WebPlugInClient.cpp:
+ (WebKit::WebPlugInClient::WebPlugInClient):
+ (WebKit::WebPlugInClient::shouldAutoStartFromOrigin):
+ * WebProcess/WebCoreSupport/WebPlugInClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
+ * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2014-11-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> TextIndicator should have getters for TextIndicator::Data properties
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -33,8 +33,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebPlugInClient::WebPlugInClient(WebPage* page)
- : m_page(page)
</del><ins>+WebPlugInClient::WebPlugInClient(WebPage& webPage)
+ : m_webPage(webPage)
+
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebPlugInClient::shouldAutoStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</span><span class="cx"> {
</span><del>- return WebProcess::shared().shouldPlugInAutoStartFromOrigin(m_page, pageOrigin, pluginOrigin, mimeType);
</del><ins>+ return WebProcess::shared().shouldPlugInAutoStartFromOrigin(m_webPage, pageOrigin, pluginOrigin, mimeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlugInClient::didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID sessionID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -35,14 +35,15 @@
</span><span class="cx">
</span><span class="cx"> class WebPlugInClient : public WebCore::PlugInClient {
</span><span class="cx"> public:
</span><del>- WebPlugInClient(WebPage*);
</del><ins>+ explicit WebPlugInClient(WebPage&);
</ins><span class="cx"> virtual ~WebPlugInClient();
</span><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> virtual void pageDestroyed();
</span><span class="cx"> virtual bool shouldAutoStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</span><span class="cx"> virtual void didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</span><span class="cx">
</span><del>- WebPage* m_page;
</del><ins>+ WebPage& m_webPage;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> #if USE(AUTOCORRECTION_PANEL)
</span><span class="cx"> pageClients.alternativeTextClient = new WebAlternativeTextClient(this);
</span><span class="cx"> #endif
</span><del>- pageClients.plugInClient = new WebPlugInClient(this);
</del><ins>+ pageClients.plugInClient = new WebPlugInClient(*this);
</ins><span class="cx"> pageClients.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageClients.progressTrackerClient = new WebProgressTrackerClient(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -765,21 +765,21 @@
</span><span class="cx"> return currentTime() < it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebProcess::shouldPlugInAutoStartFromOrigin(const WebPage* page, const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</del><ins>+bool WebProcess::shouldPlugInAutoStartFromOrigin(WebPage& webPage, const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</ins><span class="cx"> {
</span><span class="cx"> if (!pluginOrigin.isEmpty() && m_plugInAutoStartOrigins.contains(pluginOrigin))
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #ifdef ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC
</span><span class="cx"> // The plugin wasn't in the general whitelist, so check if it similar to the primary plugin for the page (if we've found one).
</span><del>- if (page && page->matchesPrimaryPlugIn(pageOrigin, pluginOrigin, mimeType))
</del><ins>+ if (webPage.matchesPrimaryPlugIn(pageOrigin, pluginOrigin, mimeType))
</ins><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Lastly check against the more explicit hash list.
</span><del>- return isPlugInAutoStartOriginHash(hashForPlugInOrigin(pageOrigin, pluginOrigin, mimeType), page->sessionID());
</del><ins>+ return isPlugInAutoStartOriginHash(hashForPlugInOrigin(pageOrigin, pluginOrigin, mimeType), webPage.sessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, SessionID sessionID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (176419 => 176420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-11-20 22:33:07 UTC (rev 176419)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-11-20 22:56:22 UTC (rev 176420)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> bool needsQuickLookResourceCachingQuirks() const { return m_needsQuickLookResourceCachingQuirks; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldPlugInAutoStartFromOrigin(const WebPage*, const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</del><ins>+ bool shouldPlugInAutoStartFromOrigin(WebPage&, const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</ins><span class="cx"> void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</span><span class="cx"> void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>