Enable cross-platform context menus by default
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Nov 2015 20:06:41 +0000 (20:06 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Nov 2015 20:06:41 +0000 (20:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151173

Reviewed by Tim Horton.

.:

* Source/cmake/OptionsEfl.cmake:

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSInspectorFrontendHostCustom.cpp:
(WebCore::JSInspectorFrontendHost::showContextMenu):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::addInspectElementItem): Deleted.
* platform/ContextMenu.cpp:
* platform/ContextMenu.h:
* platform/ContextMenuItem.cpp:
* platform/ContextMenuItem.h:
(WebCore::ContextMenuItem::isNull): Deleted.
* platform/mac/ContextMenuItemMac.mm: Removed.
(WebCore::menuToArray): Deleted.
(WebCore::ContextMenuItem::ContextMenuItem): Deleted.
(WebCore::createPlatformMenuItemDescription): Deleted.
(WebCore::ContextMenuItem::~ContextMenuItem): Deleted.
(WebCore::ContextMenuItem::platformDescription): Deleted.
(WebCore::ContextMenuItem::type): Deleted.
(WebCore::ContextMenuItem::action): Deleted.
(WebCore::ContextMenuItem::title): Deleted.
(WebCore::ContextMenuItem::platformSubMenu): Deleted.
(WebCore::ContextMenuItem::setType): Deleted.
(WebCore::ContextMenuItem::setAction): Deleted.
(WebCore::ContextMenuItem::setTitle): Deleted.
(WebCore::ContextMenuItem::setSubMenu): Deleted.
(WebCore::ContextMenuItem::setChecked): Deleted.
(WebCore::ContextMenuItem::setEnabled): Deleted.
(WebCore::ContextMenuItem::enabled): Deleted.
(WebCore::ContextMenuItem::checked): Deleted.
* platform/mac/ContextMenuMac.mm: Removed.
(WebCore::ContextMenu::ContextMenu): Deleted.
(WebCore::ContextMenu::~ContextMenu): Deleted.
(WebCore::ContextMenu::appendItem): Deleted.
(WebCore::ContextMenu::insertItem): Deleted.
(WebCore::ContextMenu::itemCount): Deleted.
(WebCore::ContextMenu::setPlatformDescription): Deleted.
(WebCore::ContextMenu::platformDescription): Deleted.
(WebCore::ContextMenu::releasePlatformDescription): Deleted.
(WebCore::contextMenuItemVector): Deleted.
(WebCore::platformMenuDescription): Deleted.

Source/WebKit/mac:

* WebView/WebHTMLView.mm:
(createMenuItem):
(customMenuFromDefaultItems):

Source/WebKit2:

* Shared/WebContextMenuItemData.cpp:
(WebKit::WebContextMenuItemData::WebContextMenuItemData): Deleted.
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::menuItemsWithUserData): Deleted.

Source/WTF:

* wtf/Platform.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

19 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
Source/WebCore/page/ContextMenuController.cpp
Source/WebCore/platform/ContextMenu.cpp
Source/WebCore/platform/ContextMenu.h
Source/WebCore/platform/ContextMenuItem.cpp
Source/WebCore/platform/ContextMenuItem.h
Source/WebCore/platform/mac/ContextMenuItemMac.mm [deleted file]
Source/WebCore/platform/mac/ContextMenuMac.mm [deleted file]
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebContextMenuItemData.cpp
Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
Source/cmake/OptionsEfl.cmake

index b977606..2ba1d4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        Enable cross-platform context menus by default
+        https://bugs.webkit.org/show_bug.cgi?id=151173
+
+        Reviewed by Tim Horton.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2015-11-12  Csaba Osztrogonác  <ossy@webkit.org>
 
         Remove ENABLE(SATURATED_LAYOUT_ARITHMETIC) guards
index 11b190c..fe2346e 100644 (file)
@@ -1,3 +1,12 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        Enable cross-platform context menus by default
+        https://bugs.webkit.org/show_bug.cgi?id=151173
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2015-11-12  Csaba Osztrogonác  <ossy@webkit.org>
 
         Remove ENABLE(SATURATED_LAYOUT_ARITHMETIC) guards
index fbe6280..d4e8192 100644 (file)
 /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
 #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
 
-#if PLATFORM(WIN) || PLATFORM(GTK)
-#define USE_CROSS_PLATFORM_CONTEXT_MENUS 1
-#endif
-
 #if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
 #define USE_ACCESSIBILITY_CONTEXT_MENUS 1
 #endif
index f8b8cb1..96f42d1 100644 (file)
@@ -1,3 +1,50 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        Enable cross-platform context menus by default
+        https://bugs.webkit.org/show_bug.cgi?id=151173
+
+        Reviewed by Tim Horton.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSInspectorFrontendHostCustom.cpp:
+        (WebCore::JSInspectorFrontendHost::showContextMenu):
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::addInspectElementItem): Deleted.
+        * platform/ContextMenu.cpp:
+        * platform/ContextMenu.h:
+        * platform/ContextMenuItem.cpp:
+        * platform/ContextMenuItem.h:
+        (WebCore::ContextMenuItem::isNull): Deleted.
+        * platform/mac/ContextMenuItemMac.mm: Removed.
+        (WebCore::menuToArray): Deleted.
+        (WebCore::ContextMenuItem::ContextMenuItem): Deleted.
+        (WebCore::createPlatformMenuItemDescription): Deleted.
+        (WebCore::ContextMenuItem::~ContextMenuItem): Deleted.
+        (WebCore::ContextMenuItem::platformDescription): Deleted.
+        (WebCore::ContextMenuItem::type): Deleted.
+        (WebCore::ContextMenuItem::action): Deleted.
+        (WebCore::ContextMenuItem::title): Deleted.
+        (WebCore::ContextMenuItem::platformSubMenu): Deleted.
+        (WebCore::ContextMenuItem::setType): Deleted.
+        (WebCore::ContextMenuItem::setAction): Deleted.
+        (WebCore::ContextMenuItem::setTitle): Deleted.
+        (WebCore::ContextMenuItem::setSubMenu): Deleted.
+        (WebCore::ContextMenuItem::setChecked): Deleted.
+        (WebCore::ContextMenuItem::setEnabled): Deleted.
+        (WebCore::ContextMenuItem::enabled): Deleted.
+        (WebCore::ContextMenuItem::checked): Deleted.
+        * platform/mac/ContextMenuMac.mm: Removed.
+        (WebCore::ContextMenu::ContextMenu): Deleted.
+        (WebCore::ContextMenu::~ContextMenu): Deleted.
+        (WebCore::ContextMenu::appendItem): Deleted.
+        (WebCore::ContextMenu::insertItem): Deleted.
+        (WebCore::ContextMenu::itemCount): Deleted.
+        (WebCore::ContextMenu::setPlatformDescription): Deleted.
+        (WebCore::ContextMenu::platformDescription): Deleted.
+        (WebCore::ContextMenu::releasePlatformDescription): Deleted.
+        (WebCore::contextMenuItemVector): Deleted.
+        (WebCore::platformMenuDescription): Deleted.
+
 2015-11-12  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Cocoa] Font fallback is not language-sensitive
index 24e6898..9eb6a62 100644 (file)
@@ -56,7 +56,6 @@
                05D913CEEAB2A60534218ACF /* MathMLMencloseElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3E61C653A64807A83E76FB8 /* MathMLMencloseElement.cpp */; };
                05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
                06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */; };
                062287840B4DB322000C34DF /* FocusDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 062287830B4DB322000C34DF /* FocusDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
                065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */; };
                1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */; };
                1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
+               1AB40EE11BF427D600BA81BE /* ContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */; };
+               1AB40EE21BF427DB00BA81BE /* ContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */; };
                1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
                1AB5EBD2194A50F30059AC70 /* HTTPHeaderNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC900C21943C0A0008625B5 /* HTTPHeaderNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB7FC680A8B92EC00D9D37B /* XPathEvaluator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */; };
                93B2D8160F9920D2006AE6B2 /* SuddenTermination.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B2D8150F9920D2006AE6B2 /* SuddenTermination.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B2D8180F9920EE006AE6B2 /* SuddenTermination.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B2D8170F9920EE006AE6B2 /* SuddenTermination.mm */; };
                93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */; };
                93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */; };
                93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B70D6909EB0C7C009D8468 /* JSEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4D09EB0C7C009D8468 /* JSEventListener.cpp */; };
                0562F9601573F88F0031CA16 /* PlatformLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformLayer.h; sourceTree = "<group>"; };
                05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; };
                06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; };
-               06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuItemMac.mm; sourceTree = "<group>"; };
                062287830B4DB322000C34DF /* FocusDirection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusDirection.h; sourceTree = "<group>"; };
                065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuClient.h; sourceTree = "<group>"; };
                065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ContextMenuController.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
                1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeNode.cpp; sourceTree = "<group>"; };
                1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeNode.h; sourceTree = "<group>"; };
                1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+               1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenu.cpp; sourceTree = "<group>"; };
+               1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenuItem.cpp; sourceTree = "<group>"; };
                1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeValue.cpp; sourceTree = "<group>"; };
                1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; };
                1AB7FC480A8B92EC00D9D37B /* XPathEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XPathEvaluator.h; sourceTree = "<group>"; };
                93B2D8150F9920D2006AE6B2 /* SuddenTermination.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SuddenTermination.h; sourceTree = "<group>"; };
                93B2D8170F9920EE006AE6B2 /* SuddenTermination.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SuddenTermination.mm; sourceTree = "<group>"; };
                93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenu.h; sourceTree = "<group>"; };
-               93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuMac.mm; sourceTree = "<group>"; };
                93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMBinding.cpp; sourceTree = "<group>"; };
                93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMBinding.h; sourceTree = "<group>"; };
                93B70D4D09EB0C7C009D8468 /* JSEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSEventListener.cpp; sourceTree = "<group>"; };
                1AE42F670AA4B8CB00C8612D /* cf */ = {
                        isa = PBXGroup;
                        children = (
-                               7AE6C9371BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp */,
                                E1A8E56417552B2A007488E7 /* CFURLExtras.cpp */,
                                E1A8E56517552B2A007488E7 /* CFURLExtras.h */,
                                443817FD1A91B2F8006E04F2 /* CoreMediaSoftLink.cpp */,
                                517A63C01B74317E00E7DCDC /* KeyedDecoderCF.h */,
                                517A63C11B74317E00E7DCDC /* KeyedEncoderCF.cpp */,
                                517A63C21B74317E00E7DCDC /* KeyedEncoderCF.h */,
+                               7AE6C9371BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp */,
                                5CBC8DAA1AAA302200E1C803 /* MediaAccessibilitySoftLink.cpp */,
                                5CBC8DAB1AAA302200E1C803 /* MediaAccessibilitySoftLink.h */,
                                2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */,
                                51D7236B1BB60BFE00478CA3 /* IDBResultData.h */,
                                5198F7AA1BBDD3E300E2CC5F /* IDBTransactionInfo.cpp */,
                                5198F7AB1BBDD3E300E2CC5F /* IDBTransactionInfo.h */,
-                               510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */,
-                               510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */,
                                517138ED1BED1D17000D5F01 /* IndexKey.cpp */,
                                517138EE1BED1D17000D5F01 /* IndexKey.h */,
+                               510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */,
+                               510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */,
                        );
                        path = shared;
                        sourceTree = "<group>";
                                07D6A4F21BED5F8800174146 /* MockRealtimeAudioSource.h */,
                                07D6A4ED1BECF2D200174146 /* MockRealtimeMediaSource.cpp */,
                                07D6A4EE1BECF2D200174146 /* MockRealtimeMediaSource.h */,
-                               07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */,
-                               07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */,
                                4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */,
                                4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */,
+                               07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */,
+                               07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */,
                                AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */,
                                AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */,
                                073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */,
                        children = (
                                65A640F00533BB1F0085E777 /* BlockExceptions.h */,
                                65F80697054D9F86008BF776 /* BlockExceptions.mm */,
-                               06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,
-                               93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */,
                                F58784F002DE375901EA4122 /* CursorMac.mm */,
                                A795463D0B5C4C80007B438F /* DragDataMac.mm */,
                                A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */,
                65BF02180974806300C43196 /* page */ = {
                        isa = PBXGroup;
                        children = (
-                               ADBAD6EC1BCDD95000381325 /* ResourceUsageOverlay.cpp */,
-                               ADBAD6ED1BCDD95000381325 /* ResourceUsageOverlay.h */,
                                316FE1060E6E1D8400BF6088 /* animation */,
                                5D5975B5196362BE00D00878 /* cocoa */,
                                18A6CD6F0D8F2025001DC3CE /* ios */,
                                3772B09516535856000A49CA /* PopupOpeningObserver.h */,
                                B776D43C1104527500BEB0EC /* PrintContext.cpp */,
                                B776D43A1104525D00BEB0EC /* PrintContext.h */,
+                               ADBAD6EC1BCDD95000381325 /* ResourceUsageOverlay.cpp */,
+                               ADBAD6ED1BCDD95000381325 /* ResourceUsageOverlay.h */,
                                BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */,
                                BCEC01BB0C274DAC009F4EC9 /* Screen.h */,
                                BCEC01BC0C274DAC009F4EC9 /* Screen.idl */,
                9348428019F1A9190009D5AE /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */,
-                               2D77AC271BF2B9860072470A /* NSApplicationSPI.h */,
                                07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */,
                                2D59F1BE1A0044C6001F3D29 /* DataDetectorsSPI.h */,
                                2D413F601A187A3F0041A521 /* LookupSPI.h */,
+                               2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */,
+                               2D77AC271BF2B9860072470A /* NSApplicationSPI.h */,
                                2DB9C4A91B3231F40070F27F /* NSEventSPI.h */,
                                1C6466271A12C3F90094603C /* NSFontSPI.h */,
                                9321D58F1A3906FA008052BE /* NSImmediateActionGestureRecognizerSPI.h */,
                BCF1A5BA097832090061A123 /* platform */ = {
                        isa = PBXGroup;
                        children = (
-                               7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */,
-                               7AE6C93A1BE0C60100E19E03 /* MainThreadSharedTimer.h */,
                                49E912A40EFAC8E6009D0CAF /* animation */,
                                FD31604012B026A300C1A359 /* audio */,
                                1AE42F670AA4B8CB00C8612D /* cf */,
                                A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */,
                                41D015C90F4B5C71004A662F /* ContentType.cpp */,
                                41D015C80F4B5C71004A662F /* ContentType.h */,
+                               1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */,
                                93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */,
+                               1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */,
                                06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */,
                                311C08BC18E35D6800B65615 /* ControlStates.h */,
                                D8B6152E1032495100C8554A /* Cookie.h */,
                                935207BD09BD410A00F2038D /* LocalizedStrings.h */,
                                A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
                                A8239DFF09B3CF8A00B60641 /* Logging.h */,
+                               7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */,
+                               7AE6C93A1BE0C60100E19E03 /* MainThreadSharedTimer.h */,
                                CDF2B003181F059C00F2B424 /* MediaDescription.h */,
                                CD641EC7181ED60100EE4C41 /* MediaSample.h */,
                                657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */,
                                FD96C9961982FB4C0086E156 /* FontLoader.cpp */,
                                409EBDB516B7EEA300CBA3FC /* FontLoader.h */,
                                409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */,
+                               C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
                                CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
                                93CA4C9909DF93FA00DF8677 /* html.css */,
                                4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */,
                                3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
                                3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
                                3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
-                               C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
                        );
                        path = css;
                        sourceTree = "<group>";
                                85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */,
                                4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */,
                                81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */,
-                               51771DFF1BDB485000CAE8E4 /* MemoryObjectStore.h in Headers */,
                                81AC599A131636E60009A7E0 /* DataTransferItemList.h in Headers */,
                                E4A007831B820EC8002C5A6E /* DataURLDecoder.h in Headers */,
                                E4A007831B820EC8002C5A6E /* DataURLDecoder.h in Headers */,
                                93309DE1099E64920056E581 /* DeleteSelectionCommand.h in Headers */,
                                FD1660A513787C6D001FFA7B /* DenormalDisabler.h in Headers */,
                                A7C9ABF91357A3BF00F5503F /* DetailsMarkerControl.h in Headers */,
+                               A1ED778D1BE3294000DC1791 /* Device.h in Headers */,
                                CCC2B51415F613060048CDD6 /* DeviceClient.h in Headers */,
                                CCC2B51615F613060048CDD6 /* DeviceController.h in Headers */,
                                31FB1A57120A5D0600DC02A0 /* DeviceMotionClient.h in Headers */,
                                A4226E991163D7CC008B8397 /* DOMHTMLProgressElementInternal.h in Headers */,
                                85183B4A0AA6926100F19FA3 /* DOMHTMLQuoteElement.h in Headers */,
                                85E711C40AC5D5350053270F /* DOMHTMLQuoteElementInternal.h in Headers */,
-                               51F798E61BE88092008AE491 /* IDBCursorImpl.h in Headers */,
                                85DF819B0AA77E4B00486AD7 /* DOMHTMLScriptElement.h in Headers */,
                                85E711C50AC5D5350053270F /* DOMHTMLScriptElementInternal.h in Headers */,
                                85F32AF00AA63B8700FF3184 /* DOMHTMLSelectElement.h in Headers */,
                                85526CD20AB0B7D9000302EA /* DOMTreeWalker.h in Headers */,
                                850B41C30AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h in Headers */,
                                85C7F4910AAF79DC004014DD /* DOMUIEvent.h in Headers */,
-                               A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */,
                                85989DD00ACC8BBD00A0BC51 /* DOMUIEventInternal.h in Headers */,
                                FED13D2A0CEA91DF00D89466 /* DOMUIKitExtensions.h in Headers */,
                                2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
                                8AD0A59814C88358000D83C5 /* DOMWebKitCSSRegionRuleInternal.h in Headers */,
                                31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */,
                                31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */,
-                               C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */,
                                3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */,
                                3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */,
                                8A195932147EA16E00D1EA61 /* DOMWebKitNamedFlow.h in Headers */,
                                371F4FFC0D25E7F300ECE0D5 /* FontRanges.h in Headers */,
                                B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */,
                                C58361A91744523F00173511 /* FontServicesIOS.h in Headers */,
+                               C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */,
                                4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */,
                                D05CED2A0A40BB2C00C5AF38 /* FormatBlockCommand.h in Headers */,
                                7CE6CBFB187F370700D46BF5 /* FormatConverter.h in Headers */,
                                A80D67080E9E9DEB00E420F0 /* GraphicsContextPlatformPrivateCG.h in Headers */,
                                0F580B0D0F12A2690051D689 /* GraphicsLayer.h in Headers */,
                                499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */,
-                               07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */,
                                0F580B0E0F12A2690051D689 /* GraphicsLayerClient.h in Headers */,
-                               07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */,
                                1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */,
                                0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */,
                                CEC337AF1A46086D009B8523 /* GraphicsServicesSPI.h in Headers */,
                                A81369D0097374F600D74463 /* HTMLFormElement.h in Headers */,
                                A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */,
                                14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */,
-                               077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */,
                                93E241FF0B2B4E4000C732A1 /* HTMLFrameOwnerElement.h in Headers */,
                                A871DE280A152AC800B12A68 /* HTMLFrameSetElement.h in Headers */,
                                A871DE2D0A152AC800B12A68 /* HTMLHeadElement.h in Headers */,
                                A8EA7CB80A192B9C00A8EF5F /* HTMLHeadingElement.h in Headers */,
                                A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */,
-                               517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */,
                                A871DE270A152AC800B12A68 /* HTMLHtmlElement.h in Headers */,
                                A871DE2A0A152AC800B12A68 /* HTMLIFrameElement.h in Headers */,
                                A8EA7D2D0A19385500A8EF5F /* HTMLImageElement.h in Headers */,
                                5185FC7B1BB4C4E80012898F /* IDBCursor.h in Headers */,
                                51F41A6A1BA73B5B002E053B /* IDBCursorBackend.h in Headers */,
                                51F41A6C1BA73B5B002E053B /* IDBCursorBackendOperations.h in Headers */,
+                               51F798E61BE88092008AE491 /* IDBCursorImpl.h in Headers */,
                                5185FC7E1BB4C4E80012898F /* IDBCursorWithValue.h in Headers */,
+                               51F798F41BE88394008AE491 /* IDBCursorWithValueImpl.h in Headers */,
                                5185FC811BB4C4E80012898F /* IDBDatabase.h in Headers */,
                                51F41A6E1BA73B5B002E053B /* IDBDatabaseBackend.h in Headers */,
                                51F41A6F1BA73B5B002E053B /* IDBDatabaseCallbacks.h in Headers */,
                                510310501BA8CC03003329C0 /* IDBFactoryImpl.h in Headers */,
                                5185FC8F1BB4C4E80012898F /* IDBGetResult.h in Headers */,
                                5185FC911BB4C4E80012898F /* IDBIndex.h in Headers */,
+                               51F798E81BE88092008AE491 /* IDBIndexImpl.h in Headers */,
+                               51F798F01BE880E7008AE491 /* IDBIndexInfo.h in Headers */,
                                5185FC931BB4C4E80012898F /* IDBIndexMetadata.h in Headers */,
                                5185FC951BB4C4E80012898F /* IDBKey.h in Headers */,
                                5185FC971BB4C4E80012898F /* IDBKeyData.h in Headers */,
                                5185FC9B1BB4C4E80012898F /* IDBKeyRange.h in Headers */,
                                5185FC9E1BB4C4E80012898F /* IDBKeyRangeData.h in Headers */,
                                5185FCA01BB4C4E80012898F /* IDBObjectStore.h in Headers */,
+                               516071311BD8308600DBC4F2 /* IDBObjectStoreImpl.h in Headers */,
+                               5160712F1BD8307800DBC4F2 /* IDBObjectStoreInfo.h in Headers */,
                                5185FCA21BB4C4E80012898F /* IDBObjectStoreMetadata.h in Headers */,
                                5185FCA41BB4C4E80012898F /* IDBOpenDBRequest.h in Headers */,
                                5103105B1BA8DB56003329C0 /* IDBOpenDBRequestImpl.h in Headers */,
                                BE16C59517CFE17200852C04 /* InbandWebVTTTextTrack.h in Headers */,
                                DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
                                5185FCB21BB4C4E80012898F /* IndexedDB.h in Headers */,
+                               517138F01BED1D1A000D5F01 /* IndexKey.h in Headers */,
+                               51EEAA741BEFFAB100218008 /* IndexValueEntry.h in Headers */,
+                               517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */,
                                A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */,
                                B57CB52E182A3EFC0079A647 /* InlineElementBox.h in Headers */,
                                A8CFF5E30A155A05000A4234 /* InlineFlowBox.h in Headers */,
                                F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
                                7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
                                7A54858014E02D51006AE05A /* InspectorHistory.h in Headers */,
-                               518F97031BE94C630023187C /* MemoryIndex.h in Headers */,
                                7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */,
                                20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
                                A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */,
                                71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */,
+                               82AB1776125C826700C5069D /* InspectorNetworkAgent.h in Headers */,
                                504AACCE1834455900E3D9BC /* InspectorNodeFinder.h in Headers */,
                                0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
                                4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */,
                                99CC0B6718BE9F15006CEBCC /* InspectorReplayAgent.h in Headers */,
-                               82AB1776125C826700C5069D /* InspectorNetworkAgent.h in Headers */,
                                82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
                                754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
                                A80E7B0C0A19D606007FB8C5 /* JSHTMLTitleElement.h in Headers */,
                                070756D414239A4F00414161 /* JSHTMLTrackElement.h in Headers */,
                                1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */,
-                               2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */,
                                6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
                                E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
                                C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */,
                                B2FA3D5D0AB75A6F000E5AC4 /* JSSVGColor.h in Headers */,
                                B2FA3D5F0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.h in Headers */,
                                B2FA3D610AB75A6F000E5AC4 /* JSSVGCursorElement.h in Headers */,
-                               516071311BD8308600DBC4F2 /* IDBObjectStoreImpl.h in Headers */,
                                B2FA3D630AB75A6F000E5AC4 /* JSSVGDefsElement.h in Headers */,
                                B2FA3D650AB75A6F000E5AC4 /* JSSVGDescElement.h in Headers */,
                                B2FA3D670AB75A6F000E5AC4 /* JSSVGDocument.h in Headers */,
                                A83B78FC0CCAFF15000B0825 /* JSSVGFontFaceUriElement.h in Headers */,
                                B2FA3D990AB75A6F000E5AC4 /* JSSVGForeignObjectElement.h in Headers */,
                                B2FA3D9B0AB75A6F000E5AC4 /* JSSVGGElement.h in Headers */,
-                               51F798F41BE88394008AE491 /* IDBCursorWithValueImpl.h in Headers */,
                                B27B28280CEF0C0700D39D54 /* JSSVGGlyphElement.h in Headers */,
                                24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */,
                                B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */,
                                B2FA3DAF0AB75A6F000E5AC4 /* JSSVGMetadataElement.h in Headers */,
                                B27B282A0CEF0C0700D39D54 /* JSSVGMissingGlyphElement.h in Headers */,
                                4496E3A0139813A5003EE32A /* JSSVGMPathElement.h in Headers */,
-                               51D7EFEA1BDE8F8C00E93E10 /* ThreadSafeDataBuffer.h in Headers */,
                                8542A7970AE5C94300DF58DF /* JSSVGNumber.h in Headers */,
                                B2FA3DB10AB75A6F000E5AC4 /* JSSVGNumberList.h in Headers */,
                                B2FA3DB30AB75A6F000E5AC4 /* JSSVGPaint.h in Headers */,
                                49C7B9941042D2D30009D447 /* JSWebGLBuffer.h in Headers */,
                                7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */,
                                7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */,
-                               077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */,
                                6E3FAD3914733F4000E42306 /* JSWebGLCompressedTextureS3TC.h in Headers */,
                                6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */,
                                BC2CBF4E140F1ABD003879BE /* JSWebGLContextEvent.h in Headers */,
                                1A0409DC1A4360B5009E47F3 /* MachSendRight.h in Headers */,
                                CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */,
                                932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
+                               7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */,
                                1A8F6BC60DB55CDC001DB794 /* ManifestParser.h in Headers */,
                                93309DF8099E64920056E581 /* markup.h in Headers */,
                                9728C3141268E4390041E89B /* MarkupAccumulator.h in Headers */,
                                49D5DC2C0F423A73008F20FD /* Matrix3DTransformOperation.h in Headers */,
                                49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */,
                                5CBC8DAD1AAA302200E1C803 /* MediaAccessibilitySoftLink.h in Headers */,
-                               07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */,
                                931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */,
                                078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */,
                                078E091417D14D1C00420AA1 /* MediaConstraintsImpl.h in Headers */,
                                079216551AA560AA00A3C049 /* MediaPlaybackTargetClient.h in Headers */,
                                07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */,
                                071E49701AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h in Headers */,
+                               077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */,
                                078E43DA1ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.h in Headers */,
                                078E43DD1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.h in Headers */,
+                               077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */,
                                E44613E40CD681A200FADA75 /* MediaPlayer.h in Headers */,
                                CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */,
                                076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */,
                                0705852417FDC140005F2BCB /* MediaTrackConstraints.h in Headers */,
                                0705852917FDE02C005F2BCB /* MediaTrackConstraintSet.h in Headers */,
                                99C7CCB318C663E40032E413 /* MemoizedDOMResult.h in Headers */,
+                               51E1BAC31BD8064E0055D81F /* MemoryBackingStoreTransaction.h in Headers */,
                                BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */,
                                51BA4ACB1BBC5BD900DF3D6D /* MemoryIDBBackingStore.h in Headers */,
+                               518F97031BE94C630023187C /* MemoryIndex.h in Headers */,
+                               51771DFF1BDB485000CAE8E4 /* MemoryObjectStore.h in Headers */,
                                6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */,
                                93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */,
                                E1ADECCE0E76AD8B004A1A5E /* MessageChannel.h in Headers */,
                                CDF2B0111820540600F2B424 /* MockBox.h in Headers */,
                                CDF2B0131820540600F2B424 /* MockMediaPlayerMediaSource.h in Headers */,
                                CDF2B0151820540600F2B424 /* MockMediaSourcePrivate.h in Headers */,
+                               07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */,
+                               07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */,
                                4A0FFA9E1AAF5E7E0062803B /* MockRealtimeMediaSourceCenter.h in Headers */,
+                               07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */,
+                               07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */,
                                CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */,
                                CDF2B0191820540700F2B424 /* MockTracks.h in Headers */,
                                C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */,
                                1A569D100D7E2B82007C3983 /* npruntime_internal.h in Headers */,
                                1A569D110D7E2B82007C3983 /* npruntime_priv.h in Headers */,
                                1A927FD41416A15B003A83C8 /* nptypes.h in Headers */,
+                               2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */,
+                               2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */,
                                9BB737651B41C03500AE13EB /* NSAttributedStringSPI.h in Headers */,
                                31B313DF1B6988C500F2AABC /* NSButtonCellSPI.h in Headers */,
                                CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */,
                                2DCB837919F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h in Headers */,
                                2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */,
                                CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */,
+                               2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */,
                                31B313DB1B69871600F2AABC /* NSURLConnectionSPI.h in Headers */,
                                CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */,
                                658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */,
                                31B313DD1B6987DB00F2AABC /* NSURLRequestSPI.h in Headers */,
+                               2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */,
+                               2D0CF8171BCF5DE1007A4937 /* NSWindowSPI.h in Headers */,
                                F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */,
                                1A569D120D7E2B82007C3983 /* objc_class.h in Headers */,
                                1A569D140D7E2B82007C3983 /* objc_header.h in Headers */,
                                CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */,
                                442AF7A9102CDDEA008FD4D3 /* QuickLook.h in Headers */,
                                A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */,
-                               51EEAA741BEFFAB100218008 /* IndexValueEntry.h in Headers */,
                                937F4CCC1A2D48C100BB39F5 /* QuickLookMacSPI.h in Headers */,
                                443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */,
                                CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */,
                                439046DE12DA25E800AF80A2 /* RenderMathMLMath.h in Headers */,
                                439046E012DA25E800AF80A2 /* RenderMathMLOperator.h in Headers */,
                                439046E012DA25E800BF80A3 /* RenderMathMLRadicalOperator.h in Headers */,
-                               51E1BAC31BD8064E0055D81F /* MemoryBackingStoreTransaction.h in Headers */,
                                439046E212DA25E800AF80A2 /* RenderMathMLRoot.h in Headers */,
                                439046E412DA25E800AF80A2 /* RenderMathMLRow.h in Headers */,
                                439046E812DA25E800AF80A2 /* RenderMathMLScripts.h in Headers */,
                                1A3586E015264C450022A659 /* RenderMultiColumnFlowThread.h in Headers */,
                                BCE32B9C1517C0B200F542EC /* RenderMultiColumnSet.h in Headers */,
                                BC1A7D9818FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h in Headers */,
-                               2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */,
                                8AC822FD180FC03300FB64D5 /* RenderNamedFlowFragment.h in Headers */,
                                BC85F23D151915E000BC17BE /* RenderNamedFlowThread.h in Headers */,
                                BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */,
                                BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */,
                                A43BF59D1149292800C643CA /* RenderProgress.h in Headers */,
-                               51F798E81BE88092008AE491 /* IDBIndexImpl.h in Headers */,
                                B5B65874186FDE4C009C26E8 /* RenderPtr.h in Headers */,
                                5A574F25131DB93900471B88 /* RenderQuote.h in Headers */,
                                D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */,
                                7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */,
                                7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */,
                                514C767F0CE923A1007EF3CD /* ResourceResponseBase.h in Headers */,
+                               ADBAD6EF1BCDD95700381325 /* ResourceUsageOverlay.h in Headers */,
                                FD3160A512B026F700C1A359 /* Reverb.h in Headers */,
                                FD3160A712B026F700C1A359 /* ReverbAccumulationBuffer.h in Headers */,
                                FD3160A912B026F700C1A359 /* ReverbConvolver.h in Headers */,
                                A84D82C111D3474800972990 /* ScriptableDocumentParser.h in Headers */,
                                41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */,
                                93B70D7009EB0C7C009D8468 /* ScriptController.h in Headers */,
-                               516071321BD8308B00DBC4F2 /* TransactionOperation.h in Headers */,
                                4998AED213FB224D0090B1AA /* ScriptedAnimationController.h in Headers */,
                                08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */,
                                E11C9D9B0EB3681200E409DB /* ScriptExecutionContext.h in Headers */,
                                5D925B680F64D4DD00B847F0 /* ScrollBehavior.h in Headers */,
                                1AA84F05143BA7BD0051D153 /* ScrollController.h in Headers */,
                                0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */,
-                               2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */,
                                1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
                                0FC4E40D187F82E10045882C /* ScrollingCoordinatorIOS.h in Headers */,
                                9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
                                93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
                                B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */,
                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
-                               517138F01BED1D1A000D5F01 /* IndexKey.h in Headers */,
                                53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */,
                                0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
                                8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */,
                                83B9687B19F8AB83004EF7AF /* StyleBuilderConverter.h in Headers */,
                                835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */,
-                               5160712F1BD8307800DBC4F2 /* IDBObjectStoreInfo.h in Headers */,
                                BCEF444D0E674628001C1287 /* StyleCachedImage.h in Headers */,
                                9393E605151A9A1800066F06 /* StyleCachedImageSet.h in Headers */,
                                9DAC7C571AF2CB6400437C44 /* StyleContentAlignmentData.h in Headers */,
                                C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */,
                                B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */,
                                933A14300B7D188600A53FFD /* TextEvent.h in Headers */,
-                               A1ED778D1BE3294000DC1791 /* Device.h in Headers */,
                                A77B41A012E675A90054343D /* TextEventInputType.h in Headers */,
                                F55B3DD81251F12D003EF269 /* TextFieldInputType.h in Headers */,
                                B2C3DA450D006C1D00EF6F26 /* TextFlags.h in Headers */,
                                1C18DA59181AF6A500C4EF22 /* TextPainter.h in Headers */,
                                E4C91A0E1802343100A17F6D /* TextPaintStyle.h in Headers */,
                                93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
-                               07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */,
                                A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
                                B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
                                51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */,
                                0F6383DE18615B29003E5DB5 /* ThreadedScrollingTree.h in Headers */,
                                E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */,
+                               51D7EFEA1BDE8F8C00E93E10 /* ThreadSafeDataBuffer.h in Headers */,
                                185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */,
                                7AA3A69A194A64E7001CBD24 /* TileController.h in Headers */,
                                1F72BF0B187FD45C0009BCB3 /* TileControllerMemoryHandlerIOS.h in Headers */,
                                BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */,
                                BE913D80181EF92400DCB09E /* TrackPrivateBase.h in Headers */,
                                FFAC30FE184FB145008C4F1E /* TrailingObjects.h in Headers */,
+                               516071321BD8308B00DBC4F2 /* TransactionOperation.h in Headers */,
                                49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */,
                                FB484F4D171F821E00040755 /* TransformFunctions.h in Headers */,
                                49E911CE0EF86D47009D0CAF /* TransformOperation.h in Headers */,
                                854FE7370A2297BE0058D7AD /* Traversal.h in Headers */,
                                37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */,
                                14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */,
-                               51F798F01BE880E7008AE491 /* IDBIndexInfo.h in Headers */,
-                               ADBAD6EF1BCDD95700381325 /* ResourceUsageOverlay.h in Headers */,
                                A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */,
                                854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
                                2D232C001A326F02006BF2DB /* TUCallSPI.h in Headers */,
                                93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
                                85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
                                85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */,
+                               A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */,
                                AA4739D21757AFEC00E76767 /* UIRequestEvent.h in Headers */,
                                9B2D8A7914997CCF00ECEF3E /* UndoStep.h in Headers */,
                                A863E2011343412000274926 /* UnicodeBidi.h in Headers */,
                                AAA728F716D1D8BC00D3BBC6 /* WebAccessibilityObjectWrapperIOS.h in Headers */,
                                AA478A7F16CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.h in Headers */,
                                2D3EF4481917915C00034184 /* WebActionDisablingCALayerDelegate.h in Headers */,
-                               7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */,
                                07D637401BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h in Headers */,
                                A5A7AA43132F0ECC00D3A3C2 /* WebAutocapitalize.h in Headers */,
                                A56C5B9B189F34570082D13C /* WebConsoleAgent.h in Headers */,
                                44A20DB90F84166C00B3E1FE /* WebCoreURLResponseIOS.h in Headers */,
                                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */,
                                A5E616741894581F009ADF50 /* WebDebuggerAgent.h in Headers */,
-                               2D0CF8171BCF5DE1007A4937 /* NSWindowSPI.h in Headers */,
                                FE0D84E910484348001A179E /* WebEvent.h in Headers */,
                                225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */,
                                A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */,
                                93F1D5BB12D532C400832BEC /* WebGLLoseContext.h in Headers */,
                                49C7B9D51042D32F0009D447 /* WebGLObject.h in Headers */,
                                49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */,
-                               2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */,
                                6F995A201A7078B100A735F4 /* WebGLQuery.h in Headers */,
                                49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */,
                                49C7B9E01042D32F0009D447 /* WebGLRenderingContext.h in Headers */,
                                BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
                                BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
                                85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
-                               51771DFE1BDB485000CAE8E4 /* MemoryObjectStore.cpp in Sources */,
                                580371611A66F00A00BAF519 /* ClipRect.cpp in Sources */,
                                CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
                                CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
                                97627B8D14FB3CEE002CDCA1 /* ContextDestructionObserver.cpp in Sources */,
                                5106D7BD18BDB76F000AB166 /* ContextMenuContext.cpp in Sources */,
                                065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */,
-                               06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */,
-                               93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */,
                                FD31602812B0267600C1A359 /* ConvolverNode.cpp in Sources */,
                                E1424C93164B52C800F32D40 /* CookieJar.cpp in Sources */,
                                7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */,
                                31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */,
                                CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */,
                                FBD6AF8B15EF25E5008B7110 /* CSSBasicShapes.cpp in Sources */,
-                               51EEAA731BEFFAB100218008 /* IndexValueEntry.cpp in Sources */,
                                E16A84F914C85CCC002977DF /* CSSBorderImage.cpp in Sources */,
                                BC274B31140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp in Sources */,
                                49AE2D8E134EE50C0072920A /* CSSCalculationValue.cpp in Sources */,
                                409EBDB216B7EE7400CBA3FC /* CSSFontFaceLoadEvent.cpp in Sources */,
                                A80E6CE70A1989CA007FB8C5 /* CSSFontFaceRule.cpp in Sources */,
                                BC64B4D70CB4298A005F2B62 /* CSSFontFaceSource.cpp in Sources */,
-                               A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */,
                                BC64B4D90CB4298A005F2B62 /* CSSFontFaceSrcValue.cpp in Sources */,
                                4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */,
                                BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */,
                                93309DDE099E64920056E581 /* DeleteFromTextNodeCommand.cpp in Sources */,
                                93309DE0099E64920056E581 /* DeleteSelectionCommand.cpp in Sources */,
                                A7C9ABF81357A3BF00F5503F /* DetailsMarkerControl.cpp in Sources */,
+                               A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */,
                                CCC2B51515F613060048CDD6 /* DeviceController.cpp in Sources */,
                                31EAF97F121435A400E7C1BF /* DeviceMotionClientIOS.mm in Sources */,
                                31FB1A58120A5D0600DC02A0 /* DeviceMotionController.cpp in Sources */,
                                85ACA99D0A9B575900671E90 /* DOMText.mm in Sources */,
                                933A14AA0B7D1D0900A53FFD /* DOMTextEvent.mm in Sources */,
                                188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources */,
-                               07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */,
                                76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */,
                                0F54DCD61880F867003EEDBB /* DOMTouch.mm in Sources */,
                                0F54DCD81880F867003EEDBB /* DOMTouchEvent.mm in Sources */,
                                84730D841248F0B300D3A9C9 /* FEMorphology.cpp in Sources */,
                                84730D861248F0B300D3A9C9 /* FEOffset.cpp in Sources */,
                                84730D881248F0B300D3A9C9 /* FESpecularLighting.cpp in Sources */,
-                               51F798E51BE88092008AE491 /* IDBCursorImpl.cpp in Sources */,
                                84730D8A1248F0B300D3A9C9 /* FETile.cpp in Sources */,
                                84730D8C1248F0B300D3A9C9 /* FETurbulence.cpp in Sources */,
                                FD31609412B026F700C1A359 /* FFTConvolver.cpp in Sources */,
                                B275355B0B053814002CE64F /* FloatSizeCG.cpp in Sources */,
                                B275357A0B053814002CE64F /* FloatSizeMac.mm in Sources */,
                                D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */,
-                               5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */,
                                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */,
                                B6D9D23614EABD260090D75E /* FocusEvent.cpp in Sources */,
                                B2C3DA640D006CD600EF6F26 /* Font.cpp in Sources */,
                                A81369E3097374F600D74463 /* HTMLLabelElement.cpp in Sources */,
                                A81369E1097374F600D74463 /* HTMLLegendElement.cpp in Sources */,
                                A8EA79FC0A1916DF00A8EF5F /* HTMLLIElement.cpp in Sources */,
+                               1AB40EE11BF427D600BA81BE /* ContextMenuItem.cpp in Sources */,
                                A871DC210A15205700B12A68 /* HTMLLinkElement.cpp in Sources */,
                                A8EA7D320A19385500A8EF5F /* HTMLMapElement.cpp in Sources */,
                                A8EA7CAC0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp in Sources */,
                                0779BF0D18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp in Sources */,
                                A8EA79F80A1916DF00A8EF5F /* HTMLMenuElement.cpp in Sources */,
                                2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */,
-                               7AE6C9381BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp in Sources */,
                                A871DC270A15205700B12A68 /* HTMLMetaElement.cpp in Sources */,
                                A454424A119B3661009BE912 /* HTMLMeterElement.cpp in Sources */,
                                A8CFF7A90A156978000A4234 /* HTMLModElement.cpp in Sources */,
                                5185FC7A1BB4C4E80012898F /* IDBCursor.cpp in Sources */,
                                51F41A691BA73B5B002E053B /* IDBCursorBackend.cpp in Sources */,
                                51F41A6B1BA73B5B002E053B /* IDBCursorBackendOperations.cpp in Sources */,
+                               51F798E51BE88092008AE491 /* IDBCursorImpl.cpp in Sources */,
                                5185FC7D1BB4C4E80012898F /* IDBCursorWithValue.cpp in Sources */,
+                               51F798F31BE88394008AE491 /* IDBCursorWithValueImpl.cpp in Sources */,
                                5185FC801BB4C4E80012898F /* IDBDatabase.cpp in Sources */,
                                51F41A6D1BA73B5B002E053B /* IDBDatabaseBackend.cpp in Sources */,
                                51F41A701BA73B5B002E053B /* IDBDatabaseCallbacksImpl.cpp in Sources */,
                                5185FC8C1BB4C4E80012898F /* IDBFactory.cpp in Sources */,
                                5103104F1BA8CC03003329C0 /* IDBFactoryImpl.cpp in Sources */,
                                5185FC901BB4C4E80012898F /* IDBIndex.cpp in Sources */,
+                               51F798E71BE88092008AE491 /* IDBIndexImpl.cpp in Sources */,
+                               51F798EF1BE880E7008AE491 /* IDBIndexInfo.cpp in Sources */,
                                5185FC941BB4C4E80012898F /* IDBKey.cpp in Sources */,
                                5185FC961BB4C4E80012898F /* IDBKeyData.cpp in Sources */,
                                5185FC981BB4C4E80012898F /* IDBKeyPath.cpp in Sources */,
                                5185FC9A1BB4C4E80012898F /* IDBKeyRange.cpp in Sources */,
                                5185FC9D1BB4C4E80012898F /* IDBKeyRangeData.cpp in Sources */,
                                5185FC9F1BB4C4E80012898F /* IDBObjectStore.cpp in Sources */,
+                               516071301BD8308600DBC4F2 /* IDBObjectStoreImpl.cpp in Sources */,
+                               5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */,
                                5185FCA31BB4C4E80012898F /* IDBOpenDBRequest.cpp in Sources */,
                                5103105A1BA8DB56003329C0 /* IDBOpenDBRequestImpl.cpp in Sources */,
                                51F41A7B1BA73B5B002E053B /* IDBPendingTransactionMonitor.cpp in Sources */,
                                07367DE0172CA68200D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm in Sources */,
                                BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
                                DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,
+                               517138EF1BED1D1A000D5F01 /* IndexKey.cpp in Sources */,
+                               51EEAA731BEFFAB100218008 /* IndexValueEntry.cpp in Sources */,
+                               517138F71BF128BB000D5F01 /* IndexValueStore.cpp in Sources */,
                                A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */,
                                B57CB52D182A3EED0079A647 /* InlineElementBox.cpp in Sources */,
                                A8CFF5E40A155A05000A4234 /* InlineFlowBox.cpp in Sources */,
                                F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */,
                                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
-                               077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */,
                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
                                7A54857F14E02D51006AE05A /* InspectorHistory.cpp in Sources */,
                                7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */,
                                20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */,
                                A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */,
                                71B1E1261640491A00B1880A /* InspectorLayerTreeAgent.cpp in Sources */,
+                               82AB1775125C826700C5069D /* InspectorNetworkAgent.cpp in Sources */,
                                504AACCD1834455900E3D9BC /* InspectorNodeFinder.cpp in Sources */,
                                7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */,
                                4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */,
                                99CC0B6618BE9F15006CEBCC /* InspectorReplayAgent.cpp in Sources */,
-                               82AB1775125C826700C5069D /* InspectorNetworkAgent.cpp in Sources */,
                                82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
                                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
                                F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
                                BC46C2060C0DDCA10020CFC3 /* JSCSSStyleRule.cpp in Sources */,
                                BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */,
                                FD67773A195CB14A0072E0D3 /* JSCSSSupportsRule.cpp in Sources */,
-                               ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */,
                                14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */,
                                BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */,
                                A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */,
                                9752D38D1413104B003305BD /* JSHTMLSpanElement.cpp in Sources */,
                                A80E7B0F0A19D606007FB8C5 /* JSHTMLStyleElement.cpp in Sources */,
                                BCA169A20BFD55B40019CA76 /* JSHTMLTableCaptionElement.cpp in Sources */,
-                               517138F71BF128BB000D5F01 /* IndexValueStore.cpp in Sources */,
                                BC06EDE30BFD6D0D00856E9D /* JSHTMLTableCellElement.cpp in Sources */,
                                BC06ED9D0BFD660600856E9D /* JSHTMLTableColElement.cpp in Sources */,
                                836CB1F91BD1E41800AF1591 /* JSHTMLTableDataCellElement.cpp in Sources */,
                                073BE34017D17E01002BD431 /* JSNavigatorUserMedia.cpp in Sources */,
                                073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */,
                                14DC0D3709FED073007B0235 /* JSNode.cpp in Sources */,
-                               07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */,
                                BCD9C2640C17AA67005C90A2 /* JSNodeCustom.cpp in Sources */,
                                14115B7209F84CD600CA4FC1 /* JSNodeFilter.cpp in Sources */,
                                83F1206B1B8C104700D75F63 /* JSNodeFilterCustom.cpp in Sources */,
                                AA7FEEA416A4E6F3004C0C33 /* JSSpeechSynthesis.cpp in Sources */,
                                AA2A5AD316A4860D00976A25 /* JSSpeechSynthesisEvent.cpp in Sources */,
                                AA7FEEA616A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp in Sources */,
-                               517138EF1BED1D1A000D5F01 /* IndexKey.cpp in Sources */,
                                AA7FEEA816A4E6F3004C0C33 /* JSSpeechSynthesisVoice.cpp in Sources */,
                                514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */,
                                B525A96611CA2340003A23A8 /* JSSQLException.cpp in Sources */,
                                51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */,
                                51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */,
                                51E0BAEA0DA55D4A00A9E417 /* JSStorageEvent.cpp in Sources */,
-                               51F798E71BE88092008AE491 /* IDBIndexImpl.cpp in Sources */,
                                0FF50269102BA9430066F39A /* JSStyleMedia.cpp in Sources */,
                                BCE0139A0C0BEF180043860A /* JSStyleSheet.cpp in Sources */,
                                BC98A27D0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp in Sources */,
                                B2FA3DBC0AB75A6F000E5AC4 /* JSSVGPathSegClosePath.cpp in Sources */,
                                B2FA3DBE0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicAbs.cpp in Sources */,
                                B2FA3DC00AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicRel.cpp in Sources */,
-                               51E1BAC21BD8064E0055D81F /* MemoryBackingStoreTransaction.cpp in Sources */,
                                B2FA3DC20AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothAbs.cpp in Sources */,
                                B2FA3DC40AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothRel.cpp in Sources */,
                                B2FA3DC60AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticAbs.cpp in Sources */,
                                B2FA3DDE0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.cpp in Sources */,
                                B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */,
                                8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
-                               07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */,
                                B2FA3DE20AB75A6F000E5AC4 /* JSSVGPointList.cpp in Sources */,
                                B2FA3DE50AB75A6F000E5AC4 /* JSSVGPolygonElement.cpp in Sources */,
                                B2FA3DE70AB75A6F000E5AC4 /* JSSVGPolylineElement.cpp in Sources */,
                                B2FA3E140AB75A6F000E5AC4 /* JSSVGUseElement.cpp in Sources */,
                                B2FA3E160AB75A6F000E5AC4 /* JSSVGViewElement.cpp in Sources */,
                                7118FED415685CC60030B79A /* JSSVGViewSpec.cpp in Sources */,
-                               07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */,
                                8485227D1190162C006EDC7F /* JSSVGVKernElement.cpp in Sources */,
                                71DCB7011568197600862271 /* JSSVGZoomAndPan.cpp in Sources */,
                                B2FA3E180AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp in Sources */,
                                1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */,
                                1A0409F31A43675C009E47F3 /* MachSendRight.cpp in Sources */,
                                932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */,
+                               7AE6C93B1BE0C60100E19E03 /* MainThreadSharedTimer.cpp in Sources */,
+                               7AE6C9381BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp in Sources */,
                                1A8F6BC50DB55CDC001DB794 /* ManifestParser.cpp in Sources */,
                                93309DF7099E64920056E581 /* markup.cpp in Sources */,
                                9728C3131268E4390041E89B /* MarkupAccumulator.cpp in Sources */,
                                CDA98E0E1603FE5800FEA3B1 /* MediaKeySession.cpp in Sources */,
                                A8EA80090A19516E00A8EF5F /* MediaList.cpp in Sources */,
                                071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */,
+                               077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */,
                                078E43D91ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.cpp in Sources */,
                                078E43DE1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.mm in Sources */,
+                               077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */,
                                E44613E30CD6819F00FADA75 /* MediaPlayer.cpp in Sources */,
                                072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */,
                                DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */,
                                0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */,
                                FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */,
                                0705851517FB0EEA005F2BCB /* MediaStreamCapabilities.cpp in Sources */,
-                               51F798F31BE88394008AE491 /* IDBCursorWithValueImpl.cpp in Sources */,
                                078E090017D14CEE00420AA1 /* MediaStreamEvent.cpp in Sources */,
                                0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */,
                                078E090117D14CEE00420AA1 /* MediaStreamRegistry.cpp in Sources */,
                                0705852317FDC140005F2BCB /* MediaTrackConstraints.cpp in Sources */,
                                0705853817FE044F005F2BCB /* MediaTrackConstraintSet.cpp in Sources */,
                                99C7CCB518C6B8990032E413 /* MemoizedDOMResult.cpp in Sources */,
+                               51E1BAC21BD8064E0055D81F /* MemoryBackingStoreTransaction.cpp in Sources */,
                                BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */,
                                51BA4ACA1BBC5BD900DF3D6D /* MemoryIDBBackingStore.cpp in Sources */,
+                               518F97021BE94C630023187C /* MemoryIndex.cpp in Sources */,
+                               51771DFE1BDB485000CAE8E4 /* MemoryObjectStore.cpp in Sources */,
                                657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */,
                                ADB6B29818FB90240081963E /* MemoryPressureHandlerCocoa.mm in Sources */,
                                93309DF9099E64920056E581 /* MergeIdenticalElementsCommand.cpp in Sources */,
                                CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */,
                                CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
                                CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
+                               07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */,
+                               07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */,
                                4A0FFA9D1AAF5E750062803B /* MockRealtimeMediaSourceCenter.cpp in Sources */,
+                               07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */,
+                               07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */,
                                CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */,
                                CDF2B0181820540700F2B424 /* MockTracks.cpp in Sources */,
                                C6D74AE409AA290A000B0A52 /* ModifySelectionListLevel.cpp in Sources */,
                                A5A2AF0B1829734300DE1729 /* PageDebuggable.cpp in Sources */,
                                F34742DC134362F000531BC2 /* PageDebuggerAgent.cpp in Sources */,
                                9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */,
-                               ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */,
                                7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */,
+                               834DD4F41BE08989002C9C3E /* PageMac.mm in Sources */,
                                2D5C9CFF19C7B52E00B3C5C1 /* PageOverlay.cpp in Sources */,
                                2D5C9D0119C7B52E00B3C5C1 /* PageOverlayController.cpp in Sources */,
                                FBDB619D16D6034600BB3394 /* PageRuleCollector.cpp in Sources */,
                                BCEA4879097D93020094C9E4 /* RenderLayer.cpp in Sources */,
                                0F580D000F12DE9B0051D689 /* RenderLayerBacking.cpp in Sources */,
                                0F580CFE0F12DE9B0051D689 /* RenderLayerCompositor.cpp in Sources */,
-                               834DD4F41BE08989002C9C3E /* PageMac.mm in Sources */,
                                50D10D991545F5760096D288 /* RenderLayerFilterInfo.cpp in Sources */,
                                3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */,
                                BC33FB1B0F30EE85002CDD7C /* RenderLineBoxList.cpp in Sources */,
                                514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */,
                                7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */,
                                514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */,
+                               ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */,
+                               ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */,
                                FD3160A412B026F700C1A359 /* Reverb.cpp in Sources */,
                                FD3160A612B026F700C1A359 /* ReverbAccumulationBuffer.cpp in Sources */,
                                FD3160A812B026F700C1A359 /* ReverbConvolver.cpp in Sources */,
                                93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */,
                                B8DBDB4B130B0F8A00F5CDB1 /* SetSelectionCommand.cpp in Sources */,
                                14C9A5EA0B3D105F005A0232 /* Settings.cpp in Sources */,
+                               A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */,
                                0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */,
                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
                                FD45A953175D3FB800C21EC8 /* Shape.cpp in Sources */,
                                FD45A956175D3FB800C21EC8 /* ShapeOutsideInfo.cpp in Sources */,
                                1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */,
-                               51F798EF1BE880E7008AE491 /* IDBIndexInfo.cpp in Sources */,
                                1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */,
                                512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */,
                                97B1F02E13B025CA00F5103F /* SharedBufferChunkReader.cpp in Sources */,
                                1A37636B1A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp in Sources */,
                                8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */,
                                B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */,
-                               A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */,
                                BC5EB6A20E81DC4F00B25965 /* StyleBackgroundData.cpp in Sources */,
                                BC5EB67D0E81D42000B25965 /* StyleBoxData.cpp in Sources */,
                                8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */,
                                B2227A260D00BF220071B782 /* SVGGElement.cpp in Sources */,
                                087E0AF613606D0B00FA4BA8 /* SVGGlyph.cpp in Sources */,
                                B2A1F2AD0CEF0ABF00442F6A /* SVGGlyphElement.cpp in Sources */,
-                               516071301BD8308600DBC4F2 /* IDBObjectStoreImpl.cpp in Sources */,
                                24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */,
                                B2227A290D00BF220071B782 /* SVGGradientElement.cpp in Sources */,
                                B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */,
                                B2227A3B0D00BF220071B782 /* SVGLineElement.cpp in Sources */,
                                B2227A400D00BF220071B782 /* SVGLocatable.cpp in Sources */,
                                B2227A430D00BF220071B782 /* SVGMarkerElement.cpp in Sources */,
-                               518F97021BE94C630023187C /* MemoryIndex.cpp in Sources */,
                                B2227A460D00BF220071B782 /* SVGMaskElement.cpp in Sources */,
                                B2227A4A0D00BF220071B782 /* SVGMetadataElement.cpp in Sources */,
                                B2A1F2B00CEF0ABF00442F6A /* SVGMissingGlyphElement.cpp in Sources */,
                                2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */,
                                2D4F96F81A1ECC240098BF88 /* TextIndicatorWindow.mm in Sources */,
                                F55B3DD91251F12D003EF269 /* TextInputType.cpp in Sources */,
-                               51D7EFEC1BDEFA5100E93E10 /* TransactionOperation.cpp in Sources */,
                                CECADFCD1537791D00E37068 /* TextInsertionBaseCommand.cpp in Sources */,
                                93309E1B099E64920056E581 /* TextIterator.cpp in Sources */,
                                E4D988B617BFEB210084FB88 /* TextNodeTraversal.cpp in Sources */,
                                070334D9145A006F008D8D45 /* TrackBase.cpp in Sources */,
                                070334D31459FFAD008D8D45 /* TrackEvent.cpp in Sources */,
                                BE88E0C11715CE2600658D98 /* TrackListBase.cpp in Sources */,
-                               077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */,
                                FFAC30FF184FB145008C4F1E /* TrailingObjects.cpp in Sources */,
+                               51D7EFEC1BDEFA5100E93E10 /* TransactionOperation.cpp in Sources */,
                                49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */,
                                494BC40D12AEDD9E00743BD2 /* TransformationMatrixCA.cpp in Sources */,
                                B27535580B053814002CE64F /* TransformationMatrixCG.cpp in Sources */,
                                868160D518766A0E0021E79D /* UserActivityMac.mm in Sources */,
                                5D5975B71963637B00D00878 /* UserAgent.mm in Sources */,
                                26255F0018878DFF0006E1FD /* UserAgentIOS.mm in Sources */,
+                               1AB40EE21BF427DB00BA81BE /* ContextMenu.cpp in Sources */,
                                26255F0418878E110006E1FD /* UserAgentMac.mm in Sources */,
                                CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */,
                                65DF326109D1E199000BE325 /* UserAgentStyleSheetsData.cpp in Sources */,
                                BC8243E80D0CFD7500460C8F /* WindowFeatures.cpp in Sources */,
                                7E99AF510B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp in Sources */,
                                A14832BD187F64B400DA63A6 /* WKContentObservation.cpp in Sources */,
-                               7AE6C93B1BE0C60100E19E03 /* MainThreadSharedTimer.cpp in Sources */,
                                A14832C0187F656600DA63A6 /* WKGraphics.mm in Sources */,
                                A14832C2187F65C700DA63A6 /* WKUtilities.c in Sources */,
                                A14832C5187F668300DA63A6 /* WKView.mm in Sources */,
index 9e69e1b..f6616b0 100644 (file)
@@ -102,12 +102,7 @@ JSValue JSInspectorFrontendHost::showContextMenu(ExecState& state)
     ContextMenu menu;
     populateContextMenuItems(&state, array, menu);
 
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-    Vector<ContextMenuItem> items = contextMenuItemVector(menu.platformDescription());
-#else
-    Vector<ContextMenuItem> items = menu.items();
-#endif
-    wrapped().showContextMenu(event, items);
+    wrapped().showContextMenu(event, menu.items());
 #else
     UNUSED_PARAM(state);
 #endif
index 5a8450c..3a6999e 100644 (file)
@@ -1117,11 +1117,7 @@ void ContextMenuController::addInspectElementItem()
         return;
 
     ContextMenuItem InspectElementItem(ActionType, ContextMenuItemTagInspectElement, contextMenuItemTagInspectElement());
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     if (m_contextMenu && !m_contextMenu->items().isEmpty())
-#else
-    if (m_contextMenu && m_contextMenu->itemCount())
-#endif
         appendItem(*separatorItem(), m_contextMenu.get());
     appendItem(InspectElementItem, m_contextMenu.get());
 }
index f316da3..796caf2 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "ContextMenu.h"
 
-#if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#if ENABLE(CONTEXT_MENUS)
 
 namespace WebCore {
 
@@ -36,4 +36,4 @@ ContextMenu::ContextMenu()
 
 } // namespace WebCore
 
-#endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#endif // ENABLE(CONTEXT_MENUS)
index bc41a0a..7a9691c 100644 (file)
 #include "PlatformMenuDescription.h"
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(COCOA)
-#include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN)
-#include <windows.h>
-#endif
-
 namespace WebCore {
 
 class ContextMenuController;
@@ -49,45 +43,15 @@ class ContextMenu {
 public:
     ContextMenu();
 
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     void setItems(const Vector<ContextMenuItem>& items) { m_items = items; }
     const Vector<ContextMenuItem>& items() const { return m_items; }
 
     void appendItem(const ContextMenuItem& item) { m_items.append(item); } 
-#else
-    explicit ContextMenu(const PlatformMenuDescription);
-    ~ContextMenu();
-
-    void insertItem(unsigned position, ContextMenuItem&);
-    void appendItem(ContextMenuItem&);
-
-    unsigned itemCount() const;
-
-    WEBCORE_EXPORT PlatformMenuDescription platformDescription() const;
-    WEBCORE_EXPORT void setPlatformDescription(PlatformMenuDescription);
-
-    PlatformMenuDescription releasePlatformDescription();
-#endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
 
 private:
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     Vector<ContextMenuItem> m_items;
-#else
-#if PLATFORM(COCOA)
-    // Keep this in sync with the PlatformMenuDescription typedef
-    RetainPtr<NSMutableArray> m_platformDescription;
-#else
-    PlatformMenuDescription m_platformDescription;
-#endif
-
-#endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
 };
 
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-WEBCORE_EXPORT Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription);
-PlatformMenuDescription platformMenuDescription(Vector<ContextMenuItem>&);
-#endif
-
 }
 
 #endif // ENABLE(CONTEXT_MENUS)
index 2108d28..3bcc83b 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "ContextMenu.h"
 
-#if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#if ENABLE(CONTEXT_MENUS)
 
 namespace WebCore {
 
@@ -133,4 +133,4 @@ bool ContextMenuItem::enabled() const
 
 } // namespace WebCore
 
-#endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#endif // ENABLE(CONTEXT_MENUS)
index eeef510..4193857 100644 (file)
 #if ENABLE(CONTEXT_MENUS)
 
 #include "PlatformMenuDescription.h"
-#include <wtf/text/WTFString.h>
-
-#if PLATFORM(COCOA)
-#include <wtf/RetainPtr.h>
-OBJC_CLASS NSImage;
-OBJC_CLASS NSMenuItem;
-#endif
 #endif // ENABLE(CONTEXT_MENUS)
 
+#include <wtf/text/WTFString.h>
+
 namespace WebCore {
 
 class ContextMenu;
@@ -174,13 +169,6 @@ enum ContextMenuItemType {
     SubmenuType
 };
 
-#if ENABLE(CONTEXT_MENUS)
-#if PLATFORM(COCOA)
-typedef NSMenuItem* PlatformMenuItemDescription;
-#else
-typedef void* PlatformMenuItemDescription;
-#endif
-
 class ContextMenuItem {
     WTF_MAKE_FAST_ALLOCATED;
 public:
@@ -203,7 +191,6 @@ public:
 
     void setSubMenu(ContextMenu*);
 
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems);
     ContextMenuItem();
 
@@ -213,42 +200,15 @@ public:
     const String& title() const { return m_title; }
 
     const Vector<ContextMenuItem>& subMenuItems() const { return m_subMenuItems; }
-#else
-public:
-    WEBCORE_EXPORT explicit ContextMenuItem(PlatformMenuItemDescription);
-    explicit ContextMenuItem(ContextMenu* subMenu);
-    ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);
-    WEBCORE_EXPORT ContextMenuItem();
-
-    bool isNull() const { return !m_platformDescription; }
-
-    WEBCORE_EXPORT PlatformMenuItemDescription platformDescription() const;
-
-    WEBCORE_EXPORT String title() const;
-    void setTitle(const String&);
-
-    WEBCORE_EXPORT PlatformMenuDescription platformSubMenu() const;
-    void setSubMenu(Vector<ContextMenuItem>&);
-
-#endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
 private:
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     ContextMenuItemType m_type;
     ContextMenuAction m_action;
     String m_title;
     bool m_enabled;
     bool m_checked;
     Vector<ContextMenuItem> m_subMenuItems;
-#else
-#if PLATFORM(COCOA)
-    RetainPtr<NSMenuItem> m_platformDescription;
-#else
-    PlatformMenuItemDescription m_platformDescription;
-#endif
-#endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
 };
 
-#endif // ENABLE(CONTEXT_MENUS)
 }
 
 #endif // ContextMenuItem_h
diff --git a/Source/WebCore/platform/mac/ContextMenuItemMac.mm b/Source/WebCore/platform/mac/ContextMenuItemMac.mm
deleted file mode 100644 (file)
index ad1b3e9..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2006, 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. ``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 "ContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include "ContextMenu.h"
-#include "Document.h"
-#include "Frame.h"
-#include "HitTestResult.h"
-#include "Image.h"
-#include "NSMenuSPI.h"
-#include "Node.h"
-#include "URL.h"
-
-namespace WebCore {
-
-static NSMutableArray* menuToArray(NSMenu* menu)
-{
-    NSMutableArray* itemsArray = [NSMutableArray array];
-    int total = [menu numberOfItems];
-    for (int i = 0; i < total; i++)
-        [itemsArray addObject:[menu itemAtIndex:i]];
-
-    return itemsArray;
-}
-
-ContextMenuItem::ContextMenuItem()
-{
-}
-
-ContextMenuItem::ContextMenuItem(NSMenuItem* item)
-{
-    m_platformDescription = item;
-}
-
-ContextMenuItem::ContextMenuItem(ContextMenu* subMenu)
-{
-    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-    m_platformDescription = item;
-    [item release];
-
-    [m_platformDescription.get() setTag:ContextMenuItemTagNoAction];
-    if (subMenu)
-        setSubMenu(subMenu);
-}
-
-static PlatformMenuItemDescription createPlatformMenuItemDescription(ContextMenuItemType type, ContextMenuAction action, const String& title, bool enabled, bool checked)
-{
-    if (type == SeparatorType)
-        return [[NSMenuItem separatorItem] retain];
-
-    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
-    [item setEnabled:enabled];
-    [item setState:checked ? NSOnState : NSOffState];
-    [item setTag:action];
-
-    return item;
-}
-
-ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, ContextMenu* subMenu)
-{
-    m_platformDescription = adoptNS(createPlatformMenuItemDescription(type, action, title, true, false));
-
-    if (subMenu)
-        setSubMenu(subMenu);
-}
-
-ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, bool enabled, bool checked)
-{
-    m_platformDescription = adoptNS(createPlatformMenuItemDescription(type, action, title, enabled, checked));
-}
-
-ContextMenuItem::ContextMenuItem(ContextMenuAction action, const String& title, bool enabled, bool checked, Vector<ContextMenuItem>& subMenuItems)
-{
-    m_platformDescription = adoptNS(createPlatformMenuItemDescription(SubmenuType, action, title, enabled, checked));
-    
-    setSubMenu(subMenuItems);
-}
-
-ContextMenuItem::~ContextMenuItem()
-{
-}
-
-NSMenuItem *ContextMenuItem::platformDescription() const
-{
-    return m_platformDescription.get();
-}
-
-ContextMenuItemType ContextMenuItem::type() const
-{
-    if ([m_platformDescription.get() isSeparatorItem])
-        return SeparatorType;
-    if ([m_platformDescription.get() hasSubmenu])
-        return SubmenuType;
-    return ActionType;
-}
-
-ContextMenuAction ContextMenuItem::action() const
-{ 
-    return static_cast<ContextMenuAction>([m_platformDescription.get() tag]);
-}
-
-String ContextMenuItem::title() const 
-{
-    return [m_platformDescription.get() title];
-}
-
-NSMutableArray* ContextMenuItem::platformSubMenu() const
-{
-    return menuToArray([m_platformDescription.get() submenu]);
-}
-
-void ContextMenuItem::setType(ContextMenuItemType type)
-{
-    if (type == SeparatorType)
-        m_platformDescription = [NSMenuItem separatorItem];
-}
-
-void ContextMenuItem::setAction(ContextMenuAction action)
-{
-    [m_platformDescription.get() setTag:action]; 
-}
-
-void ContextMenuItem::setTitle(const String& title)
-{
-    [m_platformDescription.get() setTitle:title];
-}
-
-void ContextMenuItem::setSubMenu(ContextMenu* menu)
-{
-    NSArray* subMenuArray = menu->platformDescription();
-    NSMenu* subMenu = [[NSMenu alloc] init];
-    [subMenu setAutoenablesItems:NO];
-    for (unsigned i = 0; i < [subMenuArray count]; i++)
-        [subMenu insertItem:[subMenuArray objectAtIndex:i] atIndex:i];
-    [m_platformDescription.get() setSubmenu:subMenu];
-    [subMenu release];
-}
-
-void ContextMenuItem::setSubMenu(Vector<ContextMenuItem>& subMenuItems)
-{
-    NSMenu* subMenu = [[NSMenu alloc] init];
-    [subMenu setAutoenablesItems:NO];
-    for (unsigned i = 0; i < subMenuItems.size(); ++i)
-        [subMenu addItem:subMenuItems[i].platformDescription()];
-        
-    [m_platformDescription.get() setSubmenu:subMenu];
-    [subMenu release];
-}
-
-void ContextMenuItem::setChecked(bool checked)
-{
-    if (checked)
-        [m_platformDescription.get() setState:NSOnState];
-    else
-        [m_platformDescription.get() setState:NSOffState];
-}
-
-void ContextMenuItem::setEnabled(bool enable)
-{
-    [m_platformDescription.get() setEnabled:enable];
-}
-
-bool ContextMenuItem::enabled() const
-{
-    return [m_platformDescription.get() isEnabled];
-}
-
-bool ContextMenuItem::checked() const
-{
-    return [m_platformDescription.get() state] == NSOnState;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(CONTEXT_MENUS)
diff --git a/Source/WebCore/platform/mac/ContextMenuMac.mm b/Source/WebCore/platform/mac/ContextMenuMac.mm
deleted file mode 100644 (file)
index f88d6ac..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2006 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. ``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 "ContextMenu.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-namespace WebCore {
-
-ContextMenu::ContextMenu()
-{
-    NSMutableArray* array = [[NSMutableArray alloc] init];
-    m_platformDescription = array;
-    [array release];
-}
-
-ContextMenu::ContextMenu(const PlatformMenuDescription menu)
-    : m_platformDescription(menu)
-{
-}
-
-ContextMenu::~ContextMenu()
-{
-}
-
-void ContextMenu::appendItem(ContextMenuItem& item)
-{
-    [m_platformDescription.get() addObject:item.platformDescription()];
-}
-
-void ContextMenu::insertItem(unsigned position, ContextMenuItem& item)
-{
-    [m_platformDescription.get() insertObject:item.platformDescription() atIndex:position];
-}
-
-unsigned ContextMenu::itemCount() const
-{
-    return [m_platformDescription.get() count];
-}
-
-void ContextMenu::setPlatformDescription(NSMutableArray* menu)
-{
-    if (m_platformDescription.get() != menu)
-        m_platformDescription = menu;
-}
-
-NSMutableArray* ContextMenu::platformDescription() const
-{
-    return m_platformDescription.get();
-}
-
-NSMutableArray* ContextMenu::releasePlatformDescription()
-{
-    return m_platformDescription.leakRef();
-}
-
-Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription menu)
-{
-    Vector<ContextMenuItem> items;
-    unsigned count = [menu count];
-    if (menu)
-        items.reserveCapacity(count);
-    
-    for (unsigned i = 0; i < count; ++i)
-        items.append(ContextMenuItem([menu objectAtIndex:i]));
-    
-    return items;
-}
-
-PlatformMenuDescription platformMenuDescription(Vector<ContextMenuItem>& menuItemVector)
-{
-    PlatformMenuDescription platformMenu = [[NSMutableArray alloc] initWithCapacity:menuItemVector.size()];
-    for (unsigned i = 0; i < menuItemVector.size(); ++i)
-        [platformMenu addObject:menuItemVector[i].platformDescription()];
-
-    return [platformMenu autorelease];
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(CONTEXT_MENUS)
index 60f1de3..62ac259 100644 (file)
@@ -1,3 +1,14 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        Enable cross-platform context menus by default
+        https://bugs.webkit.org/show_bug.cgi?id=151173
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebHTMLView.mm:
+        (createMenuItem):
+        (customMenuFromDefaultItems):
+
 2015-11-12  Csaba Osztrogonác  <ossy@webkit.org>
 
         Remove ENABLE(SATURATED_LAYOUT_ARITHMETIC) guards
index 3d3c8e5..54475c4 100644 (file)
@@ -3579,7 +3579,7 @@ static RetainPtr<NSMenuItem> createMenuItem(const HitTestResult& hitTestResult,
     case SubmenuType: {
         auto menu = adoptNS([[NSMenu alloc] init]);
 
-        auto submenuItems = createMenuItems(hitTestResult, contextMenuItemVector(item.platformSubMenu()));
+        auto submenuItems = createMenuItems(hitTestResult, item.subMenuItems());
         for (NSMenuItem *menuItem in submenuItems.get())
             [menu addItem:menuItem];
 
@@ -3607,7 +3607,7 @@ static RetainPtr<NSMutableArray> createMenuItems(const HitTestResult& hitTestRes
 static RetainPtr<NSArray> customMenuFromDefaultItems(WebView *webView, const ContextMenu& defaultMenu)
 {
     const auto& hitTestResult = webView.page->contextMenuController().hitTestResult();
-    auto defaultMenuItems = createMenuItems(hitTestResult, contextMenuItemVector(defaultMenu.platformDescription()));
+    auto defaultMenuItems = createMenuItems(hitTestResult, defaultMenu.items());
 
     id delegate = [webView UIDelegate];
     SEL selector = @selector(webView:contextMenuItemsForElement:defaultMenuItems:);
index d4e2d95..9078b56 100644 (file)
@@ -1,3 +1,15 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        Enable cross-platform context menus by default
+        https://bugs.webkit.org/show_bug.cgi?id=151173
+
+        Reviewed by Tim Horton.
+
+        * Shared/WebContextMenuItemData.cpp:
+        (WebKit::WebContextMenuItemData::WebContextMenuItemData): Deleted.
+        * WebProcess/WebPage/WebContextMenu.cpp:
+        (WebKit::WebContextMenu::menuItemsWithUserData): Deleted.
+
 2015-11-12  Dan Bernstein  <mitz@apple.com>
 
         Fixed the build.
index 5ba1d34..a9c96c0 100644 (file)
@@ -73,11 +73,7 @@ WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& i
     , m_title(item.title())
 {
     if (m_type == WebCore::SubmenuType) {
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
         const Vector<WebCore::ContextMenuItem>& coreSubmenu = item.subMenuItems();
-#else
-        Vector<WebCore::ContextMenuItem> coreSubmenu = WebCore::contextMenuItemVector(item.platformSubMenu());
-#endif
         m_submenu = kitItems(coreSubmenu);
     }
     
index 0e247c0..6b1150d 100644 (file)
@@ -88,11 +88,7 @@ void WebContextMenu::menuItemsWithUserData(Vector<WebContextMenuItemData> &menuI
         return;
 
     // Give the bundle client a chance to process the menu.
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     const Vector<ContextMenuItem>& coreItems = menu->items();
-#else
-    Vector<ContextMenuItem> coreItems = contextMenuItemVector(menu->platformDescription());
-#endif
 
     if (m_page->injectedBundleContextMenuClient().getCustomMenuFromDefaultItems(*m_page, controller.hitTestResult(), coreItems, menuItems, userData))
         return;
index 69ff3c9..811c9e5 100644 (file)
@@ -36,7 +36,6 @@ if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
 endif ()
 
 add_definitions(-DBUILDING_EFL__=1)
-add_definitions(-DUSE_CROSS_PLATFORM_CONTEXT_MENUS=1)
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
                 -DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")