<!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>[177941] trunk/Source/WebCore</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/177941">177941</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 17:23:42 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop including PluginView.h from cross platform WebCore code
https://bugs.webkit.org/show_bug.cgi?id=140105
Reviewed by Andreas Kling.
Instead, include PluginViewBase.h. This will allow us to move the old plug-in implementation to WebKit.
* bindings/js/ScriptController.cpp:
* bridge/NP_jsobject.cpp:
(_NPN_Evaluate):
* inspector/PageScriptDebugServer.cpp:
(WebCore::PageScriptDebugServer::setJavaScriptPaused):
* loader/FrameLoaderClient.h:
* page/Page.cpp:
* plugins/PluginViewBase.h:
(WebCore::PluginViewBase::setJavaScriptPaused):</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="#trunkSourceWebCorebridgeNP_jsobjectcpp">trunk/Source/WebCore/bridge/NP_jsobject.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageScriptDebugServercpp">trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewBaseh">trunk/Source/WebCore/plugins/PluginViewBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Stop including PluginView.h from cross platform WebCore code
+ https://bugs.webkit.org/show_bug.cgi?id=140105
+
+ Reviewed by Andreas Kling.
+
+ Instead, include PluginViewBase.h. This will allow us to move the old plug-in implementation to WebKit.
+
+ * bindings/js/ScriptController.cpp:
+ * bridge/NP_jsobject.cpp:
+ (_NPN_Evaluate):
+ * inspector/PageScriptDebugServer.cpp:
+ (WebCore::PageScriptDebugServer::setJavaScriptPaused):
+ * loader/FrameLoaderClient.h:
+ * page/Page.cpp:
+ * plugins/PluginViewBase.h:
+ (WebCore::PluginViewBase::setJavaScriptPaused):
+
+2015-01-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Introduce a per-page database provider class
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140102
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><span class="cx"> #include "PageGroup.h"
</span><del>-#include "PluginView.h"
</del><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -408,10 +407,7 @@
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget)
</span><span class="cx"> {
</span><del>- if (!widget->isPluginView())
- return 0;
-
- return toPluginView(widget)->bindingInstance();
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeNP_jsobjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/NP_jsobject.cpp (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/NP_jsobject.cpp 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/bridge/NP_jsobject.cpp 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "NP_jsobject.h"
</span><span class="cx">
</span><del>-#include "PluginView.h"
</del><span class="cx"> #include "c_utility.h"
</span><span class="cx"> #include "c_instance.h"
</span><span class="cx"> #include "IdentifierRep.h"
</span><span class="lines">@@ -252,7 +251,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool _NPN_Evaluate(NPP instance, NPObject* o, NPString* s, NPVariant* variant)
</del><ins>+bool _NPN_Evaluate(NPP, NPObject* o, NPString* s, NPVariant* variant)
</ins><span class="cx"> {
</span><span class="cx"> if (o->_class == NPScriptObjectClass) {
</span><span class="cx"> JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
</span><span class="lines">@@ -261,10 +260,6 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // There is a crash in Flash when evaluating a script that destroys the
- // PluginView, so we destroy it asynchronously.
- PluginView::keepAlive(instance);
-
</del><span class="cx"> ExecState* exec = rootObject->globalObject()->globalExec();
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx"> String scriptString = convertNPStringToUTF16(s);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -36,10 +36,9 @@
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageGroup.h"
</span><del>-#include "PluginView.h"
</del><ins>+#include "PluginViewBase.h"
</ins><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include "Widget.h"
</del><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -192,11 +191,11 @@
</span><span class="cx"> if (!view)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto it = view->children().begin(), end = view->children().end(); it != end; ++it) {
- Widget* widget = (*it).get();
- if (!widget->isPluginView())
</del><ins>+ for (auto& child : view->children()) {
+ if (!is<PluginViewBase>(*child))
</ins><span class="cx"> continue;
</span><del>- toPluginView(widget)->setJavaScriptPaused(paused);
</del><ins>+
+ downcast<PluginViewBase>(*child).setJavaScriptPaused(paused);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> class NavigationAction;
</span><span class="cx"> class Page;
</span><span class="cx"> class ProtectionSpace;
</span><del>- class PluginView;
</del><ins>+ class PluginViewBase;
</ins><span class="cx"> class PolicyChecker;
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceHandle;
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
</span><span class="cx">
</span><del>- virtual void dispatchDidFailToStartPlugin(const PluginView*) const { }
</del><ins>+ virtual void dispatchDidFailToStartPlugin(const PluginViewBase*) const { }
</ins><span class="cx">
</span><span class="cx"> virtual ObjectContentType objectContentType(const URL&, const String& mimeType, bool shouldPreferPlugInsForImages) = 0;
</span><span class="cx"> virtual String overrideMediaType() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/page/Page.cpp 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> #include "PageThrottler.h"
</span><span class="cx"> #include "PlugInClient.h"
</span><span class="cx"> #include "PluginData.h"
</span><del>-#include "PluginView.h"
</del><ins>+#include "PluginViewBase.h"
</ins><span class="cx"> #include "PointerLockController.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewBase.h (177940 => 177941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewBase.h 2015-01-06 00:53:03 UTC (rev 177940)
+++ trunk/Source/WebCore/plugins/PluginViewBase.h 2015-01-06 01:23:42 UTC (rev 177941)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx">
</span><span class="cx"> virtual AudioHardwareActivityType audioHardwareActivity() const { return AudioHardwareActivityType::Unknown; }
</span><span class="cx">
</span><ins>+ virtual void setJavaScriptPaused(bool) { }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit PluginViewBase(PlatformWidget widget = 0) : Widget(widget) { }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>