Changeset 192376 in webkit
- Timestamp:
- Nov 12, 2015 12:06:41 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 17 edited
-
ChangeLog (modified) (1 diff)
-
Source/WTF/ChangeLog (modified) (1 diff)
-
Source/WTF/wtf/Platform.h (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (104 diffs)
-
Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (modified) (1 diff)
-
Source/WebCore/page/ContextMenuController.cpp (modified) (1 diff)
-
Source/WebCore/platform/ContextMenu.cpp (modified) (2 diffs)
-
Source/WebCore/platform/ContextMenu.h (modified) (2 diffs)
-
Source/WebCore/platform/ContextMenuItem.cpp (modified) (2 diffs)
-
Source/WebCore/platform/ContextMenuItem.h (modified) (5 diffs)
-
Source/WebCore/platform/mac/ContextMenuItemMac.mm (deleted)
-
Source/WebCore/platform/mac/ContextMenuMac.mm (deleted)
-
Source/WebKit/mac/ChangeLog (modified) (1 diff)
-
Source/WebKit/mac/WebView/WebHTMLView.mm (modified) (2 diffs)
-
Source/WebKit2/ChangeLog (modified) (1 diff)
-
Source/WebKit2/Shared/WebContextMenuItemData.cpp (modified) (1 diff)
-
Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (modified) (1 diff)
-
Source/cmake/OptionsEfl.cmake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r192357 r192376 1 2015-11-11 Anders Carlsson <andersca@apple.com> 2 3 Enable cross-platform context menus by default 4 https://bugs.webkit.org/show_bug.cgi?id=151173 5 6 Reviewed by Tim Horton. 7 8 * Source/cmake/OptionsEfl.cmake: 9 1 10 2015-11-12 Csaba Osztrogonác <ossy@webkit.org> 2 11 -
trunk/Source/WTF/ChangeLog
r192357 r192376 1 2015-11-11 Anders Carlsson <andersca@apple.com> 2 3 Enable cross-platform context menus by default 4 https://bugs.webkit.org/show_bug.cgi?id=151173 5 6 Reviewed by Tim Horton. 7 8 * wtf/Platform.h: 9 1 10 2015-11-12 Csaba Osztrogonác <ossy@webkit.org> 2 11 -
trunk/Source/WTF/wtf/Platform.h
r192247 r192376 931 931 #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK 932 932 933 #if PLATFORM(WIN) || PLATFORM(GTK)934 #define USE_CROSS_PLATFORM_CONTEXT_MENUS 1935 #endif936 937 933 #if PLATFORM(COCOA) && HAVE(ACCESSIBILITY) 938 934 #define USE_ACCESSIBILITY_CONTEXT_MENUS 1 -
trunk/Source/WebCore/ChangeLog
r192372 r192376 1 2015-11-11 Anders Carlsson <andersca@apple.com> 2 3 Enable cross-platform context menus by default 4 https://bugs.webkit.org/show_bug.cgi?id=151173 5 6 Reviewed by Tim Horton. 7 8 * WebCore.xcodeproj/project.pbxproj: 9 * bindings/js/JSInspectorFrontendHostCustom.cpp: 10 (WebCore::JSInspectorFrontendHost::showContextMenu): 11 * page/ContextMenuController.cpp: 12 (WebCore::ContextMenuController::addInspectElementItem): Deleted. 13 * platform/ContextMenu.cpp: 14 * platform/ContextMenu.h: 15 * platform/ContextMenuItem.cpp: 16 * platform/ContextMenuItem.h: 17 (WebCore::ContextMenuItem::isNull): Deleted. 18 * platform/mac/ContextMenuItemMac.mm: Removed. 19 (WebCore::menuToArray): Deleted. 20 (WebCore::ContextMenuItem::ContextMenuItem): Deleted. 21 (WebCore::createPlatformMenuItemDescription): Deleted. 22 (WebCore::ContextMenuItem::~ContextMenuItem): Deleted. 23 (WebCore::ContextMenuItem::platformDescription): Deleted. 24 (WebCore::ContextMenuItem::type): Deleted. 25 (WebCore::ContextMenuItem::action): Deleted. 26 (WebCore::ContextMenuItem::title): Deleted. 27 (WebCore::ContextMenuItem::platformSubMenu): Deleted. 28 (WebCore::ContextMenuItem::setType): Deleted. 29 (WebCore::ContextMenuItem::setAction): Deleted. 30 (WebCore::ContextMenuItem::setTitle): Deleted. 31 (WebCore::ContextMenuItem::setSubMenu): Deleted. 32 (WebCore::ContextMenuItem::setChecked): Deleted. 33 (WebCore::ContextMenuItem::setEnabled): Deleted. 34 (WebCore::ContextMenuItem::enabled): Deleted. 35 (WebCore::ContextMenuItem::checked): Deleted. 36 * platform/mac/ContextMenuMac.mm: Removed. 37 (WebCore::ContextMenu::ContextMenu): Deleted. 38 (WebCore::ContextMenu::~ContextMenu): Deleted. 39 (WebCore::ContextMenu::appendItem): Deleted. 40 (WebCore::ContextMenu::insertItem): Deleted. 41 (WebCore::ContextMenu::itemCount): Deleted. 42 (WebCore::ContextMenu::setPlatformDescription): Deleted. 43 (WebCore::ContextMenu::platformDescription): Deleted. 44 (WebCore::ContextMenu::releasePlatformDescription): Deleted. 45 (WebCore::contextMenuItemVector): Deleted. 46 (WebCore::platformMenuDescription): Deleted. 47 1 48 2015-11-12 Myles C. Maxfield <mmaxfield@apple.com> 2 49 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r192365 r192376 57 57 05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; }; 58 58 06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; }; 59 06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */; };60 59 062287840B4DB322000C34DF /* FocusDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 062287830B4DB322000C34DF /* FocusDirection.h */; settings = {ATTRIBUTES = (Private, ); }; }; 61 60 065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 822 821 1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; }; 823 822 1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; }; 823 1AB40EE11BF427D600BA81BE /* ContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */; }; 824 1AB40EE21BF427DB00BA81BE /* ContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */; }; 824 825 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; }; 825 826 1AB5EBD2194A50F30059AC70 /* HTTPHeaderNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC900C21943C0A0008625B5 /* HTTPHeaderNames.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3614 3615 93B2D8180F9920EE006AE6B2 /* SuddenTermination.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B2D8170F9920EE006AE6B2 /* SuddenTermination.mm */; }; 3615 3616 93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3616 93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */; };3617 3617 93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */; }; 3618 3618 93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 7288 7288 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; }; 7289 7289 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; }; 7290 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuItemMac.mm; sourceTree = "<group>"; };7291 7290 062287830B4DB322000C34DF /* FocusDirection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusDirection.h; sourceTree = "<group>"; }; 7292 7291 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuClient.h; sourceTree = "<group>"; }; … … 8144 8143 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeNode.h; sourceTree = "<group>"; }; 8145 8144 1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 8145 1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenu.cpp; sourceTree = "<group>"; }; 8146 1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenuItem.cpp; sourceTree = "<group>"; }; 8146 8147 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeValue.cpp; sourceTree = "<group>"; }; 8147 8148 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; }; … … 11115 11116 93B2D8170F9920EE006AE6B2 /* SuddenTermination.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SuddenTermination.mm; sourceTree = "<group>"; }; 11116 11117 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenu.h; sourceTree = "<group>"; }; 11117 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuMac.mm; sourceTree = "<group>"; };11118 11118 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMBinding.cpp; sourceTree = "<group>"; }; 11119 11119 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMBinding.h; sourceTree = "<group>"; }; … … 15821 15821 isa = PBXGroup; 15822 15822 children = ( 15823 7AE6C9371BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp */,15824 15823 E1A8E56417552B2A007488E7 /* CFURLExtras.cpp */, 15825 15824 E1A8E56517552B2A007488E7 /* CFURLExtras.h */, … … 15831 15830 517A63C11B74317E00E7DCDC /* KeyedEncoderCF.cpp */, 15832 15831 517A63C21B74317E00E7DCDC /* KeyedEncoderCF.h */, 15832 7AE6C9371BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp */, 15833 15833 5CBC8DAA1AAA302200E1C803 /* MediaAccessibilitySoftLink.cpp */, 15834 15834 5CBC8DAB1AAA302200E1C803 /* MediaAccessibilitySoftLink.h */, … … 16895 16895 5198F7AA1BBDD3E300E2CC5F /* IDBTransactionInfo.cpp */, 16896 16896 5198F7AB1BBDD3E300E2CC5F /* IDBTransactionInfo.h */, 16897 517138ED1BED1D17000D5F01 /* IndexKey.cpp */, 16898 517138EE1BED1D17000D5F01 /* IndexKey.h */, 16897 16899 510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */, 16898 16900 510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */, 16899 517138ED1BED1D17000D5F01 /* IndexKey.cpp */,16900 517138EE1BED1D17000D5F01 /* IndexKey.h */,16901 16901 ); 16902 16902 path = shared; … … 17144 17144 07D6A4ED1BECF2D200174146 /* MockRealtimeMediaSource.cpp */, 17145 17145 07D6A4EE1BECF2D200174146 /* MockRealtimeMediaSource.h */, 17146 4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */, 17147 4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */, 17146 17148 07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */, 17147 17149 07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */, 17148 4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */,17149 4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */,17150 17150 AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */, 17151 17151 AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */, … … 17502 17502 65A640F00533BB1F0085E777 /* BlockExceptions.h */, 17503 17503 65F80697054D9F86008BF776 /* BlockExceptions.mm */, 17504 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,17505 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */,17506 17504 F58784F002DE375901EA4122 /* CursorMac.mm */, 17507 17505 A795463D0B5C4C80007B438F /* DragDataMac.mm */, … … 17599 17597 isa = PBXGroup; 17600 17598 children = ( 17601 ADBAD6EC1BCDD95000381325 /* ResourceUsageOverlay.cpp */,17602 ADBAD6ED1BCDD95000381325 /* ResourceUsageOverlay.h */,17603 17599 316FE1060E6E1D8400BF6088 /* animation */, 17604 17600 5D5975B5196362BE00D00878 /* cocoa */, … … 17748 17744 B776D43C1104527500BEB0EC /* PrintContext.cpp */, 17749 17745 B776D43A1104525D00BEB0EC /* PrintContext.h */, 17746 ADBAD6EC1BCDD95000381325 /* ResourceUsageOverlay.cpp */, 17747 ADBAD6ED1BCDD95000381325 /* ResourceUsageOverlay.h */, 17750 17748 BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */, 17751 17749 BCEC01BB0C274DAC009F4EC9 /* Screen.h */, … … 18651 18649 isa = PBXGroup; 18652 18650 children = ( 18653 2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */,18654 2D77AC271BF2B9860072470A /* NSApplicationSPI.h */,18655 18651 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */, 18656 18652 2D59F1BE1A0044C6001F3D29 /* DataDetectorsSPI.h */, 18657 18653 2D413F601A187A3F0041A521 /* LookupSPI.h */, 18654 2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */, 18655 2D77AC271BF2B9860072470A /* NSApplicationSPI.h */, 18658 18656 2DB9C4A91B3231F40070F27F /* NSEventSPI.h */, 18659 18657 1C6466271A12C3F90094603C /* NSFontSPI.h */, … … 22449 22447 isa = PBXGroup; 22450 22448 children = ( 22451 7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */,22452 7AE6C93A1BE0C60100E19E03 /* MainThreadSharedTimer.h */,22453 22449 49E912A40EFAC8E6009D0CAF /* animation */, 22454 22450 FD31604012B026A300C1A359 /* audio */, … … 22478 22474 41D015C90F4B5C71004A662F /* ContentType.cpp */, 22479 22475 41D015C80F4B5C71004A662F /* ContentType.h */, 22476 1AB40EDF1BF4271E00BA81BE /* ContextMenu.cpp */, 22480 22477 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */, 22478 1AB40EE01BF4271E00BA81BE /* ContextMenuItem.cpp */, 22481 22479 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */, 22482 22480 311C08BC18E35D6800B65615 /* ControlStates.h */, … … 22534 22532 A8239DFE09B3CF8A00B60641 /* Logging.cpp */, 22535 22533 A8239DFF09B3CF8A00B60641 /* Logging.h */, 22534 7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */, 22535 7AE6C93A1BE0C60100E19E03 /* MainThreadSharedTimer.h */, 22536 22536 CDF2B003181F059C00F2B424 /* MediaDescription.h */, 22537 22537 CD641EC7181ED60100EE4C41 /* MediaSample.h */, … … 23307 23307 409EBDB516B7EEA300CBA3FC /* FontLoader.h */, 23308 23308 409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */, 23309 C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */, 23309 23310 CD4E0AFA11F7BC27009D3811 /* fullscreen.css */, 23310 23311 93CA4C9909DF93FA00DF8677 /* html.css */, … … 23414 23415 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */, 23415 23416 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */, 23416 C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,23417 23417 ); 23418 23418 path = css; … … 24991 24991 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */, 24992 24992 81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */, 24993 51771DFF1BDB485000CAE8E4 /* MemoryObjectStore.h in Headers */,24994 24993 81AC599A131636E60009A7E0 /* DataTransferItemList.h in Headers */, 24995 24994 E4A007831B820EC8002C5A6E /* DataURLDecoder.h in Headers */, … … 25014 25013 FD1660A513787C6D001FFA7B /* DenormalDisabler.h in Headers */, 25015 25014 A7C9ABF91357A3BF00F5503F /* DetailsMarkerControl.h in Headers */, 25015 A1ED778D1BE3294000DC1791 /* Device.h in Headers */, 25016 25016 CCC2B51415F613060048CDD6 /* DeviceClient.h in Headers */, 25017 25017 CCC2B51615F613060048CDD6 /* DeviceController.h in Headers */, … … 25273 25273 85183B4A0AA6926100F19FA3 /* DOMHTMLQuoteElement.h in Headers */, 25274 25274 85E711C40AC5D5350053270F /* DOMHTMLQuoteElementInternal.h in Headers */, 25275 51F798E61BE88092008AE491 /* IDBCursorImpl.h in Headers */,25276 25275 85DF819B0AA77E4B00486AD7 /* DOMHTMLScriptElement.h in Headers */, 25277 25276 85E711C50AC5D5350053270F /* DOMHTMLScriptElementInternal.h in Headers */, … … 25378 25377 850B41C30AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h in Headers */, 25379 25378 85C7F4910AAF79DC004014DD /* DOMUIEvent.h in Headers */, 25380 A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */,25381 25379 85989DD00ACC8BBD00A0BC51 /* DOMUIEventInternal.h in Headers */, 25382 25380 FED13D2A0CEA91DF00D89466 /* DOMUIKitExtensions.h in Headers */, … … 25396 25394 31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */, 25397 25395 31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */, 25398 C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */,25399 25396 3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */, 25400 25397 3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */, … … 25565 25562 B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */, 25566 25563 C58361A91744523F00173511 /* FontServicesIOS.h in Headers */, 25564 C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */, 25567 25565 4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */, 25568 25566 D05CED2A0A40BB2C00C5AF38 /* FormatBlockCommand.h in Headers */, … … 25628 25626 0F580B0D0F12A2690051D689 /* GraphicsLayer.h in Headers */, 25629 25627 499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */, 25630 07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */,25631 25628 0F580B0E0F12A2690051D689 /* GraphicsLayerClient.h in Headers */, 25632 07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */,25633 25629 1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */, 25634 25630 0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */, … … 25702 25698 A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */, 25703 25699 14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */, 25704 077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */,25705 25700 93E241FF0B2B4E4000C732A1 /* HTMLFrameOwnerElement.h in Headers */, 25706 25701 A871DE280A152AC800B12A68 /* HTMLFrameSetElement.h in Headers */, … … 25708 25703 A8EA7CB80A192B9C00A8EF5F /* HTMLHeadingElement.h in Headers */, 25709 25704 A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */, 25710 517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */,25711 25705 A871DE270A152AC800B12A68 /* HTMLHtmlElement.h in Headers */, 25712 25706 A871DE2A0A152AC800B12A68 /* HTMLIFrameElement.h in Headers */, … … 25809 25803 51F41A6A1BA73B5B002E053B /* IDBCursorBackend.h in Headers */, 25810 25804 51F41A6C1BA73B5B002E053B /* IDBCursorBackendOperations.h in Headers */, 25805 51F798E61BE88092008AE491 /* IDBCursorImpl.h in Headers */, 25811 25806 5185FC7E1BB4C4E80012898F /* IDBCursorWithValue.h in Headers */, 25807 51F798F41BE88394008AE491 /* IDBCursorWithValueImpl.h in Headers */, 25812 25808 5185FC811BB4C4E80012898F /* IDBDatabase.h in Headers */, 25813 25809 51F41A6E1BA73B5B002E053B /* IDBDatabaseBackend.h in Headers */, … … 25827 25823 5185FC8F1BB4C4E80012898F /* IDBGetResult.h in Headers */, 25828 25824 5185FC911BB4C4E80012898F /* IDBIndex.h in Headers */, 25825 51F798E81BE88092008AE491 /* IDBIndexImpl.h in Headers */, 25826 51F798F01BE880E7008AE491 /* IDBIndexInfo.h in Headers */, 25829 25827 5185FC931BB4C4E80012898F /* IDBIndexMetadata.h in Headers */, 25830 25828 5185FC951BB4C4E80012898F /* IDBKey.h in Headers */, … … 25834 25832 5185FC9E1BB4C4E80012898F /* IDBKeyRangeData.h in Headers */, 25835 25833 5185FCA01BB4C4E80012898F /* IDBObjectStore.h in Headers */, 25834 516071311BD8308600DBC4F2 /* IDBObjectStoreImpl.h in Headers */, 25835 5160712F1BD8307800DBC4F2 /* IDBObjectStoreInfo.h in Headers */, 25836 25836 5185FCA21BB4C4E80012898F /* IDBObjectStoreMetadata.h in Headers */, 25837 25837 5185FCA41BB4C4E80012898F /* IDBOpenDBRequest.h in Headers */, … … 25896 25896 DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */, 25897 25897 5185FCB21BB4C4E80012898F /* IndexedDB.h in Headers */, 25898 517138F01BED1D1A000D5F01 /* IndexKey.h in Headers */, 25899 51EEAA741BEFFAB100218008 /* IndexValueEntry.h in Headers */, 25900 517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */, 25898 25901 A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */, 25899 25902 B57CB52E182A3EFC0079A647 /* InlineElementBox.h in Headers */, … … 25927 25930 7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */, 25928 25931 7A54858014E02D51006AE05A /* InspectorHistory.h in Headers */, 25929 518F97031BE94C630023187C /* MemoryIndex.h in Headers */,25930 25932 7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */, 25931 25933 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */, 25932 25934 A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */, 25933 25935 71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */, 25936 82AB1776125C826700C5069D /* InspectorNetworkAgent.h in Headers */, 25934 25937 504AACCE1834455900E3D9BC /* InspectorNodeFinder.h in Headers */, 25935 25938 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */, 25936 25939 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */, 25937 25940 99CC0B6718BE9F15006CEBCC /* InspectorReplayAgent.h in Headers */, 25938 82AB1776125C826700C5069D /* InspectorNetworkAgent.h in Headers */,25939 25941 82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */, 25940 25942 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */, … … 26180 26182 070756D414239A4F00414161 /* JSHTMLTrackElement.h in Headers */, 26181 26183 1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */, 26182 2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */,26183 26184 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, 26184 26185 E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, … … 26347 26348 B2FA3D5F0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.h in Headers */, 26348 26349 B2FA3D610AB75A6F000E5AC4 /* JSSVGCursorElement.h in Headers */, 26349 516071311BD8308600DBC4F2 /* IDBObjectStoreImpl.h in Headers */,26350 26350 B2FA3D630AB75A6F000E5AC4 /* JSSVGDefsElement.h in Headers */, 26351 26351 B2FA3D650AB75A6F000E5AC4 /* JSSVGDescElement.h in Headers */, … … 26389 26389 B2FA3D990AB75A6F000E5AC4 /* JSSVGForeignObjectElement.h in Headers */, 26390 26390 B2FA3D9B0AB75A6F000E5AC4 /* JSSVGGElement.h in Headers */, 26391 51F798F41BE88394008AE491 /* IDBCursorWithValueImpl.h in Headers */,26392 26391 B27B28280CEF0C0700D39D54 /* JSSVGGlyphElement.h in Headers */, 26393 26392 24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */, … … 26406 26405 B27B282A0CEF0C0700D39D54 /* JSSVGMissingGlyphElement.h in Headers */, 26407 26406 4496E3A0139813A5003EE32A /* JSSVGMPathElement.h in Headers */, 26408 51D7EFEA1BDE8F8C00E93E10 /* ThreadSafeDataBuffer.h in Headers */,26409 26407 8542A7970AE5C94300DF58DF /* JSSVGNumber.h in Headers */, 26410 26408 B2FA3DB10AB75A6F000E5AC4 /* JSSVGNumberList.h in Headers */, … … 26497 26495 7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */, 26498 26496 7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */, 26499 077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */,26500 26497 6E3FAD3914733F4000E42306 /* JSWebGLCompressedTextureS3TC.h in Headers */, 26501 26498 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */, … … 26626 26623 CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */, 26627 26624 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */, 26625 7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */, 26628 26626 1A8F6BC60DB55CDC001DB794 /* ManifestParser.h in Headers */, 26629 26627 93309DF8099E64920056E581 /* markup.h in Headers */, … … 26639 26637 49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */, 26640 26638 5CBC8DAD1AAA302200E1C803 /* MediaAccessibilitySoftLink.h in Headers */, 26641 07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */,26642 26639 931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */, 26643 26640 078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */, … … 26666 26663 07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */, 26667 26664 071E49701AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h in Headers */, 26665 077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */, 26668 26666 078E43DA1ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.h in Headers */, 26669 26667 078E43DD1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.h in Headers */, 26668 077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */, 26670 26669 E44613E40CD681A200FADA75 /* MediaPlayer.h in Headers */, 26671 26670 CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */, … … 26721 26720 0705852917FDE02C005F2BCB /* MediaTrackConstraintSet.h in Headers */, 26722 26721 99C7CCB318C663E40032E413 /* MemoizedDOMResult.h in Headers */, 26722 51E1BAC31BD8064E0055D81F /* MemoryBackingStoreTransaction.h in Headers */, 26723 26723 BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */, 26724 26724 51BA4ACB1BBC5BD900DF3D6D /* MemoryIDBBackingStore.h in Headers */, 26725 518F97031BE94C630023187C /* MemoryIndex.h in Headers */, 26726 51771DFF1BDB485000CAE8E4 /* MemoryObjectStore.h in Headers */, 26725 26727 6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */, 26726 26728 93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */, … … 26740 26742 CDF2B0131820540600F2B424 /* MockMediaPlayerMediaSource.h in Headers */, 26741 26743 CDF2B0151820540600F2B424 /* MockMediaSourcePrivate.h in Headers */, 26744 07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */, 26745 07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */, 26742 26746 4A0FFA9E1AAF5E7E0062803B /* MockRealtimeMediaSourceCenter.h in Headers */, 26747 07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */, 26748 07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */, 26743 26749 CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */, 26744 26750 CDF2B0191820540700F2B424 /* MockTracks.h in Headers */, … … 26808 26814 1A569D110D7E2B82007C3983 /* npruntime_priv.h in Headers */, 26809 26815 1A927FD41416A15B003A83C8 /* nptypes.h in Headers */, 26816 2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */, 26817 2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */, 26810 26818 9BB737651B41C03500AE13EB /* NSAttributedStringSPI.h in Headers */, 26811 26819 31B313DF1B6988C500F2AABC /* NSButtonCellSPI.h in Headers */, … … 26825 26833 2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */, 26826 26834 CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */, 26835 2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */, 26827 26836 31B313DB1B69871600F2AABC /* NSURLConnectionSPI.h in Headers */, 26828 26837 CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */, 26829 26838 658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */, 26830 26839 31B313DD1B6987DB00F2AABC /* NSURLRequestSPI.h in Headers */, 26840 2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */, 26841 2D0CF8171BCF5DE1007A4937 /* NSWindowSPI.h in Headers */, 26831 26842 F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */, 26832 26843 1A569D120D7E2B82007C3983 /* objc_class.h in Headers */, … … 26988 26999 442AF7A9102CDDEA008FD4D3 /* QuickLook.h in Headers */, 26989 27000 A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */, 26990 51EEAA741BEFFAB100218008 /* IndexValueEntry.h in Headers */,26991 27001 937F4CCC1A2D48C100BB39F5 /* QuickLookMacSPI.h in Headers */, 26992 27002 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */, … … 27074 27084 439046E012DA25E800AF80A2 /* RenderMathMLOperator.h in Headers */, 27075 27085 439046E012DA25E800BF80A3 /* RenderMathMLRadicalOperator.h in Headers */, 27076 51E1BAC31BD8064E0055D81F /* MemoryBackingStoreTransaction.h in Headers */,27077 27086 439046E212DA25E800AF80A2 /* RenderMathMLRoot.h in Headers */, 27078 27087 439046E412DA25E800AF80A2 /* RenderMathMLRow.h in Headers */, … … 27089 27098 BCE32B9C1517C0B200F542EC /* RenderMultiColumnSet.h in Headers */, 27090 27099 BC1A7D9818FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h in Headers */, 27091 2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */,27092 27100 8AC822FD180FC03300FB64D5 /* RenderNamedFlowFragment.h in Headers */, 27093 27101 BC85F23D151915E000BC17BE /* RenderNamedFlowThread.h in Headers */, … … 27095 27103 BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */, 27096 27104 A43BF59D1149292800C643CA /* RenderProgress.h in Headers */, 27097 51F798E81BE88092008AE491 /* IDBIndexImpl.h in Headers */,27098 27105 B5B65874186FDE4C009C26E8 /* RenderPtr.h in Headers */, 27099 27106 5A574F25131DB93900471B88 /* RenderQuote.h in Headers */, … … 27198 27205 7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */, 27199 27206 514C767F0CE923A1007EF3CD /* ResourceResponseBase.h in Headers */, 27207 ADBAD6EF1BCDD95700381325 /* ResourceUsageOverlay.h in Headers */, 27200 27208 FD3160A512B026F700C1A359 /* Reverb.h in Headers */, 27201 27209 FD3160A712B026F700C1A359 /* ReverbAccumulationBuffer.h in Headers */, … … 27264 27272 41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */, 27265 27273 93B70D7009EB0C7C009D8468 /* ScriptController.h in Headers */, 27266 516071321BD8308B00DBC4F2 /* TransactionOperation.h in Headers */,27267 27274 4998AED213FB224D0090B1AA /* ScriptedAnimationController.h in Headers */, 27268 27275 08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */, … … 27290 27297 1AA84F05143BA7BD0051D153 /* ScrollController.h in Headers */, 27291 27298 0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */, 27292 2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */,27293 27299 1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */, 27294 27300 0FC4E40D187F82E10045882C /* ScrollingCoordinatorIOS.h in Headers */, … … 27350 27356 B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */, 27351 27357 93F1994F08245E59001E9ABC /* Settings.h in Headers */, 27352 517138F01BED1D1A000D5F01 /* IndexKey.h in Headers */,27353 27358 53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */, 27354 27359 0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */, … … 27450 27455 83B9687B19F8AB83004EF7AF /* StyleBuilderConverter.h in Headers */, 27451 27456 835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */, 27452 5160712F1BD8307800DBC4F2 /* IDBObjectStoreInfo.h in Headers */,27453 27457 BCEF444D0E674628001C1287 /* StyleCachedImage.h in Headers */, 27454 27458 9393E605151A9A1800066F06 /* StyleCachedImageSet.h in Headers */, … … 27785 27789 B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */, 27786 27790 933A14300B7D188600A53FFD /* TextEvent.h in Headers */, 27787 A1ED778D1BE3294000DC1791 /* Device.h in Headers */,27788 27791 A77B41A012E675A90054343D /* TextEventInputType.h in Headers */, 27789 27792 F55B3DD81251F12D003EF269 /* TextFieldInputType.h in Headers */, … … 27801 27804 E4C91A0E1802343100A17F6D /* TextPaintStyle.h in Headers */, 27802 27805 93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */, 27803 07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */,27804 27806 A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */, 27805 27807 448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */, … … 27828 27830 0F6383DE18615B29003E5DB5 /* ThreadedScrollingTree.h in Headers */, 27829 27831 E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */, 27832 51D7EFEA1BDE8F8C00E93E10 /* ThreadSafeDataBuffer.h in Headers */, 27830 27833 185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */, 27831 27834 7AA3A69A194A64E7001CBD24 /* TileController.h in Headers */, … … 27848 27851 BE913D80181EF92400DCB09E /* TrackPrivateBase.h in Headers */, 27849 27852 FFAC30FE184FB145008C4F1E /* TrailingObjects.h in Headers */, 27853 516071321BD8308B00DBC4F2 /* TransactionOperation.h in Headers */, 27850 27854 49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */, 27851 27855 FB484F4D171F821E00040755 /* TransformFunctions.h in Headers */, … … 27859 27863 37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */, 27860 27864 14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */, 27861 51F798F01BE880E7008AE491 /* IDBIndexInfo.h in Headers */,27862 ADBAD6EF1BCDD95700381325 /* ResourceUsageOverlay.h in Headers */,27863 27865 A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */, 27864 27866 854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */, … … 27869 27871 85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */, 27870 27872 85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */, 27873 A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */, 27871 27874 AA4739D21757AFEC00E76767 /* UIRequestEvent.h in Headers */, 27872 27875 9B2D8A7914997CCF00ECEF3E /* UndoStep.h in Headers */, … … 27955 27958 AA478A7F16CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.h in Headers */, 27956 27959 2D3EF4481917915C00034184 /* WebActionDisablingCALayerDelegate.h in Headers */, 27957 7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */,27958 27960 07D637401BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h in Headers */, 27959 27961 A5A7AA43132F0ECC00D3A3C2 /* WebAutocapitalize.h in Headers */, … … 27988 27990 93F199F008245E59001E9ABC /* WebCoreView.h in Headers */, 27989 27991 A5E616741894581F009ADF50 /* WebDebuggerAgent.h in Headers */, 27990 2D0CF8171BCF5DE1007A4937 /* NSWindowSPI.h in Headers */,27991 27992 FE0D84E910484348001A179E /* WebEvent.h in Headers */, 27992 27993 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */, … … 28013 28014 49C7B9D51042D32F0009D447 /* WebGLObject.h in Headers */, 28014 28015 49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */, 28015 2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */,28016 28016 6F995A201A7078B100A735F4 /* WebGLQuery.h in Headers */, 28017 28017 49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */, … … 28649 28649 BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */, 28650 28650 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */, 28651 51771DFE1BDB485000CAE8E4 /* MemoryObjectStore.cpp in Sources */,28652 28651 580371611A66F00A00BAF519 /* ClipRect.cpp in Sources */, 28653 28652 CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */, … … 28690 28689 5106D7BD18BDB76F000AB166 /* ContextMenuContext.cpp in Sources */, 28691 28690 065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */, 28692 06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */,28693 93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */,28694 28691 FD31602812B0267600C1A359 /* ConvolverNode.cpp in Sources */, 28695 28692 E1424C93164B52C800F32D40 /* CookieJar.cpp in Sources */, … … 28748 28745 CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */, 28749 28746 FBD6AF8B15EF25E5008B7110 /* CSSBasicShapes.cpp in Sources */, 28750 51EEAA731BEFFAB100218008 /* IndexValueEntry.cpp in Sources */,28751 28747 E16A84F914C85CCC002977DF /* CSSBorderImage.cpp in Sources */, 28752 28748 BC274B31140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp in Sources */, … … 28764 28760 A80E6CE70A1989CA007FB8C5 /* CSSFontFaceRule.cpp in Sources */, 28765 28761 BC64B4D70CB4298A005F2B62 /* CSSFontFaceSource.cpp in Sources */, 28766 A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */,28767 28762 BC64B4D90CB4298A005F2B62 /* CSSFontFaceSrcValue.cpp in Sources */, 28768 28763 4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */, … … 28854 28849 93309DE0099E64920056E581 /* DeleteSelectionCommand.cpp in Sources */, 28855 28850 A7C9ABF81357A3BF00F5503F /* DetailsMarkerControl.cpp in Sources */, 28851 A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */, 28856 28852 CCC2B51515F613060048CDD6 /* DeviceController.cpp in Sources */, 28857 28853 31EAF97F121435A400E7C1BF /* DeviceMotionClientIOS.mm in Sources */, … … 29056 29052 933A14AA0B7D1D0900A53FFD /* DOMTextEvent.mm in Sources */, 29057 29053 188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources */, 29058 07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */,29059 29054 76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */, 29060 29055 0F54DCD61880F867003EEDBB /* DOMTouch.mm in Sources */, … … 29161 29156 84730D861248F0B300D3A9C9 /* FEOffset.cpp in Sources */, 29162 29157 84730D881248F0B300D3A9C9 /* FESpecularLighting.cpp in Sources */, 29163 51F798E51BE88092008AE491 /* IDBCursorImpl.cpp in Sources */,29164 29158 84730D8A1248F0B300D3A9C9 /* FETile.cpp in Sources */, 29165 29159 84730D8C1248F0B300D3A9C9 /* FETurbulence.cpp in Sources */, … … 29205 29199 B275357A0B053814002CE64F /* FloatSizeMac.mm in Sources */, 29206 29200 D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */, 29207 5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */,29208 29201 14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */, 29209 29202 B6D9D23614EABD260090D75E /* FocusEvent.cpp in Sources */, … … 29351 29344 A81369E1097374F600D74463 /* HTMLLegendElement.cpp in Sources */, 29352 29345 A8EA79FC0A1916DF00A8EF5F /* HTMLLIElement.cpp in Sources */, 29346 1AB40EE11BF427D600BA81BE /* ContextMenuItem.cpp in Sources */, 29353 29347 A871DC210A15205700B12A68 /* HTMLLinkElement.cpp in Sources */, 29354 29348 A8EA7D320A19385500A8EF5F /* HTMLMapElement.cpp in Sources */, … … 29359 29353 A8EA79F80A1916DF00A8EF5F /* HTMLMenuElement.cpp in Sources */, 29360 29354 2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */, 29361 7AE6C9381BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp in Sources */,29362 29355 A871DC270A15205700B12A68 /* HTMLMetaElement.cpp in Sources */, 29363 29356 A454424A119B3661009BE912 /* HTMLMeterElement.cpp in Sources */, … … 29431 29424 51F41A691BA73B5B002E053B /* IDBCursorBackend.cpp in Sources */, 29432 29425 51F41A6B1BA73B5B002E053B /* IDBCursorBackendOperations.cpp in Sources */, 29426 51F798E51BE88092008AE491 /* IDBCursorImpl.cpp in Sources */, 29433 29427 5185FC7D1BB4C4E80012898F /* IDBCursorWithValue.cpp in Sources */, 29428 51F798F31BE88394008AE491 /* IDBCursorWithValueImpl.cpp in Sources */, 29434 29429 5185FC801BB4C4E80012898F /* IDBDatabase.cpp in Sources */, 29435 29430 51F41A6D1BA73B5B002E053B /* IDBDatabaseBackend.cpp in Sources */, … … 29445 29440 5103104F1BA8CC03003329C0 /* IDBFactoryImpl.cpp in Sources */, 29446 29441 5185FC901BB4C4E80012898F /* IDBIndex.cpp in Sources */, 29442 51F798E71BE88092008AE491 /* IDBIndexImpl.cpp in Sources */, 29443 51F798EF1BE880E7008AE491 /* IDBIndexInfo.cpp in Sources */, 29447 29444 5185FC941BB4C4E80012898F /* IDBKey.cpp in Sources */, 29448 29445 5185FC961BB4C4E80012898F /* IDBKeyData.cpp in Sources */, … … 29451 29448 5185FC9D1BB4C4E80012898F /* IDBKeyRangeData.cpp in Sources */, 29452 29449 5185FC9F1BB4C4E80012898F /* IDBObjectStore.cpp in Sources */, 29450 516071301BD8308600DBC4F2 /* IDBObjectStoreImpl.cpp in Sources */, 29451 5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */, 29453 29452 5185FCA31BB4C4E80012898F /* IDBOpenDBRequest.cpp in Sources */, 29454 29453 5103105A1BA8DB56003329C0 /* IDBOpenDBRequestImpl.cpp in Sources */, … … 29500 29499 BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */, 29501 29500 DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */, 29501 517138EF1BED1D1A000D5F01 /* IndexKey.cpp in Sources */, 29502 51EEAA731BEFFAB100218008 /* IndexValueEntry.cpp in Sources */, 29503 517138F71BF128BB000D5F01 /* IndexValueStore.cpp in Sources */, 29502 29504 A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */, 29503 29505 B57CB52D182A3EED0079A647 /* InlineElementBox.cpp in Sources */, … … 29527 29529 7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */, 29528 29530 F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */, 29529 077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */,29530 29531 7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */, 29531 29532 7A54857F14E02D51006AE05A /* InspectorHistory.cpp in Sources */, … … 29534 29535 A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */, 29535 29536 71B1E1261640491A00B1880A /* InspectorLayerTreeAgent.cpp in Sources */, 29537 82AB1775125C826700C5069D /* InspectorNetworkAgent.cpp in Sources */, 29536 29538 504AACCD1834455900E3D9BC /* InspectorNodeFinder.cpp in Sources */, 29537 29539 7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */, 29538 29540 4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */, 29539 29541 99CC0B6618BE9F15006CEBCC /* InspectorReplayAgent.cpp in Sources */, 29540 82AB1775125C826700C5069D /* InspectorNetworkAgent.cpp in Sources */,29541 29542 82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */, 29542 29543 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */, … … 29640 29641 BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */, 29641 29642 FD67773A195CB14A0072E0D3 /* JSCSSSupportsRule.cpp in Sources */, 29642 ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */,29643 29643 14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */, 29644 29644 BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */, … … 29820 29820 A80E7B0F0A19D606007FB8C5 /* JSHTMLStyleElement.cpp in Sources */, 29821 29821 BCA169A20BFD55B40019CA76 /* JSHTMLTableCaptionElement.cpp in Sources */, 29822 517138F71BF128BB000D5F01 /* IndexValueStore.cpp in Sources */,29823 29822 BC06EDE30BFD6D0D00856E9D /* JSHTMLTableCellElement.cpp in Sources */, 29824 29823 BC06ED9D0BFD660600856E9D /* JSHTMLTableColElement.cpp in Sources */, … … 29914 29913 073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */, 29915 29914 14DC0D3709FED073007B0235 /* JSNode.cpp in Sources */, 29916 07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */,29917 29915 BCD9C2640C17AA67005C90A2 /* JSNodeCustom.cpp in Sources */, 29918 29916 14115B7209F84CD600CA4FC1 /* JSNodeFilter.cpp in Sources */, … … 29993 29991 AA2A5AD316A4860D00976A25 /* JSSpeechSynthesisEvent.cpp in Sources */, 29994 29992 AA7FEEA616A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp in Sources */, 29995 517138EF1BED1D1A000D5F01 /* IndexKey.cpp in Sources */,29996 29993 AA7FEEA816A4E6F3004C0C33 /* JSSpeechSynthesisVoice.cpp in Sources */, 29997 29994 514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */, … … 30009 30006 51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */, 30010 30007 51E0BAEA0DA55D4A00A9E417 /* JSStorageEvent.cpp in Sources */, 30011 51F798E71BE88092008AE491 /* IDBIndexImpl.cpp in Sources */,30012 30008 0FF50269102BA9430066F39A /* JSStyleMedia.cpp in Sources */, 30013 30009 BCE0139A0C0BEF180043860A /* JSStyleSheet.cpp in Sources */, … … 30112 30108 B2FA3DBE0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicAbs.cpp in Sources */, 30113 30109 B2FA3DC00AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicRel.cpp in Sources */, 30114 51E1BAC21BD8064E0055D81F /* MemoryBackingStoreTransaction.cpp in Sources */,30115 30110 B2FA3DC20AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothAbs.cpp in Sources */, 30116 30111 B2FA3DC40AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothRel.cpp in Sources */, … … 30131 30126 B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */, 30132 30127 8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */, 30133 07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */,30134 30128 B2FA3DE20AB75A6F000E5AC4 /* JSSVGPointList.cpp in Sources */, 30135 30129 B2FA3DE50AB75A6F000E5AC4 /* JSSVGPolygonElement.cpp in Sources */, … … 30161 30155 B2FA3E160AB75A6F000E5AC4 /* JSSVGViewElement.cpp in Sources */, 30162 30156 7118FED415685CC60030B79A /* JSSVGViewSpec.cpp in Sources */, 30163 07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */,30164 30157 8485227D1190162C006EDC7F /* JSSVGVKernElement.cpp in Sources */, 30165 30158 71DCB7011568197600862271 /* JSSVGZoomAndPan.cpp in Sources */, … … 30334 30327 1A0409F31A43675C009E47F3 /* MachSendRight.cpp in Sources */, 30335 30328 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */, 30329 7AE6C93B1BE0C60100E19E03 /* MainThreadSharedTimer.cpp in Sources */, 30330 7AE6C9381BE0C5C800E19E03 /* MainThreadSharedTimerCF.cpp in Sources */, 30336 30331 1A8F6BC50DB55CDC001DB794 /* ManifestParser.cpp in Sources */, 30337 30332 93309DF7099E64920056E581 /* markup.cpp in Sources */, … … 30371 30366 A8EA80090A19516E00A8EF5F /* MediaList.cpp in Sources */, 30372 30367 071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */, 30368 077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */, 30373 30369 078E43D91ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.cpp in Sources */, 30374 30370 078E43DE1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.mm in Sources */, 30371 077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */, 30375 30372 E44613E30CD6819F00FADA75 /* MediaPlayer.cpp in Sources */, 30376 30373 072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */, … … 30402 30399 FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */, 30403 30400 0705851517FB0EEA005F2BCB /* MediaStreamCapabilities.cpp in Sources */, 30404 51F798F31BE88394008AE491 /* IDBCursorWithValueImpl.cpp in Sources */,30405 30401 078E090017D14CEE00420AA1 /* MediaStreamEvent.cpp in Sources */, 30406 30402 0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */, … … 30416 30412 0705853817FE044F005F2BCB /* MediaTrackConstraintSet.cpp in Sources */, 30417 30413 99C7CCB518C6B8990032E413 /* MemoizedDOMResult.cpp in Sources */, 30414 51E1BAC21BD8064E0055D81F /* MemoryBackingStoreTransaction.cpp in Sources */, 30418 30415 BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */, 30419 30416 51BA4ACA1BBC5BD900DF3D6D /* MemoryIDBBackingStore.cpp in Sources */, 30417 518F97021BE94C630023187C /* MemoryIndex.cpp in Sources */, 30418 51771DFE1BDB485000CAE8E4 /* MemoryObjectStore.cpp in Sources */, 30420 30419 657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */, 30421 30420 ADB6B29818FB90240081963E /* MemoryPressureHandlerCocoa.mm in Sources */, … … 30434 30433 CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */, 30435 30434 CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */, 30435 07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */, 30436 07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */, 30436 30437 4A0FFA9D1AAF5E750062803B /* MockRealtimeMediaSourceCenter.cpp in Sources */, 30438 07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */, 30439 07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */, 30437 30440 CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */, 30438 30441 CDF2B0181820540700F2B424 /* MockTracks.cpp in Sources */, … … 30519 30522 F34742DC134362F000531BC2 /* PageDebuggerAgent.cpp in Sources */, 30520 30523 9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */, 30521 ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */,30522 30524 7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */, 30525 834DD4F41BE08989002C9C3E /* PageMac.mm in Sources */, 30523 30526 2D5C9CFF19C7B52E00B3C5C1 /* PageOverlay.cpp in Sources */, 30524 30527 2D5C9D0119C7B52E00B3C5C1 /* PageOverlayController.cpp in Sources */, … … 30663 30666 0F580D000F12DE9B0051D689 /* RenderLayerBacking.cpp in Sources */, 30664 30667 0F580CFE0F12DE9B0051D689 /* RenderLayerCompositor.cpp in Sources */, 30665 834DD4F41BE08989002C9C3E /* PageMac.mm in Sources */,30666 30668 50D10D991545F5760096D288 /* RenderLayerFilterInfo.cpp in Sources */, 30667 30669 3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */, … … 30773 30775 7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */, 30774 30776 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */, 30777 ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */, 30778 ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */, 30775 30779 FD3160A412B026F700C1A359 /* Reverb.cpp in Sources */, 30776 30780 FD3160A612B026F700C1A359 /* ReverbAccumulationBuffer.cpp in Sources */, … … 30901 30905 B8DBDB4B130B0F8A00F5CDB1 /* SetSelectionCommand.cpp in Sources */, 30902 30906 14C9A5EA0B3D105F005A0232 /* Settings.cpp in Sources */, 30907 A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */, 30903 30908 0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */, 30904 30909 BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */, … … 30907 30912 FD45A956175D3FB800C21EC8 /* ShapeOutsideInfo.cpp in Sources */, 30908 30913 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */, 30909 51F798EF1BE880E7008AE491 /* IDBIndexInfo.cpp in Sources */,30910 30914 1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */, 30911 30915 512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */, … … 30979 30983 8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */, 30980 30984 B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */, 30981 A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */,30982 30985 BC5EB6A20E81DC4F00B25965 /* StyleBackgroundData.cpp in Sources */, 30983 30986 BC5EB67D0E81D42000B25965 /* StyleBoxData.cpp in Sources */, … … 31116 31119 087E0AF613606D0B00FA4BA8 /* SVGGlyph.cpp in Sources */, 31117 31120 B2A1F2AD0CEF0ABF00442F6A /* SVGGlyphElement.cpp in Sources */, 31118 516071301BD8308600DBC4F2 /* IDBObjectStoreImpl.cpp in Sources */,31119 31121 24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */, 31120 31122 B2227A290D00BF220071B782 /* SVGGradientElement.cpp in Sources */, … … 31134 31136 B2227A400D00BF220071B782 /* SVGLocatable.cpp in Sources */, 31135 31137 B2227A430D00BF220071B782 /* SVGMarkerElement.cpp in Sources */, 31136 518F97021BE94C630023187C /* MemoryIndex.cpp in Sources */,31137 31138 B2227A460D00BF220071B782 /* SVGMaskElement.cpp in Sources */, 31138 31139 B2227A4A0D00BF220071B782 /* SVGMetadataElement.cpp in Sources */, … … 31235 31236 2D4F96F81A1ECC240098BF88 /* TextIndicatorWindow.mm in Sources */, 31236 31237 F55B3DD91251F12D003EF269 /* TextInputType.cpp in Sources */, 31237 51D7EFEC1BDEFA5100E93E10 /* TransactionOperation.cpp in Sources */,31238 31238 CECADFCD1537791D00E37068 /* TextInsertionBaseCommand.cpp in Sources */, 31239 31239 93309E1B099E64920056E581 /* TextIterator.cpp in Sources */, … … 31281 31281 070334D31459FFAD008D8D45 /* TrackEvent.cpp in Sources */, 31282 31282 BE88E0C11715CE2600658D98 /* TrackListBase.cpp in Sources */, 31283 077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */,31284 31283 FFAC30FF184FB145008C4F1E /* TrailingObjects.cpp in Sources */, 31284 51D7EFEC1BDEFA5100E93E10 /* TransactionOperation.cpp in Sources */, 31285 31285 49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */, 31286 31286 494BC40D12AEDD9E00743BD2 /* TransformationMatrixCA.cpp in Sources */, … … 31316 31316 5D5975B71963637B00D00878 /* UserAgent.mm in Sources */, 31317 31317 26255F0018878DFF0006E1FD /* UserAgentIOS.mm in Sources */, 31318 1AB40EE21BF427DB00BA81BE /* ContextMenu.cpp in Sources */, 31318 31319 26255F0418878E110006E1FD /* UserAgentMac.mm in Sources */, 31319 31320 CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */, … … 31481 31482 7E99AF510B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp in Sources */, 31482 31483 A14832BD187F64B400DA63A6 /* WKContentObservation.cpp in Sources */, 31483 7AE6C93B1BE0C60100E19E03 /* MainThreadSharedTimer.cpp in Sources */,31484 31484 A14832C0187F656600DA63A6 /* WKGraphics.mm in Sources */, 31485 31485 A14832C2187F65C700DA63A6 /* WKUtilities.c in Sources */, -
trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
r191887 r192376 103 103 populateContextMenuItems(&state, array, menu); 104 104 105 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS) 106 Vector<ContextMenuItem> items = contextMenuItemVector(menu.platformDescription()); 107 #else 108 Vector<ContextMenuItem> items = menu.items(); 109 #endif 110 wrapped().showContextMenu(event, items); 105 wrapped().showContextMenu(event, menu.items()); 111 106 #else 112 107 UNUSED_PARAM(state); -
trunk/Source/WebCore/page/ContextMenuController.cpp
r192333 r192376 1118 1118 1119 1119 ContextMenuItem InspectElementItem(ActionType, ContextMenuItemTagInspectElement, contextMenuItemTagInspectElement()); 1120 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)1121 1120 if (m_contextMenu && !m_contextMenu->items().isEmpty()) 1122 #else1123 if (m_contextMenu && m_contextMenu->itemCount())1124 #endif1125 1121 appendItem(*separatorItem(), m_contextMenu.get()); 1126 1122 appendItem(InspectElementItem, m_contextMenu.get()); -
trunk/Source/WebCore/platform/ContextMenu.cpp
r192341 r192376 27 27 #include "ContextMenu.h" 28 28 29 #if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)29 #if ENABLE(CONTEXT_MENUS) 30 30 31 31 namespace WebCore { … … 37 37 } // namespace WebCore 38 38 39 #endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)39 #endif // ENABLE(CONTEXT_MENUS) -
trunk/Source/WebCore/platform/ContextMenu.h
r192341 r192376 35 35 #include <wtf/text/WTFString.h> 36 36 37 #if PLATFORM(COCOA)38 #include <wtf/RetainPtr.h>39 #elif PLATFORM(WIN)40 #include <windows.h>41 #endif42 43 37 namespace WebCore { 44 38 … … 50 44 ContextMenu(); 51 45 52 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)53 46 void setItems(const Vector<ContextMenuItem>& items) { m_items = items; } 54 47 const Vector<ContextMenuItem>& items() const { return m_items; } 55 48 56 49 void appendItem(const ContextMenuItem& item) { m_items.append(item); } 57 #else58 explicit ContextMenu(const PlatformMenuDescription);59 ~ContextMenu();60 61 void insertItem(unsigned position, ContextMenuItem&);62 void appendItem(ContextMenuItem&);63 64 unsigned itemCount() const;65 66 WEBCORE_EXPORT PlatformMenuDescription platformDescription() const;67 WEBCORE_EXPORT void setPlatformDescription(PlatformMenuDescription);68 69 PlatformMenuDescription releasePlatformDescription();70 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)71 50 72 51 private: 73 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)74 52 Vector<ContextMenuItem> m_items; 75 #else76 #if PLATFORM(COCOA)77 // Keep this in sync with the PlatformMenuDescription typedef78 RetainPtr<NSMutableArray> m_platformDescription;79 #else80 PlatformMenuDescription m_platformDescription;81 #endif82 83 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)84 53 }; 85 86 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS)87 WEBCORE_EXPORT Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription);88 PlatformMenuDescription platformMenuDescription(Vector<ContextMenuItem>&);89 #endif90 54 91 55 } -
trunk/Source/WebCore/platform/ContextMenuItem.cpp
r189102 r192376 29 29 #include "ContextMenu.h" 30 30 31 #if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)31 #if ENABLE(CONTEXT_MENUS) 32 32 33 33 namespace WebCore { … … 134 134 } // namespace WebCore 135 135 136 #endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)136 #endif // ENABLE(CONTEXT_MENUS) -
trunk/Source/WebCore/platform/ContextMenuItem.h
r192341 r192376 31 31 32 32 #include "PlatformMenuDescription.h" 33 #endif // ENABLE(CONTEXT_MENUS) 34 33 35 #include <wtf/text/WTFString.h> 34 35 #if PLATFORM(COCOA)36 #include <wtf/RetainPtr.h>37 OBJC_CLASS NSImage;38 OBJC_CLASS NSMenuItem;39 #endif40 #endif // ENABLE(CONTEXT_MENUS)41 36 42 37 namespace WebCore { … … 175 170 }; 176 171 177 #if ENABLE(CONTEXT_MENUS)178 #if PLATFORM(COCOA)179 typedef NSMenuItem* PlatformMenuItemDescription;180 #else181 typedef void* PlatformMenuItemDescription;182 #endif183 184 172 class ContextMenuItem { 185 173 WTF_MAKE_FAST_ALLOCATED; … … 204 192 void setSubMenu(ContextMenu*); 205 193 206 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)207 194 ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems); 208 195 ContextMenuItem(); … … 214 201 215 202 const Vector<ContextMenuItem>& subMenuItems() const { return m_subMenuItems; } 216 #else217 public:218 WEBCORE_EXPORT explicit ContextMenuItem(PlatformMenuItemDescription);219 explicit ContextMenuItem(ContextMenu* subMenu);220 ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);221 WEBCORE_EXPORT ContextMenuItem();222 223 bool isNull() const { return !m_platformDescription; }224 225 WEBCORE_EXPORT PlatformMenuItemDescription platformDescription() const;226 227 WEBCORE_EXPORT String title() const;228 void setTitle(const String&);229 230 WEBCORE_EXPORT PlatformMenuDescription platformSubMenu() const;231 void setSubMenu(Vector<ContextMenuItem>&);232 233 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)234 203 private: 235 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)236 204 ContextMenuItemType m_type; 237 205 ContextMenuAction m_action; … … 240 208 bool m_checked; 241 209 Vector<ContextMenuItem> m_subMenuItems; 242 #else243 #if PLATFORM(COCOA)244 RetainPtr<NSMenuItem> m_platformDescription;245 #else246 PlatformMenuItemDescription m_platformDescription;247 #endif248 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)249 210 }; 250 211 251 #endif // ENABLE(CONTEXT_MENUS)252 212 } 253 213 -
trunk/Source/WebKit/mac/ChangeLog
r192357 r192376 1 2015-11-11 Anders Carlsson <andersca@apple.com> 2 3 Enable cross-platform context menus by default 4 https://bugs.webkit.org/show_bug.cgi?id=151173 5 6 Reviewed by Tim Horton. 7 8 * WebView/WebHTMLView.mm: 9 (createMenuItem): 10 (customMenuFromDefaultItems): 11 1 12 2015-11-12 Csaba Osztrogonác <ossy@webkit.org> 2 13 -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r192343 r192376 3580 3580 auto menu = adoptNS([[NSMenu alloc] init]); 3581 3581 3582 auto submenuItems = createMenuItems(hitTestResult, contextMenuItemVector(item.platformSubMenu()));3582 auto submenuItems = createMenuItems(hitTestResult, item.subMenuItems()); 3583 3583 for (NSMenuItem *menuItem in submenuItems.get()) 3584 3584 [menu addItem:menuItem]; … … 3608 3608 { 3609 3609 const auto& hitTestResult = webView.page->contextMenuController().hitTestResult(); 3610 auto defaultMenuItems = createMenuItems(hitTestResult, contextMenuItemVector(defaultMenu.platformDescription()));3610 auto defaultMenuItems = createMenuItems(hitTestResult, defaultMenu.items()); 3611 3611 3612 3612 id delegate = [webView UIDelegate]; -
trunk/Source/WebKit2/ChangeLog
r192364 r192376 1 2015-11-11 Anders Carlsson <andersca@apple.com> 2 3 Enable cross-platform context menus by default 4 https://bugs.webkit.org/show_bug.cgi?id=151173 5 6 Reviewed by Tim Horton. 7 8 * Shared/WebContextMenuItemData.cpp: 9 (WebKit::WebContextMenuItemData::WebContextMenuItemData): Deleted. 10 * WebProcess/WebPage/WebContextMenu.cpp: 11 (WebKit::WebContextMenu::menuItemsWithUserData): Deleted. 12 1 13 2015-11-12 Dan Bernstein <mitz@apple.com> 2 14 -
trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp
r191205 r192376 74 74 { 75 75 if (m_type == WebCore::SubmenuType) { 76 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)77 76 const Vector<WebCore::ContextMenuItem>& coreSubmenu = item.subMenuItems(); 78 #else79 Vector<WebCore::ContextMenuItem> coreSubmenu = WebCore::contextMenuItemVector(item.platformSubMenu());80 #endif81 77 m_submenu = kitItems(coreSubmenu); 82 78 } -
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
r192335 r192376 89 89 90 90 // Give the bundle client a chance to process the menu. 91 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)92 91 const Vector<ContextMenuItem>& coreItems = menu->items(); 93 #else94 Vector<ContextMenuItem> coreItems = contextMenuItemVector(menu->platformDescription());95 #endif96 92 97 93 if (m_page->injectedBundleContextMenuClient().getCustomMenuFromDefaultItems(*m_page, controller.hitTestResult(), coreItems, menuItems, userData)) -
trunk/Source/cmake/OptionsEfl.cmake
r191785 r192376 37 37 38 38 add_definitions(-DBUILDING_EFL__=1) 39 add_definitions(-DUSE_CROSS_PLATFORM_CONTEXT_MENUS=1)40 39 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}" 41 40 -DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
Note: See TracChangeset
for help on using the changeset viewer.
