<!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>[167016] 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/167016">167016</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-09 09:53:26 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Plugin process crashes when loading totem plugin
https://bugs.webkit.org/show_bug.cgi?id=131357
Reviewed by Martin Robinson.
Remove netscape plugin implementation from WebCore that was only
used by WebKit1. This removes the conflict between the WebCore NPN
symbols and the ones used by the plugins.
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWin.cmake:
* plugins/PluginViewNone.cpp:
* plugins/gtk/PluginPackageGtk.cpp: Removed.
* plugins/gtk/PluginViewGtk.cpp: Removed.
* plugins/gtk/gtk2xtbin.c: Removed.
* plugins/gtk/gtk2xtbin.h: Removed.
* plugins/gtk/xembed.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewNonecpp">trunk/Source/WebCore/plugins/PluginViewNone.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebCore/plugins/gtk/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -2081,7 +2081,6 @@
</span><span class="cx"> plugins/PluginDebug.cpp
</span><span class="cx"> plugins/PluginMainThreadScheduler.cpp
</span><span class="cx"> plugins/PluginStream.cpp
</span><del>- plugins/PluginView.cpp
</del><span class="cx">
</span><span class="cx"> rendering/AutoTableLayout.cpp
</span><span class="cx"> rendering/BidiRun.cpp
</span><span class="lines">@@ -2608,13 +2607,8 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_NETSCAPE_PLUGIN_API)
</del><ins>+if (NOT ENABLE_NETSCAPE_PLUGIN_API)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><del>- plugins/PluginPackage.cpp
- plugins/npapi.cpp
- )
-else ()
- list(APPEND WebCore_SOURCES
</del><span class="cx"> plugins/PluginPackageNone.cpp
</span><span class="cx"> plugins/PluginViewNone.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/ChangeLog 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-09 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Plugin process crashes when loading totem plugin
+ https://bugs.webkit.org/show_bug.cgi?id=131357
+
+ Reviewed by Martin Robinson.
+
+ Remove netscape plugin implementation from WebCore that was only
+ used by WebKit1. This removes the conflict between the WebCore NPN
+ symbols and the ones used by the plugins.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWin.cmake:
+ * plugins/PluginViewNone.cpp:
+ * plugins/gtk/PluginPackageGtk.cpp: Removed.
+ * plugins/gtk/PluginViewGtk.cpp: Removed.
+ * plugins/gtk/gtk2xtbin.c: Removed.
+ * plugins/gtk/gtk2xtbin.h: Removed.
+ * plugins/gtk/xembed.h: Removed.
+
</ins><span class="cx"> 2014-04-09 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> fullscreen controls first show a play button instead of a pause button
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -193,6 +193,10 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><ins>+ plugins/PluginPackage.cpp
+ plugins/PluginView.cpp
+ plugins/npapi.cpp
+
</ins><span class="cx"> plugins/efl/PluginPackageEfl.cpp
</span><span class="cx"> plugins/efl/PluginViewEfl.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/icu"
</span><del>- "${WEBCORE_DIR}/plugins/gtk"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="lines">@@ -140,6 +139,9 @@
</span><span class="cx"> platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/gtk/CredentialBackingStore.cpp
</span><ins>+
+ plugins/PluginPackageNone.cpp
+ plugins/PluginViewNone.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCorePlatformGTK_SOURCES
</span><span class="lines">@@ -252,29 +254,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_NETSCAPE_PLUGIN_API)
- list(APPEND WebCore_SOURCES
- plugins/PluginDatabase.cpp
- plugins/PluginDebug.cpp
- plugins/PluginPackage.cpp
- plugins/PluginStream.cpp
- plugins/PluginView.cpp
- )
-
- list(APPEND WebCorePlatformGTK_SOURCES
- plugins/gtk/PluginPackageGtk.cpp
- plugins/gtk/PluginViewGtk.cpp
- plugins/gtk/gtk2xtbin.c
-
- plugins/x11/PluginViewX11.cpp
- )
-else ()
- list(APPEND WebCore_SOURCES
- plugins/PluginPackageNone.cpp
- plugins/PluginViewNone.cpp
- )
-endif ()
-
</del><span class="cx"> list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
</span><span class="cx"> ${WEBCORE_DIR}/css/mediaControlsGtk.css
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/PlatformWin.cmake 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> plugins/PluginView.cpp
</span><ins>+ plugins/npapi.cpp
</ins><span class="cx">
</span><span class="cx"> plugins/win/PluginMessageThrottlerWin.cpp
</span><span class="cx"> plugins/win/PluginPackageWin.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewNone.cpp (167015 => 167016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-04-09 16:47:19 UTC (rev 167015)
+++ trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-04-09 16:53:26 UTC (rev 167016)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> // ports using PluginView, but until then, if new functions like this are
</span><span class="cx"> // added, please make sure they have the proper platform #ifs so that changes
</span><span class="cx"> // do not break ports who compile both this file and PluginView.cpp.
</span><del>-#if PLATFORM(COCOA) || PLATFORM(EFL) || OS(WINCE)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK) || OS(WINCE)
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void PluginView::keepAlive(NPP)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>