Changeset 84220 in webkit


Ignore:
Timestamp:
Apr 18, 2011 8:47:49 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-18 Jia Pu <​jpu@apple.com>

Reviewed by Mark Rowe.

WebKit needs to stop importing <AppKit/NSTextChecker.h>
​https://bugs.webkit.org/show_bug.cgi?id=58798
<rdar://problem/9294938>

Use public header <AppKit/NSSpellChecker.h> instead.

  • WebCoreSupport/CorrectionPanel.h:
  • WebCoreSupport/CorrectionPanel.mm: (correctionIndicatorType): (CorrectionPanel::show): (CorrectionPanel::dismissInternal): (CorrectionPanel::handleAcceptedReplacement):
  • WebCoreSupport/WebEditorClient.mm:
  • WebView/WebView.mm:

2011-04-18 Jia Pu <​jpu@apple.com>

Reviewed by Mark Rowe.

WebKit needs to stop importing <AppKit/NSTextChecker.h>
​https://bugs.webkit.org/show_bug.cgi?id=58798
<rdar://problem/9294938>

Use public header <AppKit/NSSpellChecker.h> instead.

  • UIProcess/mac/CorrectionPanel.h:
  • UIProcess/mac/CorrectionPanel.mm: (correctionIndicatorType): (WebKit::CorrectionPanel::show): (WebKit::CorrectionPanel::dismissInternal): (WebKit::CorrectionPanel::handleAcceptedReplacement):
  • UIProcess/mac/TextCheckerMac.mm:
  • WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/mac/ChangeLog

    r84191 r84220  
     12011-04-18  Jia Pu  <jpu@apple.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        WebKit needs to stop importing <AppKit/NSTextChecker.h>
     6        https://bugs.webkit.org/show_bug.cgi?id=58798
     7        <rdar://problem/9294938>
     8
     9        Use public header <AppKit/NSSpellChecker.h> instead.
     10
     11        * WebCoreSupport/CorrectionPanel.h:
     12        * WebCoreSupport/CorrectionPanel.mm:
     13        (correctionIndicatorType):
     14        (CorrectionPanel::show):
     15        (CorrectionPanel::dismissInternal):
     16        (CorrectionPanel::handleAcceptedReplacement):
     17        * WebCoreSupport/WebEditorClient.mm:
     18        * WebView/WebView.mm:
     19
    1202011-04-17  Cameron Zwarich  <zwarich@apple.com>
    221

  • trunk/Source/WebKit/mac/WebCoreSupport/CorrectionPanel.h

    r83344 r84220  
    2828
    2929#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    30 #import <AppKit/NSTextChecker.h>
     30#import <AppKit/NSSpellChecker.h>
    3131#import <WebCore/SpellingCorrectionController.h>
    3232#import <wtf/RetainPtr.h>
    … …  
    4747    bool isShowing() const { return m_view; }
    4848    void dismissInternal(WebCore::ReasonForDismissingCorrectionPanel, bool dismissingExternally);
    49     void handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement, NSCorrectionBubbleType);
     49    void handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement, NSCorrectionIndicatorType);
    5050
    5151    bool m_wasDismissedExternally;

  • trunk/Source/WebKit/mac/WebCoreSupport/CorrectionPanel.mm

    r84078 r84220  
    3030using namespace WebCore;
    3131
    32 static inline NSCorrectionBubbleType correctionBubbleType(CorrectionPanelInfo::PanelType panelType)
     32static inline NSCorrectionIndicatorType correctionIndicatorType(CorrectionPanelInfo::PanelType panelType)
    3333{
    3434    switch (panelType) {
    3535    case CorrectionPanelInfo::PanelTypeCorrection:
    36         return NSCorrectionBubbleTypeCorrection;
     36        return NSCorrectionIndicatorTypeDefault;
    3737    case CorrectionPanelInfo::PanelTypeReversion:
    38         return NSCorrectionBubbleTypeReversion;
     38        return NSCorrectionIndicatorTypeReversion;
    3939    case CorrectionPanelInfo::PanelTypeSpellingSuggestions:
    40         return NSCorrectionBubbleTypeGuesses;
     40        return NSCorrectionIndicatorTypeGuesses;
    4141    }
    4242    ASSERT_NOT_REACHED();
    43     return NSCorrectionBubbleTypeCorrection;
     43    return NSCorrectionIndicatorTypeDefault;
    4444}
    4545
    … …  
    6666    NSString* replacementStringAsNSString = replacementString;
    6767    m_view = view;
    68     NSCorrectionBubbleType bubbleType = correctionBubbleType(type);
     68    NSCorrectionIndicatorType indicatorType = correctionIndicatorType(type);
    6969   
    7070    NSMutableArray* alternativeStrings = 0;
    … …  
    7676    }
    7777
    78     [[NSSpellChecker sharedSpellChecker] showCorrectionBubbleOfType:bubbleType primaryString:replacementStringAsNSString alternativeStrings:alternativeStrings forStringInRect:[view convertRect:boundingBoxOfReplacedString fromView:nil] view:m_view.get() completionHandler:^(NSString* acceptedString) {
    79         handleAcceptedReplacement(acceptedString, replacedStringAsNSString, replacementStringAsNSString, bubbleType);
     78    [[NSSpellChecker sharedSpellChecker] showCorrectionIndicatorOfType:indicatorType primaryString:replacementStringAsNSString alternativeStrings:alternativeStrings forStringInRect:[view convertRect:boundingBoxOfReplacedString fromView:nil] view:m_view.get() completionHandler:^(NSString* acceptedString) {
     79        handleAcceptedReplacement(acceptedString, replacedStringAsNSString, replacementStringAsNSString, indicatorType);
    8080    }];
    8181}
    … …  
    107107    m_reasonForDismissing = reason;
    108108    m_resultForSynchronousDismissal.clear();
    109     [[NSSpellChecker sharedSpellChecker] dismissCorrectionBubbleForView:m_view.get()];
     109    [[NSSpellChecker sharedSpellChecker] dismissCorrectionIndicatorForView:m_view.get()];
    110110    m_view.clear();
    111111}
    … …  
    116116}
    117117
    118 void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement,  NSCorrectionBubbleType correctionBubbleType)
     118void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement,  NSCorrectionIndicatorType correctionIndicatorType)
    119119{
    120120    NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
    121121    NSInteger documentTag = [m_view.get() spellCheckerDocumentTag];
    122122
    123     switch (correctionBubbleType) {
    124     case NSCorrectionBubbleTypeCorrection:
     123    switch (correctionIndicatorType) {
     124    case NSCorrectionIndicatorTypeDefault:
    125125        if (acceptedReplacement)
    126126            [spellChecker recordResponse:NSCorrectionResponseAccepted toCorrection:acceptedReplacement forWord:replaced language:nil inSpellDocumentWithTag:documentTag];
    … …  
    132132        }
    133133        break;
    134     case NSCorrectionBubbleTypeReversion:
     134    case NSCorrectionIndicatorTypeReversion:
    135135        if (acceptedReplacement)
    136136            [spellChecker recordResponse:NSCorrectionResponseReverted toCorrection:replaced forWord:acceptedReplacement language:nil inSpellDocumentWithTag:documentTag];
    137137        break;
    138     case NSCorrectionBubbleTypeGuesses:
     138    case NSCorrectionIndicatorTypeGuesses:
    139139        if (acceptedReplacement)
    140140            [spellChecker recordResponse:NSCorrectionResponseAccepted toCorrection:acceptedReplacement forWord:replaced language:nil inSpellDocumentWithTag:documentTag];

  • trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

    r82952 r84220  
    7070#import <wtf/PassRefPtr.h>
    7171#import <wtf/Threading.h>
     72
     73using namespace WebCore;
     74
     75using namespace HTMLNames;
     76
    7277#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    73 #import <AppKit/NSTextChecker.h>
    74 #endif
    75 
    76 using namespace WebCore;
    77 
    78 using namespace HTMLNames;
    79 
    80 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    81 static inline NSCorrectionBubbleType correctionBubbleType(CorrectionPanelInfo::PanelType panelType)
    82 {
    83     switch (panelType) {
    84     case CorrectionPanelInfo::PanelTypeCorrection:
    85         return NSCorrectionBubbleTypeCorrection;
    86     case CorrectionPanelInfo::PanelTypeReversion:
    87         return NSCorrectionBubbleTypeReversion;
    88     case CorrectionPanelInfo::PanelTypeSpellingSuggestions:
    89         return NSCorrectionBubbleTypeGuesses;
    90     }
    91     ASSERT_NOT_REACHED();
    92     return NSCorrectionBubbleTypeCorrection;
    93 }
     78@interface NSSpellChecker (WebNSSpellCheckerDetails)
     79- (NSString *)languageForWordRange:(NSRange)range inString:(NSString *)string orthography:(NSOrthography *)orthography;
     80@end
    9481#endif
    9582

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r84191 r84220  
    181181#import <wtf/Threading.h>
    182182
    183 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    184 #import <AppKit/NSTextChecker.h>
    185 #endif
    186 
    187183#if ENABLE(DASHBOARD_SUPPORT)
    188184#import <WebKit/WebDashboardRegion.h>

  • trunk/Source/WebKit2/ChangeLog

    r84206 r84220  
     12011-04-18  Jia Pu  <jpu@apple.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        WebKit needs to stop importing <AppKit/NSTextChecker.h>
     6        https://bugs.webkit.org/show_bug.cgi?id=58798
     7        <rdar://problem/9294938>
     8
     9        Use public header <AppKit/NSSpellChecker.h> instead.
     10
     11        * UIProcess/mac/CorrectionPanel.h:
     12        * UIProcess/mac/CorrectionPanel.mm:
     13        (correctionIndicatorType):
     14        (WebKit::CorrectionPanel::show):
     15        (WebKit::CorrectionPanel::dismissInternal):
     16        (WebKit::CorrectionPanel::handleAcceptedReplacement):
     17        * UIProcess/mac/TextCheckerMac.mm:
     18        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
     19
    1202011-04-05  Jer Noble  <jer.noble@apple.com>
    221

  • trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.h

    r83344 r84220  
    2828
    2929#if !defined(BUILDING_ON_SNOW_LEOPARD)
    30 #import <AppKit/NSTextChecker.h>
     30#import <AppKit/NSSpellChecker.h>
    3131#import <WebCore/SpellingCorrectionController.h>
    3232#import <wtf/RetainPtr.h>
    … …  
    4848    bool isShowing() const { return m_view; }
    4949    void dismissInternal(WebCore::ReasonForDismissingCorrectionPanel, bool dismissingExternally);
    50     void handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement, NSCorrectionBubbleType);
     50    void handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement, NSCorrectionIndicatorType);
    5151
    5252    bool m_wasDismissedExternally;

  • trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm

    r81896 r84220  
    3434using namespace WebCore;
    3535
    36 static inline NSCorrectionBubbleType correctionBubbleType(CorrectionPanelInfo::PanelType panelType)
     36static inline NSCorrectionIndicatorType correctionIndicatorType(CorrectionPanelInfo::PanelType panelType)
    3737{
    3838    switch (panelType) {
    3939    case CorrectionPanelInfo::PanelTypeCorrection:
    40         return NSCorrectionBubbleTypeCorrection;
     40        return NSCorrectionIndicatorTypeDefault;
    4141    case CorrectionPanelInfo::PanelTypeReversion:
    42         return NSCorrectionBubbleTypeReversion;
     42        return NSCorrectionIndicatorTypeReversion;
    4343    case CorrectionPanelInfo::PanelTypeSpellingSuggestions:
    44         return NSCorrectionBubbleTypeGuesses;
     44        return NSCorrectionIndicatorTypeGuesses;
    4545    }
    4646    ASSERT_NOT_REACHED();
    47     return NSCorrectionBubbleTypeCorrection;
     47    return NSCorrectionIndicatorTypeDefault;
    4848}
    4949
    … …  
    7272    NSString* replacementStringAsNSString = replacementString;
    7373    m_view = view;
    74     NSCorrectionBubbleType bubbleType = correctionBubbleType(type);
     74    NSCorrectionIndicatorType indicatorType = correctionIndicatorType(type);
    7575   
    7676    NSMutableArray* alternativeStrings = 0;
    … …  
    8383
    8484    NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
    85     [spellChecker showCorrectionBubbleOfType:bubbleType primaryString:replacementStringAsNSString alternativeStrings:alternativeStrings forStringInRect:boundingBoxOfReplacedString view:m_view.get() completionHandler:^(NSString* acceptedString) {
    86         handleAcceptedReplacement(acceptedString, replacedStringAsNSString, replacementStringAsNSString, bubbleType);
     85    [spellChecker showCorrectionIndicatorOfType:indicatorType primaryString:replacementStringAsNSString alternativeStrings:alternativeStrings forStringInRect:boundingBoxOfReplacedString view:m_view.get() completionHandler:^(NSString* acceptedString) {
     86        handleAcceptedReplacement(acceptedString, replacedStringAsNSString, replacementStringAsNSString, indicatorType);
    8787    }];
    8888}
    … …  
    114114    m_reasonForDismissing = reason;
    115115    m_resultForSynchronousDismissal.clear();
    116     [[NSSpellChecker sharedSpellChecker] dismissCorrectionBubbleForView:m_view.get()];
     116    [[NSSpellChecker sharedSpellChecker] dismissCorrectionIndicatorForView:m_view.get()];
    117117    m_view.clear();
    118118}
    … …  
    123123}
    124124
    125 void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement,  NSCorrectionBubbleType correctionBubbleType)
     125void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, NSString* replaced, NSString* proposedReplacement,  NSCorrectionIndicatorType correctionIndicatorType)
    126126{
    127127    NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
    128128    NSInteger documentTag = [m_view.get() spellCheckerDocumentTag];
    129129   
    130     switch (correctionBubbleType) {
    131     case NSCorrectionBubbleTypeCorrection:
     130    switch (correctionIndicatorType) {
     131    case NSCorrectionIndicatorTypeDefault:
    132132        if (acceptedReplacement)
    133133            [spellChecker recordResponse:NSCorrectionResponseAccepted toCorrection:acceptedReplacement forWord:replaced language:nil inSpellDocumentWithTag:documentTag];
    … …  
    139139        }
    140140        break;
    141     case NSCorrectionBubbleTypeReversion:
     141    case NSCorrectionIndicatorTypeReversion:
    142142        if (acceptedReplacement)
    143143            [spellChecker recordResponse:NSCorrectionResponseReverted toCorrection:replaced forWord:acceptedReplacement language:nil inSpellDocumentWithTag:documentTag];
    144144        break;
    145     case NSCorrectionBubbleTypeGuesses:
     145    case NSCorrectionIndicatorTypeGuesses:
    146146        if (acceptedReplacement)
    147147            [spellChecker recordResponse:NSCorrectionResponseAccepted toCorrection:acceptedReplacement forWord:replaced language:nil inSpellDocumentWithTag:documentTag];

  • trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm

    r83872 r84220  
    3232
    3333#ifndef BUILDING_ON_SNOW_LEOPARD
    34 #import <AppKit/NSTextChecker.h>
     34@interface NSSpellChecker (WebNSSpellCheckerDetails)
     35- (NSString *)languageForWordRange:(NSRange)range inString:(NSString *)string orthography:(NSOrthography *)orthography;
     36@end
    3537#endif
    3638

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm

    r83369 r84220  
    4747#import <WebKit/WebResource.h>
    4848#import <WebKit/WebNSURLExtras.h>
    49 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    50 #import <AppKit/NSTextChecker.h>
    51 #endif
    5249
    5350using namespace WebCore;
Note: See TracChangeset for help on using the changeset viewer.