Changeset 239218 in webkit
- Timestamp:
- Dec 14, 2018 10:14:32 AM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r239210 r239218 1 2018-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 1 14 2018-12-14 Chris Dumez <cdumez@apple.com> 2 15 -
trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
r239128 r239218 529 529 @end 530 530 531 using namespace WebKit;532 533 531 #if HAVE(TOUCH_BAR) 534 532 535 533 @interface WKTextListTouchBarViewController : NSViewController { 536 534 @private 537 Web ViewImpl* _webViewImpl;538 ListType _currentListType;539 } 540 541 @property (nonatomic) ListType currentListType;542 543 - (instancetype)initWithWebViewImpl:(Web ViewImpl*)webViewImpl;535 WebKit::WebViewImpl* _webViewImpl; 536 WebKit::ListType _currentListType; 537 } 538 539 @property (nonatomic) WebKit::ListType currentListType; 540 541 - (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl; 544 542 545 543 @end … … 558 556 static const NSUInteger orderedListSegment = 2; 559 557 560 - (instancetype)initWithWebViewImpl:(Web ViewImpl*)webViewImpl558 - (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl 561 559 { 562 560 if (!(self = [super init])) … … 601 599 // behave as toggles, so we can invoke the appropriate edit command depending on our _currentListType 602 600 // 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) 604 602 _webViewImpl->page().executeEditCommand(@"InsertOrderedList", @""); 605 else if (_currentListType == UnorderedList)603 else if (_currentListType == WebKit::UnorderedList) 606 604 _webViewImpl->page().executeEditCommand(@"InsertUnorderedList", @""); 607 605 break; … … 617 615 } 618 616 619 - (void)setCurrentListType:( ListType)listType617 - (void)setCurrentListType:(WebKit::ListType)listType 620 618 { 621 619 NSSegmentedControl *insertListControl = (NSSegmentedControl *)self.view; 622 620 switch (listType) { 623 case NoList:621 case WebKit::NoList: 624 622 [insertListControl setSelected:YES forSegment:noListSegment]; 625 623 break; 626 case OrderedList:624 case WebKit::OrderedList: 627 625 [insertListControl setSelected:YES forSegment:orderedListSegment]; 628 626 break; 629 case UnorderedList:627 case WebKit::UnorderedList: 630 628 [insertListControl setSelected:YES forSegment:unorderedListSegment]; 631 629 break; … … 647 645 648 646 @private 649 Web ViewImpl* _webViewImpl;647 WebKit::WebViewImpl* _webViewImpl; 650 648 } 651 649 … … 656 654 @property (nonatomic, retain, readwrite) NSColor *textColor; 657 655 658 - (instancetype)initWithWebViewImpl:(Web ViewImpl*)webViewImpl;656 - (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl; 659 657 @end 660 658 … … 666 664 @synthesize currentTextAlignment=_currentTextAlignment; 667 665 668 - (instancetype)initWithWebViewImpl:(Web ViewImpl*)webViewImpl666 - (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl 669 667 { 670 668 if (!(self = [super init]))
Note: See TracChangeset
for help on using the changeset viewer.