Diff
Modified: trunk/Source/WebKit2/ChangeLog (191471 => 191472)
--- 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)
@@ -1,5 +1,32 @@
2015-10-22 Anders Carlsson <ander...@apple.com>
+ 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 <ander...@apple.com>
+
CTTE WebContextMenuItemData
https://bugs.webkit.org/show_bug.cgi?id=150471
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (191471 => 191472)
--- 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)
@@ -40,7 +40,6 @@
Shared/cairo/ShareableBitmapCairo.cpp
- Shared/efl/NativeContextMenuItemEfl.cpp
Shared/efl/NativeWebKeyboardEventEfl.cpp
Shared/efl/NativeWebTouchEventEfl.cpp
Shared/efl/NativeWebWheelEventEfl.cpp
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (191471 => 191472)
--- 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)
@@ -63,7 +63,6 @@
Shared/cairo/ShareableBitmapCairo.cpp
Shared/gtk/ArgumentCodersGtk.cpp
- Shared/gtk/NativeContextMenuItemGtk.cpp
Shared/gtk/NativeWebKeyboardEventGtk.cpp
Shared/gtk/NativeWebMouseEventGtk.cpp
Shared/gtk/NativeWebTouchEventGtk.cpp
Deleted: trunk/Source/WebKit2/Shared/NativeContextMenuItem.h (191471 => 191472)
--- 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)
@@ -1,65 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (191471 => 191472)
--- 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)
@@ -40,12 +40,6 @@
{
}
-WebContextMenuItem::WebContextMenuItem(const WebCore::ContextMenuItem& coreItem)
- : m_webContextMenuItemData(coreItem)
-{
- m_nativeContextMenuItem = std::make_unique<NativeContextMenuItem>(coreItem);
-}
-
PassRefPtr<WebContextMenuItem> WebContextMenuItem::create(const String& title, bool enabled, API::Array* submenuItems)
{
size_t size = submenuItems->size();
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (191471 => 191472)
--- 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)
@@ -29,7 +29,6 @@
#if ENABLE(CONTEXT_MENUS)
#include "APIObject.h"
-#include "NativeContextMenuItem.h"
#include "WebContextMenuItemData.h"
namespace API {
@@ -49,11 +48,6 @@
return adoptRef(*new WebContextMenuItem(data));
}
- static PassRefPtr<WebContextMenuItem> create(const WebCore::ContextMenuItem& item)
- {
- return adoptRef(*new WebContextMenuItem(item));
- }
-
static PassRefPtr<WebContextMenuItem> create(const String& title, bool enabled, API::Array* submenuItems);
static WebContextMenuItem* separatorItem();
@@ -63,15 +57,11 @@
void setUserData(API::Object*);
const WebContextMenuItemData& data() { return m_webContextMenuItemData; }
- NativeContextMenuItem* nativeContextMenuItem() { return m_nativeContextMenuItem.get(); }
private:
WebContextMenuItem(const WebContextMenuItemData&);
- WebContextMenuItem(const WebCore::ContextMenuItem&);
WebContextMenuItemData m_webContextMenuItemData;
-
- std::unique_ptr<NativeContextMenuItem> m_nativeContextMenuItem;
};
} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/efl/NativeContextMenuItemEfl.cpp (191471 => 191472)
--- 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)
@@ -1,43 +0,0 @@
-/*
- * 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)
Deleted: trunk/Source/WebKit2/Shared/gtk/NativeContextMenuItemGtk.cpp (191471 => 191472)
--- 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)
@@ -1,43 +0,0 @@
-/*
- * 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)
Deleted: trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm (191471 => 191472)
--- 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)
@@ -1,45 +0,0 @@
-/*
- * 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)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191471 => 191472)
--- 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)
@@ -229,9 +229,6 @@
static RetainPtr<NSMenuItem> nsMenuItem(WebContextMenuProxyMac& contextMenuProxy, const RefPtr<WebContextMenuItem>& item)
{
- if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
- return nativeItem->nsMenuItem();
-
return nsMenuItem(contextMenuProxy, item->data());
}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191471 => 191472)
--- 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)
@@ -935,7 +935,6 @@
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */; };
51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */; };
51654EFE184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */; };
51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */; };
@@ -3121,8 +3120,6 @@
5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
- 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>"; };
5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseBackingStoreSQLite.cpp; sourceTree = "<group>"; };
51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStoreSQLite.h; sourceTree = "<group>"; };
@@ -4747,7 +4744,6 @@
C58CDF2C1887609F00871536 /* InteractionInformationAtPosition.h */,
1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
- 5163EA3F1ACC74820012D1E4 /* NativeContextMenuItem.h */,
2D50366A1BCDE17900E20BB3 /* NativeWebGestureEvent.h */,
C02BFF1512514FD8009CCBEA /* NativeWebKeyboardEvent.h */,
31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */,
@@ -6528,7 +6524,6 @@
CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */,
1AC75A1C1B33695E0056745B /* HangDetectionDisablerMac.mm */,
- 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */,
C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */,
2D50365D1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm */,
@@ -9586,7 +9581,6 @@
1AAB0379185A7C6A00EDF501 /* MessageSender.cpp in Sources */,
C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */,
C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */,
- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */,
2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
C02BFF1E1251502E009CCBEA /* NativeWebKeyboardEventMac.mm in Sources */,
31EA25D2134F78C0005B1452 /* NativeWebMouseEventMac.mm in Sources */,
