Changeset 239218 in webkit


Ignore:
Timestamp:
Dec 14, 2018 10:14:32 AM (5 years ago)
Author:
david_quesada@apple.com
Message:

Remove a global 'using namespace WebKit' in WebViewImpl.mm
https://bugs.webkit.org/show_bug.cgi?id=192690

Reviewed by Tim Horton.

  • UIProcess/Cocoa/WebViewImpl.mm:

(-[WKTextListTouchBarViewController initWithWebViewImpl:]):
(-[WKTextListTouchBarViewController _selectList:]):
(-[WKTextListTouchBarViewController setCurrentListType:]):
(-[WKTextTouchBarItemController initWithWebViewImpl:]):

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r239210 r239218  
     12018-12-14  David Quesada  <david_quesada@apple.com>
     2
     3        Remove a global 'using namespace WebKit' in WebViewImpl.mm
     4        https://bugs.webkit.org/show_bug.cgi?id=192690
     5
     6        Reviewed by Tim Horton.
     7
     8        * UIProcess/Cocoa/WebViewImpl.mm:
     9        (-[WKTextListTouchBarViewController initWithWebViewImpl:]):
     10        (-[WKTextListTouchBarViewController _selectList:]):
     11        (-[WKTextListTouchBarViewController setCurrentListType:]):
     12        (-[WKTextTouchBarItemController initWithWebViewImpl:]):
     13
    1142018-12-14  Chris Dumez  <cdumez@apple.com>
    215
  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r239128 r239218  
    529529@end
    530530
    531 using namespace WebKit;
    532 
    533531#if HAVE(TOUCH_BAR)
    534532
    535533@interface WKTextListTouchBarViewController : NSViewController {
    536534@private
    537     WebViewImpl* _webViewImpl;
    538     ListType _currentListType;
    539 }
    540 
    541 @property (nonatomic) ListType currentListType;
    542 
    543 - (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl;
     535    WebKit::WebViewImpl* _webViewImpl;
     536    WebKit::ListType _currentListType;
     537}
     538
     539@property (nonatomic) WebKit::ListType currentListType;
     540
     541- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl;
    544542
    545543@end
     
    558556static const NSUInteger orderedListSegment = 2;
    559557
    560 - (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl
     558- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl
    561559{
    562560    if (!(self = [super init]))
     
    601599        // behave as toggles, so we can invoke the appropriate edit command depending on our _currentListType
    602600        // to remove an existing list. We don't have to do anything if _currentListType is NoList.
    603         if (_currentListType == OrderedList)
     601        if (_currentListType == WebKit::OrderedList)
    604602            _webViewImpl->page().executeEditCommand(@"InsertOrderedList", @"");
    605         else if (_currentListType == UnorderedList)
     603        else if (_currentListType == WebKit::UnorderedList)
    606604            _webViewImpl->page().executeEditCommand(@"InsertUnorderedList", @"");
    607605        break;
     
    617615}
    618616
    619 - (void)setCurrentListType:(ListType)listType
     617- (void)setCurrentListType:(WebKit::ListType)listType
    620618{
    621619    NSSegmentedControl *insertListControl = (NSSegmentedControl *)self.view;
    622620    switch (listType) {
    623     case NoList:
     621    case WebKit::NoList:
    624622        [insertListControl setSelected:YES forSegment:noListSegment];
    625623        break;
    626     case OrderedList:
     624    case WebKit::OrderedList:
    627625        [insertListControl setSelected:YES forSegment:orderedListSegment];
    628626        break;
    629     case UnorderedList:
     627    case WebKit::UnorderedList:
    630628        [insertListControl setSelected:YES forSegment:unorderedListSegment];
    631629        break;
     
    647645
    648646@private
    649     WebViewImpl* _webViewImpl;
     647    WebKit::WebViewImpl* _webViewImpl;
    650648}
    651649
     
    656654@property (nonatomic, retain, readwrite) NSColor *textColor;
    657655
    658 - (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl;
     656- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl;
    659657@end
    660658
     
    666664@synthesize currentTextAlignment=_currentTextAlignment;
    667665
    668 - (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl
     666- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl
    669667{
    670668    if (!(self = [super init]))
Note: See TracChangeset for help on using the changeset viewer.