Changeset 269865 in webkit
- Timestamp:
- Nov 16, 2020, 11:32:48 AM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 20 edited
-
WTF/ChangeLog (modified) (1 diff)
-
WTF/Scripts/Preferences/WebPreferencesInternal.yaml (modified) (1 diff)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/WebCore.xcodeproj/project.pbxproj (modified) (7 diffs)
-
WebCore/page/ContextMenuController.cpp (modified) (4 diffs)
-
WebCore/platform/ContextMenuItem.cpp (modified) (1 diff)
-
WebCore/platform/ContextMenuItem.h (modified) (1 diff)
-
WebCore/platform/LocalizedStrings.h (modified) (1 diff)
-
WebCore/platform/cocoa/LocalizedStringsCocoa.mm (modified) (1 diff)
-
WebKit/ChangeLog (modified) (1 diff)
-
WebKit/FeatureFlags/WebKit.plist (modified) (1 diff)
-
WebKit/Shared/API/c/WKContextMenuItemTypes.h (modified) (1 diff)
-
WebKit/Shared/API/c/WKSharedAPICast.h (modified) (2 diffs)
-
WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
-
WebKit/Shared/WebPreferencesDefaultValues.h (modified) (1 diff)
-
WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm (modified) (1 diff)
-
WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h (modified) (1 diff)
-
WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (modified) (1 diff)
-
WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
WebKitLegacy/mac/WebView/WebHTMLView.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r269843 r269865 1 2020-11-16 Megan Gardner <megan_gardner@apple.com> 2 3 Add menu support for app highlights for books 4 https://bugs.webkit.org/show_bug.cgi?id=218879 5 <rdar://problem/71352113> 6 7 Reviewed by Alex Christensen. 8 9 * Scripts/Preferences/WebPreferencesInternal.yaml: 10 1 11 2020-11-16 Zan Dobersek <zdobersek@igalia.com> 2 12 -
trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml
r269843 r269865 51 51 WebKit: 52 52 default: false 53 54 AppHighlightsEnabled: 55 type: bool 56 humanReadableName: "App Highlights" 57 humanReadableDescription: "Enable persistant highlights for apps" 58 exposed: [ WebKit ] 59 defaultValue: 60 WebKitLegacy: 61 default: false 62 WebKit: 63 default: WebKit::defaultAppHighlightsEnabled() 64 WebCore: 65 default: false 53 66 54 67 # FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely. -
trunk/Source/WebCore/ChangeLog
r269862 r269865 1 2020-11-16 Megan Gardner <megan_gardner@apple.com> 2 3 Add menu support for app highlights for books 4 https://bugs.webkit.org/show_bug.cgi?id=218879 5 <rdar://problem/71352113> 6 7 Reviewed by Alex Christensen. 8 9 Add menu items and associated plubling for support for books highlights in modern webkit. 10 11 * WebCore.xcodeproj/project.pbxproj: 12 * page/ContextMenuController.cpp: 13 (WebCore::ContextMenuController::contextMenuItemSelected): 14 (WebCore::ContextMenuController::populate): 15 (WebCore::ContextMenuController::checkOrEnableIfNeeded const): 16 * platform/ContextMenuItem.cpp: 17 (WebCore::isValidContextMenuAction): 18 * platform/ContextMenuItem.h: 19 * platform/LocalizedStrings.h: 20 * platform/cocoa/LocalizedStringsCocoa.mm: 21 (WebCore::contextMenuItemTagAddHighlightToCurrentGroup): 22 (WebCore::contextMenuItemTagAddHighlightToNewGroup): 23 1 24 2020-11-16 Rob Buis <rbuis@igalia.com> 2 25 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r269830 r269865 1209 1209 43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; }; 1210 1210 43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1211 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 446EE4E8255E0D9200454463 /* Localizable.strings */; }; 1211 1212 4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1212 1213 445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3995 3996 BCAB418213E356E800D8AAF3 /* Region.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAB418013E356E800D8AAF3 /* Region.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3996 3997 BCACF3BD1072921A00C0C8A3 /* UserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3997 BCAD180A131C7A0D00990406 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BCAD1808131C7A0D00990406 /* Localizable.strings */; };3998 3998 BCAE1FA712939DB7004CB026 /* ScrollAnimatorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */; }; 3999 3999 BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16BFF0979C3BD00467741 /* MemoryCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 7986 7986 445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; }; 7987 7987 446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; }; 7988 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; }; 7988 7989 4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; }; 7989 7990 4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; }; … … 21462 21463 8574D1F10ADE6122004CBA11 /* JSSVGElementWrapperFactory.cpp */, 21463 21464 8574D1F20ADE6122004CBA11 /* JSSVGElementWrapperFactory.h */, 21465 446EE4E8255E0D9200454463 /* Localizable.strings */, 21464 21466 FABE72FB1059C21100D999DD /* MathMLElementFactory.cpp */, 21465 21467 44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */, … … 35236 35238 1C11CCB40AA6093700DADB20 /* Copy Generated Headers */, 35237 35239 3717D7E717ECC573003C276D /* Copy Scripts */, 35240 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */, 35238 35241 93F199FD08245E59001E9ABC /* Resources */, 35239 35242 CD0DBF001422765700280263 /* Copy Audio Resources */, … … 35351 35354 E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */, 35352 35355 E516699120FF9918009D2C27 /* ListButtonArrow@2x.png in Resources */, 35353 BCAD180A131C7A0D00990406/* Localizable.strings in Resources */,35356 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */, 35354 35357 837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */, 35355 35358 311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */, … … 35388 35391 runOnlyForDeploymentPostprocessing = 0; 35389 35392 shellPath = /bin/sh; 35390 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names Web || exit $?\nfi"; 35393 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names Web || exit $?\nfi\n"; 35394 }; 35395 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = { 35396 isa = PBXShellScriptBuildPhase; 35397 buildActionMask = 2147483647; 35398 files = ( 35399 ); 35400 inputFileListPaths = ( 35401 ); 35402 inputPaths = ( 35403 ); 35404 name = "Concatenate Localizable.strings"; 35405 outputFileListPaths = ( 35406 ); 35407 outputPaths = ( 35408 ); 35409 runOnlyForDeploymentPostprocessing = 0; 35410 shellPath = /bin/sh; 35411 shellScript = "if [ -e $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings ] ; then\n cat $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings $SRCROOT/en.lproj/Localizable.strings > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelif [ -e $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings ] ; then\n cat $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings $SRCROOT/en.lproj/Localizable.strings > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelse\n cp $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nfi\n"; 35391 35412 }; 35392 35413 5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = { -
trunk/Source/WebCore/page/ContextMenuController.cpp
r267203 r269865 462 462 break; 463 463 #if PLATFORM(COCOA) 464 case ContextMenuItemTagAddHighlightToCurrentGroup: 465 // FIXME: Add Highlight Logic 466 break; 467 case ContextMenuItemTagAddHighlightToNewGroup: 468 // FIXME: Add Highlight Logic 469 break; 464 470 case ContextMenuItemTagSearchInSpotlight: 465 471 m_client.searchWithSpotlight(); … … 797 803 ContextMenuItem SearchSpotlightItem(ActionType, ContextMenuItemTagSearchInSpotlight, 798 804 contextMenuItemTagSearchInSpotlight()); 805 ContextMenuItem AddHighlightItem(ActionType, ContextMenuItemTagAddHighlightToCurrentGroup, contextMenuItemTagAddHighlightToCurrentGroup()); 806 ContextMenuItem AddHighlightToNewGroupItem(ActionType, ContextMenuItemTagAddHighlightToNewGroup, contextMenuItemTagAddHighlightToNewGroup()); 799 807 #endif 800 808 #if !PLATFORM(GTK) … … 920 928 #if PLATFORM(COCOA) 921 929 appendItem(*separatorItem(), m_contextMenu.get()); 930 931 if (auto* page = frame->page()) { 932 if (page->settings().appHighlightsEnabled()) { 933 appendItem(AddHighlightToNewGroupItem, m_contextMenu.get()); 934 appendItem(AddHighlightItem, m_contextMenu.get()); 935 appendItem(*separatorItem(), m_contextMenu.get()); 936 } 937 } 922 938 923 939 appendItem(ShareMenuItem, m_contextMenu.get()); … … 1277 1293 break; 1278 1294 #if PLATFORM(COCOA) 1295 case ContextMenuItemTagAddHighlightToCurrentGroup: 1296 shouldEnable = frame->selection().isRange(); 1297 break; 1298 case ContextMenuItemTagAddHighlightToNewGroup: 1299 shouldEnable = frame->selection().isRange(); 1300 break; 1279 1301 case ContextMenuItemTagSubstitutionsMenu: 1280 1302 case ContextMenuItemTagTransformationsMenu: -
trunk/Source/WebCore/platform/ContextMenuItem.cpp
r263112 r269865 217 217 case ContextMenuAction::ContextMenuItemTagTextDirectionRightToLeft: 218 218 #if PLATFORM(COCOA) 219 case ContextMenuAction::ContextMenuItemTagAddHighlightToCurrentGroup: 220 case ContextMenuAction::ContextMenuItemTagAddHighlightToNewGroup: 219 221 case ContextMenuAction::ContextMenuItemTagCorrectSpellingAutomatically: 220 222 case ContextMenuAction::ContextMenuItemTagSubstitutionsMenu: -
trunk/Source/WebCore/platform/ContextMenuItem.h
r263112 r269865 120 120 ContextMenuItemTagTextDirectionRightToLeft, 121 121 #if PLATFORM(COCOA) 122 ContextMenuItemTagAddHighlightToCurrentGroup, 123 ContextMenuItemTagAddHighlightToNewGroup, 122 124 ContextMenuItemTagCorrectSpellingAutomatically, 123 125 ContextMenuItemTagSubstitutionsMenu, -
trunk/Source/WebCore/platform/LocalizedStrings.h
r267166 r269865 50 50 #if PLATFORM(COCOA) 51 51 String copyImageUnknownFileLabel(); 52 WEBCORE_EXPORT String contextMenuItemTagAddHighlightToCurrentGroup(); 53 WEBCORE_EXPORT String contextMenuItemTagAddHighlightToNewGroup(); 52 54 #endif 53 55 -
trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm
r267166 r269865 59 59 } 60 60 61 String contextMenuItemTagAddHighlightToCurrentGroup() 62 { 63 return localizedNSString(@"Add Highlight To Current Group"); 64 } 65 66 String contextMenuItemTagAddHighlightToNewGroup() 67 { 68 return localizedNSString(@"Add Highlight To New Group"); 69 } 70 61 71 #if ENABLE(CONTEXT_MENUS) 62 72 String contextMenuItemTagSearchInSpotlight() -
trunk/Source/WebKit/ChangeLog
r269858 r269865 1 2020-11-16 Megan Gardner <megan_gardner@apple.com> 2 3 Add menu support for app highlights for books 4 https://bugs.webkit.org/show_bug.cgi?id=218879 5 <rdar://problem/71352113> 6 7 Reviewed by Alex Christensen. 8 9 Add menu items and associated plumbing for support for books highlights in modern WebKit. 10 11 * FeatureFlags/WebKit.plist: 12 * Shared/API/c/WKContextMenuItemTypes.h: 13 * Shared/API/c/WKSharedAPICast.h: 14 (WebKit::toAPI): 15 (WebKit::toImpl): 16 * Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm: 17 (WebKit::isFeatureFlagEnabled): 18 * Shared/WebPreferencesDefaultValues.cpp: 19 (WebKit::defaultAppHighlightsEnabled): 20 * Shared/WebPreferencesDefaultValues.h: 21 * UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm: 22 * UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h: 23 * UIProcess/mac/WebContextMenuProxyMac.mm: 24 (WebKit::menuItemIdentifier): 25 1 26 2020-11-16 Trevor Stevenson <trevor_s@apple.com> 2 27 -
trunk/Source/WebKit/FeatureFlags/WebKit.plist
r267516 r269865 3 3 <plist version="1.0"> 4 4 <dict> 5 <key>app_highlights</key> 6 <dict> 7 <key>Enabled</key> 8 <true/> 9 </dict> 5 10 <key>async_frame_and_overflow_scrolling</key> 6 11 <dict> -
trunk/Source/WebKit/Shared/API/c/WKContextMenuItemTypes.h
r198900 r269865 57 57 kWKContextMenuItemTagSearchWeb, 58 58 kWKContextMenuItemTagLookUpInDictionary, 59 kWKContextMenuItemTagAddHighlightToCurrentGroup, 60 kWKContextMenuItemTagAddHighlightToNewGroup, 59 61 kWKContextMenuItemTagOpenWithDefaultApplication, 60 62 kWKContextMenuItemTagPDFActualSize, -
trunk/Source/WebKit/Shared/API/c/WKSharedAPICast.h
r269665 r269865 505 505 return kWKContextMenuItemTagMediaMute; 506 506 #if PLATFORM(COCOA) 507 case WebCore::ContextMenuItemTagAddHighlightToCurrentGroup: 508 return kWKContextMenuItemTagAddHighlightToCurrentGroup; 509 case WebCore::ContextMenuItemTagAddHighlightToNewGroup: 510 return kWKContextMenuItemTagAddHighlightToNewGroup; 507 511 case WebCore::ContextMenuItemTagCorrectSpellingAutomatically: 508 512 return kWKContextMenuItemTagCorrectSpellingAutomatically; … … 699 703 return WebCore::ContextMenuItemTagMediaMute; 700 704 #if PLATFORM(COCOA) 705 case kWKContextMenuItemTagAddHighlightToCurrentGroup: 706 return WebCore::ContextMenuItemTagAddHighlightToCurrentGroup; 707 case kWKContextMenuItemTagAddHighlightToNewGroup: 708 return WebCore::ContextMenuItemTagAddHighlightToNewGroup; 701 709 case kWKContextMenuItemTagCorrectSpellingAutomatically: 702 710 return WebCore::ContextMenuItemTagCorrectSpellingAutomatically; -
trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
r269805 r269865 123 123 } 124 124 125 bool defaultAppHighlightsEnabled() 126 { 127 #if HAVE(SYSTEM_FEATURE_FLAGS) 128 return isFeatureFlagEnabled("app_highlights"); 129 #endif 130 131 #if ENABLE(APP_HIGHLIGHTS) 132 return true; 133 #endif 134 135 return false; 136 } 137 125 138 #if ENABLE(GPU_PROCESS) 126 139 -
trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h
r269805 r269865 66 66 bool defaultAsyncFrameScrollingEnabled(); 67 67 bool defaultAsyncOverflowScrollingEnabled(); 68 bool defaultAppHighlightsEnabled(); 68 69 69 70 #if ENABLE(GPU_PROCESS) -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
r260366 r269865 38 38 NSString * const _WKMenuItemIdentifierInspectElement = @"WKMenuItemIdentifierInspectElement"; 39 39 NSString * const _WKMenuItemIdentifierLookUp = @"WKMenuItemIdentifierLookUp"; 40 NSString * const _WKMenuItemIdentifierAddHighlightToCurrentGroup = @"WKMenuItemIdentifierAddHighlightToCurrentGroup"; 41 NSString * const _WKMenuItemIdentifierAddHighlightToNewGroup = @"WKMenuItemIdentifierAddHighlightToNewGroup"; 42 40 43 NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow = @"WKMenuItemIdentifierOpenFrameInNewWindow"; 41 44 NSString * const _WKMenuItemIdentifierOpenImageInNewWindow = @"WKMenuItemIdentifierOpenImageInNewWindow"; -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h
r243376 r269865 54 54 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macos(10.12), ios(10.0)); 55 55 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macos(10.12), ios(10.0)); 56 57 WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToCurrentGroup WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); 58 WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToNewGroup WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); -
trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
r266342 r269865 416 416 case ContextMenuItemTagLookUpInDictionary: 417 417 return _WKMenuItemIdentifierLookUp; 418 419 case ContextMenuItemTagAddHighlightToCurrentGroup: 420 return _WKMenuItemIdentifierAddHighlightToCurrentGroup; 421 422 case ContextMenuItemTagAddHighlightToNewGroup: 423 return _WKMenuItemIdentifierAddHighlightToNewGroup; 418 424 419 425 case ContextMenuItemTagOpenFrameInNewWindow: -
trunk/Source/WebKitLegacy/mac/ChangeLog
r269805 r269865 1 2020-11-16 Megan Gardner <megan_gardner@apple.com> 2 3 Add menu support for app highlights for books 4 https://bugs.webkit.org/show_bug.cgi?id=218879 5 <rdar://problem/71352113> 6 7 Reviewed by Alex Christensen. 8 9 * WebView/WebHTMLView.mm: 10 (toTag): 11 1 12 2020-11-13 Sam Weinig <weinig@apple.com> 2 13 -
trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
r269027 r269865 606 606 case ContextMenuItemTagToggleVideoFullscreen: 607 607 return WebMenuItemTagToggleVideoFullscreen; 608 case ContextMenuItemTagAddHighlightToCurrentGroup: 609 case ContextMenuItemTagAddHighlightToNewGroup: 610 return WTF::nullopt; 608 611 case ContextMenuItemTagShareMenu: 609 612 return WebMenuItemTagShareMenu;
Note:
See TracChangeset
for help on using the changeset viewer.