<!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>[191472] trunk/Source/WebKit2</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/191472">191472</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 14:14:06 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>NativeContextMenuItem isn't needed anymore, remove it
https://bugs.webkit.org/show_bug.cgi?id=150473
Reviewed by Tim Horton.
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* Shared/NativeContextMenuItem.h: Removed.
(WebKit::NativeContextMenuItem::~NativeContextMenuItem): Deleted.
(WebKit::NativeContextMenuItem::nsMenuItem): Deleted.
* Shared/WebContextMenuItem.cpp:
(WebKit::WebContextMenuItem::WebContextMenuItem): Deleted.
* Shared/WebContextMenuItem.h:
(WebKit::WebContextMenuItem::create): Deleted.
(WebKit::WebContextMenuItem::nativeContextMenuItem): Deleted.
* Shared/efl/NativeContextMenuItemEfl.cpp: Removed.
(WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
* Shared/gtk/NativeContextMenuItemGtk.cpp: Removed.
(WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
* Shared/mac/NativeContextMenuItem.mm: Removed.
(WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItem): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemcpp">trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemh">trunk/Source/WebKit2/Shared/WebContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedNativeContextMenuItemh">trunk/Source/WebKit2/Shared/NativeContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebKit2SharedeflNativeContextMenuItemEflcpp">trunk/Source/WebKit2/Shared/efl/NativeContextMenuItemEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkNativeContextMenuItemGtkcpp">trunk/Source/WebKit2/Shared/gtk/NativeContextMenuItemGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacNativeContextMenuItemmm">trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-10-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ NativeContextMenuItem isn't needed anymore, remove it
+ https://bugs.webkit.org/show_bug.cgi?id=150473
+
+ Reviewed by Tim Horton.
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * Shared/NativeContextMenuItem.h: Removed.
+ (WebKit::NativeContextMenuItem::~NativeContextMenuItem): Deleted.
+ (WebKit::NativeContextMenuItem::nsMenuItem): Deleted.
+ * Shared/WebContextMenuItem.cpp:
+ (WebKit::WebContextMenuItem::WebContextMenuItem): Deleted.
+ * Shared/WebContextMenuItem.h:
+ (WebKit::WebContextMenuItem::create): Deleted.
+ (WebKit::WebContextMenuItem::nativeContextMenuItem): Deleted.
+ * Shared/efl/NativeContextMenuItemEfl.cpp: Removed.
+ (WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
+ * Shared/gtk/NativeContextMenuItemGtk.cpp: Removed.
+ (WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
+ * Shared/mac/NativeContextMenuItem.mm: Removed.
+ (WebKit::NativeContextMenuItem::NativeContextMenuItem): Deleted.
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::nsMenuItem): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2015-10-22 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> CTTE WebContextMenuItemData
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150471
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><del>- Shared/efl/NativeContextMenuItemEfl.cpp
</del><span class="cx"> Shared/efl/NativeWebKeyboardEventEfl.cpp
</span><span class="cx"> Shared/efl/NativeWebTouchEventEfl.cpp
</span><span class="cx"> Shared/efl/NativeWebWheelEventEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><span class="cx"> Shared/gtk/ArgumentCodersGtk.cpp
</span><del>- Shared/gtk/NativeContextMenuItemGtk.cpp
</del><span class="cx"> Shared/gtk/NativeWebKeyboardEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebMouseEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebTouchEventGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeContextMenuItemh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/NativeContextMenuItem.h (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeContextMenuItem.h 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/NativeContextMenuItem.h 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#ifndef NativeContextMenuItem_h
-#define NativeContextMenuItem_h
-
-#if ENABLE(CONTEXT_MENUS)
-
-#if PLATFORM(COCOA)
-#include <wtf/RetainPtr.h>
-OBJC_CLASS NSMenuItem;
-#endif
-
-namespace WebCore {
-
-class ContextMenuItem;
-
-}
-
-namespace WebKit {
-
-class NativeContextMenuItem {
-public:
- NativeContextMenuItem(const WebCore::ContextMenuItem& coreItem);
-
- virtual ~NativeContextMenuItem() { }
-
-#if PLATFORM(COCOA)
- NSMenuItem *nsMenuItem() { return m_nsMenuItem.get(); }
-#endif
-
-private:
-
-#if PLATFORM(COCOA)
- RetainPtr<NSMenuItem> m_nsMenuItem;
-#endif
-
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
-#endif // NativeContextMenuItem_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -40,12 +40,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebContextMenuItem::WebContextMenuItem(const WebCore::ContextMenuItem& coreItem)
- : m_webContextMenuItemData(coreItem)
-{
- m_nativeContextMenuItem = std::make_unique<NativeContextMenuItem>(coreItem);
-}
-
</del><span class="cx"> PassRefPtr<WebContextMenuItem> WebContextMenuItem::create(const String& title, bool enabled, API::Array* submenuItems)
</span><span class="cx"> {
</span><span class="cx"> size_t size = submenuItems->size();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "NativeContextMenuItem.h"
</del><span class="cx"> #include "WebContextMenuItemData.h"
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -49,11 +48,6 @@
</span><span class="cx"> return adoptRef(*new WebContextMenuItem(data));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<WebContextMenuItem> create(const WebCore::ContextMenuItem& item)
- {
- return adoptRef(*new WebContextMenuItem(item));
- }
-
</del><span class="cx"> static PassRefPtr<WebContextMenuItem> create(const String& title, bool enabled, API::Array* submenuItems);
</span><span class="cx"> static WebContextMenuItem* separatorItem();
</span><span class="cx">
</span><span class="lines">@@ -63,15 +57,11 @@
</span><span class="cx"> void setUserData(API::Object*);
</span><span class="cx">
</span><span class="cx"> const WebContextMenuItemData& data() { return m_webContextMenuItemData; }
</span><del>- NativeContextMenuItem* nativeContextMenuItem() { return m_nativeContextMenuItem.get(); }
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebContextMenuItem(const WebContextMenuItemData&);
</span><del>- WebContextMenuItem(const WebCore::ContextMenuItem&);
</del><span class="cx">
</span><span class="cx"> WebContextMenuItemData m_webContextMenuItemData;
</span><del>-
- std::unique_ptr<NativeContextMenuItem> m_nativeContextMenuItem;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedeflNativeContextMenuItemEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/efl/NativeContextMenuItemEfl.cpp (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/efl/NativeContextMenuItemEfl.cpp 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/efl/NativeContextMenuItemEfl.cpp 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. 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. AND ITS CONTRIBUTORS ``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 ITS 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 "NativeContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/ContextMenuItem.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-NativeContextMenuItem::NativeContextMenuItem(const ContextMenuItem&)
-{
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkNativeContextMenuItemGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/NativeContextMenuItemGtk.cpp (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/NativeContextMenuItemGtk.cpp 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/gtk/NativeContextMenuItemGtk.cpp 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. 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. AND ITS CONTRIBUTORS ``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 ITS 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 "NativeContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/ContextMenuItem.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-NativeContextMenuItem::NativeContextMenuItem(const ContextMenuItem&)
-{
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacNativeContextMenuItemmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. 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. AND ITS CONTRIBUTORS ``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 ITS 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 "NativeContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/ContextMenuItem.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-NativeContextMenuItem::NativeContextMenuItem(const ContextMenuItem& coreItem)
- : m_nsMenuItem(coreItem.platformDescription())
-{
- ASSERT(m_nsMenuItem);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -229,9 +229,6 @@
</span><span class="cx">
</span><span class="cx"> static RetainPtr<NSMenuItem> nsMenuItem(WebContextMenuProxyMac& contextMenuProxy, const RefPtr<WebContextMenuItem>& item)
</span><span class="cx"> {
</span><del>- if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
- return nativeItem->nsMenuItem();
-
</del><span class="cx"> return nsMenuItem(contextMenuProxy, item->data());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191471 => 191472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-22 21:00:31 UTC (rev 191471)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-22 21:14:06 UTC (rev 191472)
</span><span class="lines">@@ -935,7 +935,6 @@
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
</span><span class="cx"> 5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
</span><span class="cx"> 5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
</span><del>- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */; };
</del><span class="cx"> 51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */; };
</span><span class="cx"> 51654EFE184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */; };
</span><span class="cx"> 51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */; };
</span><span class="lines">@@ -3121,8 +3120,6 @@
</span><span class="cx"> 5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
</span><span class="cx"> 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
</span><del>- 5163EA3F1ACC74820012D1E4 /* NativeContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeContextMenuItem.h; sourceTree = "<group>"; };
- 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeContextMenuItem.mm; sourceTree = "<group>"; };
</del><span class="cx"> 5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseBackingStoreSQLite.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStoreSQLite.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4747,7 +4744,6 @@
</span><span class="cx"> C58CDF2C1887609F00871536 /* InteractionInformationAtPosition.h */,
</span><span class="cx"> 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
</span><span class="cx"> 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
</span><del>- 5163EA3F1ACC74820012D1E4 /* NativeContextMenuItem.h */,
</del><span class="cx"> 2D50366A1BCDE17900E20BB3 /* NativeWebGestureEvent.h */,
</span><span class="cx"> C02BFF1512514FD8009CCBEA /* NativeWebKeyboardEvent.h */,
</span><span class="cx"> 31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */,
</span><span class="lines">@@ -6528,7 +6524,6 @@
</span><span class="cx"> CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
</span><span class="cx"> CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */,
</span><span class="cx"> 1AC75A1C1B33695E0056745B /* HangDetectionDisablerMac.mm */,
</span><del>- 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */,
</del><span class="cx"> C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
</span><span class="cx"> 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */,
</span><span class="cx"> 2D50365D1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm */,
</span><span class="lines">@@ -9586,7 +9581,6 @@
</span><span class="cx"> 1AAB0379185A7C6A00EDF501 /* MessageSender.cpp in Sources */,
</span><span class="cx"> C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */,
</span><span class="cx"> C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */,
</span><del>- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */,
</del><span class="cx"> 2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
</span><span class="cx"> C02BFF1E1251502E009CCBEA /* NativeWebKeyboardEventMac.mm in Sources */,
</span><span class="cx"> 31EA25D2134F78C0005B1452 /* NativeWebMouseEventMac.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>