<!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>[177942] 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/177942">177942</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 17:54:32 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PluginViewNone.cpp
https://bugs.webkit.org/show_bug.cgi?id=140107
Reviewed by Andreas Kling.
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* plugins/PluginViewNone.cpp: 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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepluginsPluginViewNonecpp">trunk/Source/WebCore/plugins/PluginViewNone.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -2774,12 +2774,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (NOT ENABLE_NETSCAPE_PLUGIN_API)
- list(APPEND WebCore_SOURCES
- plugins/PluginViewNone.cpp
- )
-endif ()
-
</del><span class="cx"> list(APPEND WebCore_CSS_PROPERTY_NAMES
</span><span class="cx"> ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-01-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove PluginViewNone.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=140107
+
+ Reviewed by Andreas Kling.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWin.cmake:
+ * WebCore.xcodeproj/project.pbxproj:
+ * plugins/PluginViewNone.cpp: Removed.
+
+2015-01-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Stop including PluginView.h from cross platform WebCore code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140105
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -246,8 +246,6 @@
</span><span class="cx"> platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
</span><span class="cx">
</span><span class="cx"> platform/text/enchant/TextCheckerEnchant.cpp
</span><del>-
- plugins/PluginViewNone.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (WTF_USE_GEOCLUE2)
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -191,8 +191,6 @@
</span><span class="cx"> platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/gtk/CredentialBackingStore.cpp
</span><del>-
- plugins/PluginViewNone.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCorePlatformGTK_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -81,10 +81,6 @@
</span><span class="cx"> plugins/win/PluginPackageWin.cpp
</span><span class="cx"> plugins/win/PluginViewWin.cpp
</span><span class="cx"> )
</span><del>-else ()
- list(APPEND WebCore_SOURCES
- plugins/PluginViewNone.cpp
- )
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -2375,7 +2375,6 @@
</span><span class="cx"> 76FB9FF919A73E3A00420562 /* JSAutocompleteErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FB9FF719A73E3A00420562 /* JSAutocompleteErrorEvent.h */; };
</span><span class="cx"> 76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FC2B0812370DA0006A991A /* DOMTokenList.cpp */; };
</span><span class="cx"> 76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FC2B0912370DA0006A991A /* DOMTokenList.h */; };
</span><del>- 76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FF17E211235673001D61B5 /* PluginViewNone.cpp */; };
</del><span class="cx"> 7728694E14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7728694B14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp */; };
</span><span class="cx"> 7728694F14F8882500F484DC /* EXTTextureFilterAnisotropic.h in Headers */ = {isa = PBXBuildFile; fileRef = 7728694C14F8882500F484DC /* EXTTextureFilterAnisotropic.h */; };
</span><span class="cx"> 7728698314FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7728698114FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.cpp */; };
</span><span class="lines">@@ -9550,7 +9549,6 @@
</span><span class="cx"> 76FC2B0812370DA0006A991A /* DOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMTokenList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 76FC2B0912370DA0006A991A /* DOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTokenList.h; sourceTree = "<group>"; };
</span><span class="cx"> 76FC2B0A12370DA0006A991A /* DOMTokenList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMTokenList.idl; sourceTree = "<group>"; };
</span><del>- 76FF17E211235673001D61B5 /* PluginViewNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginViewNone.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 7728694B14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTTextureFilterAnisotropic.cpp; path = canvas/EXTTextureFilterAnisotropic.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7728694C14F8882500F484DC /* EXTTextureFilterAnisotropic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTTextureFilterAnisotropic.h; path = canvas/EXTTextureFilterAnisotropic.h; sourceTree = "<group>"; };
</span><span class="cx"> 7728694D14F8882500F484DC /* EXTTextureFilterAnisotropic.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = EXTTextureFilterAnisotropic.idl; path = canvas/EXTTextureFilterAnisotropic.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -16233,7 +16231,6 @@
</span><span class="cx"> 1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */,
</span><span class="cx"> 1AA8798F11CBE846003C664F /* PluginStrategy.h */,
</span><span class="cx"> 0AFDAC3C10F5448C00E1F3D2 /* PluginViewBase.h */,
</span><del>- 76FF17E211235673001D61B5 /* PluginViewNone.cpp */,
</del><span class="cx"> );
</span><span class="cx"> path = plugins;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -29221,7 +29218,6 @@
</span><span class="cx"> 97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
</span><span class="cx"> 1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
</span><span class="cx"> 71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */,
</span><del>- 76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
</del><span class="cx"> B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */,
</span><span class="cx"> 5CFC4350192409E300A0D3B5 /* PointerLockController.cpp in Sources */,
</span><span class="cx"> A1E1154613015C4E0054AC8C /* PointLightSource.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewNonecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/plugins/PluginViewNone.cpp (177941 => 177942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewNone.cpp 2015-01-06 01:23:42 UTC (rev 177941)
+++ trunk/Source/WebCore/plugins/PluginViewNone.cpp 2015-01-06 01:54:32 UTC (rev 177942)
</span><span class="lines">@@ -1,156 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Kevin Ollivier <kevino@theolliviers.com> All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "PluginView.h"
-
-#include "BridgeJSC.h"
-#include <runtime/JSObject.h>
-
-using namespace WTF;
-
-namespace WebCore {
-
-void PluginView::setFocus(bool)
-{
-}
-
-void PluginView::show()
-{
-}
-
-void PluginView::hide()
-{
-}
-
-void PluginView::paint(GraphicsContext*, const IntRect&)
-{
-}
-
-void PluginView::handleKeyboardEvent(KeyboardEvent*)
-{
-}
-
-void PluginView::handleMouseEvent(MouseEvent*)
-{
-}
-
-void PluginView::setParent(ScrollView*)
-{
-}
-
-void PluginView::setNPWindowRect(const IntRect&)
-{
-}
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-NPError PluginView::handlePostReadFile(Vector<char>&, uint32_t, const char*)
-{
- return 0;
-}
-
-bool PluginView::platformGetValue(NPNVariable, void*, NPError*)
-{
- return false;
-}
-
-bool PluginView::platformGetValueStatic(NPNVariable, void*, NPError*)
-{
- return false;
-}
-
-void PluginView::invalidateRect(NPRect*)
-{
-}
-#endif
-
-void PluginView::invalidateRect(const IntRect&)
-{
-}
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void PluginView::invalidateRegion(NPRegion)
-{
-}
-#endif
-
-void PluginView::forceRedraw()
-{
-}
-
-bool PluginView::platformStart()
-{
- return true;
-}
-
-void PluginView::platformDestroy()
-{
-}
-
-void PluginView::setParentVisible(bool)
-{
-}
-
-void PluginView::updatePluginWidget()
-{
-}
-
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
-void PluginView::handleFocusInEvent()
-{
-}
-
-void PluginView::handleFocusOutEvent()
-{
-}
-#endif
-
-// The functions below are for platforms that do not use PluginView for plugins
-// due to architectural differences. The plan is to eventually have all
-// ports using PluginView, but until then, if new functions like this are
-// added, please make sure they have the proper platform #ifs so that changes
-// do not break ports who compile both this file and PluginView.cpp.
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void PluginView::keepAlive(NPP)
-{
-}
-#endif
-
-PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
-{
- return 0;
-}
-
-void PluginView::privateBrowsingStateChanged(bool)
-{
-}
-
-void PluginView::setJavaScriptPaused(bool)
-{
-}
-#endif
-
-} // namespace WebCore
</del></span></pre>
</div>
</div>
</body>
</html>