<!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>[178968] 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/178968">178968</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-22 16:18:35 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] No plugin content on some sites.
https://bugs.webkit.org/show_bug.cgi?id=140780
Patch by peavo@outlook.com <peavo@outlook.com> on 2015-01-22
Reviewed by Anders Carlsson.
Source/WebCore:
Return script instance from ScriptController::createScriptInstanceForWidget(),
instead of always returning null.
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::createScriptInstanceForWidget):
* plugins/PluginViewBase.h:
(WebCore::PluginViewBase::bindingInstance):
Source/WebKit/win:
Add override modifier to bindingInstance method.
* Plugins/PluginView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewBaseh">trunk/Source/WebCore/plugins/PluginViewBase.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</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 (178967 => 178968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-23 00:17:13 UTC (rev 178967)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 00:18:35 UTC (rev 178968)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-22 peavo@outlook.com <peavo@outlook.com>
+
+ [Win] No plugin content on some sites.
+ https://bugs.webkit.org/show_bug.cgi?id=140780
+
+ Reviewed by Anders Carlsson.
+
+ Return script instance from ScriptController::createScriptInstanceForWidget(),
+ instead of always returning null.
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::createScriptInstanceForWidget):
+ * plugins/PluginViewBase.h:
+ (WebCore::PluginViewBase::bindingInstance):
+
</ins><span class="cx"> 2015-01-22 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][EME] Adopt changes to AVStreamSession class methods
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (178967 => 178968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-01-23 00:17:13 UTC (rev 178967)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-01-23 00:18:35 UTC (rev 178968)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><span class="cx"> #include "PageGroup.h"
</span><ins>+#include "PluginViewBase.h"
</ins><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -403,9 +404,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget*)
</del><ins>+PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget)
</ins><span class="cx"> {
</span><del>- return nullptr;
</del><ins>+ if (!is<PluginViewBase>(*widget))
+ return nullptr;
+
+ return downcast<PluginViewBase>(*widget).bindingInstance();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewBase.h (178967 => 178968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewBase.h 2015-01-23 00:17:13 UTC (rev 178967)
+++ trunk/Source/WebCore/plugins/PluginViewBase.h 2015-01-23 00:18:35 UTC (rev 178968)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #define PluginWidget_h
</span><span class="cx">
</span><span class="cx"> #include "AudioHardwareListener.h"
</span><ins>+#include "BridgeJSC.h"
</ins><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include "Widget.h"
</span><span class="lines">@@ -79,6 +80,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void setJavaScriptPaused(bool) { }
</span><span class="cx">
</span><ins>+ virtual PassRefPtr<JSC::Bindings::Instance> bindingInstance() { return nullptr; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit PluginViewBase(PlatformWidget widget = 0) : Widget(widget) { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178967 => 178968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-23 00:17:13 UTC (rev 178967)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-23 00:18:35 UTC (rev 178968)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-22 peavo@outlook.com <peavo@outlook.com>
+
+ [Win] No plugin content on some sites.
+ https://bugs.webkit.org/show_bug.cgi?id=140780
+
+ Reviewed by Anders Carlsson.
+
+ Add override modifier to bindingInstance method.
+
+ * Plugins/PluginView.h:
+
</ins><span class="cx"> 2015-01-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Expose missing editing features through WebView interface
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.h (178967 => 178968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.h 2015-01-23 00:17:13 UTC (rev 178967)
+++ trunk/Source/WebKit/win/Plugins/PluginView.h 2015-01-23 00:18:35 UTC (rev 178968)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> NPObject* npObject();
</span><span class="cx"> #endif
</span><del>- PassRefPtr<JSC::Bindings::Instance> bindingInstance();
</del><ins>+ virtual PassRefPtr<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>