<!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>[189651] trunk/Source</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/189651">189651</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-12 01:47:20 -0700 (Sat, 12 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove all uses of PassRefPtr in WebCore/plugins
https://bugs.webkit.org/show_bug.cgi?id=149055
Reviewed by Darin Adler.
* plugins/DOMMimeType.cpp:
(WebCore::DOMMimeType::DOMMimeType):
(WebCore::DOMMimeType::enabledPlugin):
* plugins/DOMMimeType.h:
(WebCore::DOMMimeType::create):
* plugins/DOMMimeTypeArray.cpp:
(WebCore::DOMMimeTypeArray::item):
* plugins/DOMMimeTypeArray.h:
* plugins/DOMPlugin.cpp:
(WebCore::DOMPlugin::item):
* plugins/DOMPlugin.h:
* plugins/DOMPluginArray.cpp:
(WebCore::DOMPluginArray::item):
* plugins/DOMPluginArray.h:
* plugins/PluginViewBase.h:
(WebCore::PluginViewBase::bindingInstance):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMMimeTypecpp">trunk/Source/WebCore/plugins/DOMMimeType.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMMimeTypeh">trunk/Source/WebCore/plugins/DOMMimeType.h</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMMimeTypeArraycpp">trunk/Source/WebCore/plugins/DOMMimeTypeArray.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMMimeTypeArrayh">trunk/Source/WebCore/plugins/DOMMimeTypeArray.h</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMPlugincpp">trunk/Source/WebCore/plugins/DOMPlugin.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMPluginh">trunk/Source/WebCore/plugins/DOMPlugin.h</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMPluginArraycpp">trunk/Source/WebCore/plugins/DOMPluginArray.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMPluginArrayh">trunk/Source/WebCore/plugins/DOMPluginArray.h</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewBaseh">trunk/Source/WebCore/plugins/PluginViewBase.h</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewh">trunk/Source/WebKit/win/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/ChangeLog 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-09-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><ins>+ Remove all uses of PassRefPtr in WebCore/plugins
+ https://bugs.webkit.org/show_bug.cgi?id=149055
+
+ Reviewed by Darin Adler.
+
+ * plugins/DOMMimeType.cpp:
+ (WebCore::DOMMimeType::DOMMimeType):
+ (WebCore::DOMMimeType::enabledPlugin):
+ * plugins/DOMMimeType.h:
+ (WebCore::DOMMimeType::create):
+ * plugins/DOMMimeTypeArray.cpp:
+ (WebCore::DOMMimeTypeArray::item):
+ * plugins/DOMMimeTypeArray.h:
+ * plugins/DOMPlugin.cpp:
+ (WebCore::DOMPlugin::item):
+ * plugins/DOMPlugin.h:
+ * plugins/DOMPluginArray.cpp:
+ (WebCore::DOMPluginArray::item):
+ * plugins/DOMPluginArray.h:
+ * plugins/PluginViewBase.h:
+ (WebCore::PluginViewBase::bindingInstance):
+
+2015-09-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
</ins><span class="cx"> Remove all uses of PassRefPtr in WebCore/accessibility and WebCore/fileapi
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149059
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMMimeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMMimeType.cpp (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMMimeType.cpp 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMMimeType.cpp 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DOMMimeType::DOMMimeType(PassRefPtr<PluginData> pluginData, Frame* frame, unsigned index)
</del><ins>+DOMMimeType::DOMMimeType(RefPtr<PluginData>&& pluginData, Frame* frame, unsigned index)
</ins><span class="cx"> : FrameDestructionObserver(frame)
</span><del>- , m_pluginData(pluginData)
</del><ins>+ , m_pluginData(WTF::move(pluginData))
</ins><span class="cx"> {
</span><span class="cx"> Vector<MimeClassInfo> mimes;
</span><span class="cx"> Vector<size_t> mimePluginIndices;
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> return m_mimeClassInfo.desc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DOMPlugin> DOMMimeType::enabledPlugin() const
</del><ins>+RefPtr<DOMPlugin> DOMMimeType::enabledPlugin() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frame || !m_frame->page() || !m_frame->page()->mainFrame().loader().subframeLoader().allowPlugins())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMMimeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMMimeType.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMMimeType.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMMimeType.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "FrameDestructionObserver.h"
</span><span class="cx"> #include "PluginData.h"
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -33,16 +32,16 @@
</span><span class="cx">
</span><span class="cx"> class DOMMimeType : public RefCounted<DOMMimeType>, public FrameDestructionObserver {
</span><span class="cx"> public:
</span><del>- static Ref<DOMMimeType> create(PassRefPtr<PluginData> pluginData, Frame* frame, unsigned index) { return adoptRef(*new DOMMimeType(pluginData, frame, index)); }
</del><ins>+ static Ref<DOMMimeType> create(RefPtr<PluginData>&& pluginData, Frame* frame, unsigned index) { return adoptRef(*new DOMMimeType(WTF::move(pluginData), frame, index)); }
</ins><span class="cx"> ~DOMMimeType();
</span><span class="cx">
</span><span class="cx"> String type() const;
</span><span class="cx"> String suffixes() const;
</span><span class="cx"> String description() const;
</span><del>- PassRefPtr<DOMPlugin> enabledPlugin() const;
</del><ins>+ RefPtr<DOMPlugin> enabledPlugin() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- DOMMimeType(PassRefPtr<PluginData>, Frame*, unsigned index);
</del><ins>+ DOMMimeType(RefPtr<PluginData>&&, Frame*, unsigned index);
</ins><span class="cx"> MimeClassInfo m_mimeClassInfo;
</span><span class="cx"> RefPtr<PluginData> m_pluginData;
</span><span class="cx"> PluginInfo m_pluginInfo;
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMMimeTypeArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMMimeTypeArray.cpp (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMMimeTypeArray.cpp 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMMimeTypeArray.cpp 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -55,18 +55,18 @@
</span><span class="cx"> return mimes.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DOMMimeType> DOMMimeTypeArray::item(unsigned index)
</del><ins>+RefPtr<DOMMimeType> DOMMimeTypeArray::item(unsigned index)
</ins><span class="cx"> {
</span><span class="cx"> PluginData* data = getPluginData();
</span><span class="cx"> if (!data)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Vector<MimeClassInfo> mimes;
</span><span class="cx"> Vector<size_t> mimePluginIndices;
</span><span class="cx"> data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
</span><span class="cx">
</span><span class="cx"> if (index >= mimes.size())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return DOMMimeType::create(data, m_frame, index);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMMimeTypeArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMMimeTypeArray.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMMimeTypeArray.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMMimeTypeArray.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "DOMMimeType.h"
</span><span class="cx"> #include "DOMWindowProperty.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx"> ~DOMMimeTypeArray();
</span><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><del>- PassRefPtr<DOMMimeType> item(unsigned index);
</del><ins>+ RefPtr<DOMMimeType> item(unsigned index);
</ins><span class="cx"> RefPtr<DOMMimeType> namedItem(const AtomicString& propertyName);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMPlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMPlugin.cpp (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMPlugin.cpp 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMPlugin.cpp 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> return m_pluginInfo.mimes.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DOMMimeType> DOMPlugin::item(unsigned index)
</del><ins>+RefPtr<DOMMimeType> DOMPlugin::item(unsigned index)
</ins><span class="cx"> {
</span><span class="cx"> if (index >= m_pluginInfo.mimes.size())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> MimeClassInfo mime = m_pluginInfo.mimes[index];
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (mimes[i] == mime && plugins[mimePluginIndices[i]] == m_pluginInfo)
</span><span class="cx"> return DOMMimeType::create(m_pluginData.get(), m_frame, i);
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMMimeType> DOMPlugin::namedItem(const AtomicString& propertyName)
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMPlugin.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMPlugin.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMPlugin.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><span class="cx">
</span><del>- PassRefPtr<DOMMimeType> item(unsigned index);
</del><ins>+ RefPtr<DOMMimeType> item(unsigned index);
</ins><span class="cx"> RefPtr<DOMMimeType> namedItem(const AtomicString& propertyName);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMPluginArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMPluginArray.cpp (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMPluginArray.cpp 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMPluginArray.cpp 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> return data->webVisiblePlugins().size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
</del><ins>+RefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
</ins><span class="cx"> {
</span><span class="cx"> PluginData* data = pluginData();
</span><span class="cx"> if (!data)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
</span><span class="cx"> if (index >= plugins.size())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return DOMPlugin::create(data, m_frame, plugins[index]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMPluginArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMPluginArray.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMPluginArray.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/DOMPluginArray.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "DOMPlugin.h"
</span><span class="cx"> #include "DOMWindowProperty.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx"> ~DOMPluginArray();
</span><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><del>- PassRefPtr<DOMPlugin> item(unsigned index);
</del><ins>+ RefPtr<DOMPlugin> item(unsigned index);
</ins><span class="cx"> RefPtr<DOMPlugin> namedItem(const AtomicString& propertyName);
</span><span class="cx">
</span><span class="cx"> void refresh(bool reload);
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewBase.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewBase.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebCore/plugins/PluginViewBase.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setJavaScriptPaused(bool) { }
</span><span class="cx">
</span><del>- virtual PassRefPtr<JSC::Bindings::Instance> bindingInstance() { return nullptr; }
</del><ins>+ virtual RefPtr<JSC::Bindings::Instance> bindingInstance() { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit PluginViewBase(PlatformWidget widget = 0) : Widget(widget) { }
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -670,18 +670,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
</del><ins>+RefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> NPObject* object = npObject();
</span><span class="cx"> if (!object)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (hasOneRef()) {
</span><span class="cx"> // The renderer for the PluginView was destroyed during the above call, and
</span><span class="cx"> // the PluginView will be destroyed when this function returns, so we
</span><span class="cx"> // return null.
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<JSC::Bindings::RootObject> root = m_parentFrame->script().createRootObject(this);
</span><span class="lines">@@ -689,9 +689,9 @@
</span><span class="cx">
</span><span class="cx"> _NPN_ReleaseObject(object);
</span><span class="cx">
</span><del>- return instance.release();
</del><ins>+ return instance;
</ins><span class="cx"> #else
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.h (189650 => 189651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.h 2015-09-12 08:45:51 UTC (rev 189650)
+++ trunk/Source/WebKit/win/Plugins/PluginView.h 2015-09-12 08:47:20 UTC (rev 189651)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> NPObject* npObject();
</span><span class="cx"> #endif
</span><del>- virtual PassRefPtr<JSC::Bindings::Instance> bindingInstance() override;
</del><ins>+ virtual RefPtr<JSC::Bindings::Instance> bindingInstance() override;
</ins><span class="cx">
</span><span class="cx"> PluginStatus status() const { return m_status; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>