Attachment 357290 Details for Bug 192690 – Patch

[patch] Patch

file_192690.txt (text/plain), 5.20 KB, created by David Quesada on 2018-12-13 19:50:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Quesada

Created: 2018-12-13 19:50:16 PST

Size: 5.20 KB

patch

obsolete

>commit ba6e44d8513ad982b38b23e4b99b30753ca25d52
>Author: David Quesada <david_quesada@apple.com>
>Date:   Thu Dec 13 19:48:31 2018 -0800
>
>    Remove a global 'using namespace WebKit' in WebViewImpl.mm
>    https://bugs.webkit.org/show_bug.cgi?id=192690
>    
>    Reviewed by NOBODY (OOPS!).
>    
>    * UIProcess/Cocoa/WebViewImpl.mm:
>    (-[WKTextListTouchBarViewController initWithWebViewImpl:]):
>    (-[WKTextListTouchBarViewController _selectList:]):
>    (-[WKTextListTouchBarViewController setCurrentListType:]):
>    (-[WKTextTouchBarItemController initWithWebViewImpl:]):
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b538a9d67b0..b4d7a77d9c4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-13  David Quesada  <david_quesada@apple.com>
>+
>+        Remove a global 'using namespace WebKit' in WebViewImpl.mm
>+        https://bugs.webkit.org/show_bug.cgi?id=192690
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/Cocoa/WebViewImpl.mm:
>+        (-[WKTextListTouchBarViewController initWithWebViewImpl:]):
>+        (-[WKTextListTouchBarViewController _selectList:]):
>+        (-[WKTextListTouchBarViewController setCurrentListType:]):
>+        (-[WKTextTouchBarItemController initWithWebViewImpl:]):
>+
> 2018-12-13  Chris Dumez  <cdumez@apple.com>
> 
>         [PSON] We should not need to navigate to 'about:blank' to suspend pages
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>index d74ddb37052..153650840a0 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>@@ -528,19 +528,17 @@ - (BOOL)tryToPerform:(SEL)action with:(id)object
> 
> @end
> 
>-using namespace WebKit;
>-
> #if HAVE(TOUCH_BAR)
> 
> @interface WKTextListTouchBarViewController : NSViewController {
> @private
>-    WebViewImpl* _webViewImpl;
>-    ListType _currentListType;
>+    WebKit::WebViewImpl* _webViewImpl;
>+    WebKit::ListType _currentListType;
> }
> 
>-@property (nonatomic) ListType currentListType;
>+@property (nonatomic) WebKit::ListType currentListType;
> 
>-- (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl;
>+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl;
> 
> @end
> 
>@@ -557,7 +555,7 @@ static const NSUInteger noListSegment = 0;
> static const NSUInteger unorderedListSegment = 1;
> static const NSUInteger orderedListSegment = 2;
> 
>-- (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl
>+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl
> {
>     if (!(self = [super init]))
>         return nil;
>@@ -600,9 +598,9 @@ - (void)_selectList:(id)sender
>         // There is no "remove list" edit command, but InsertOrderedList and InsertUnorderedList both
>         // behave as toggles, so we can invoke the appropriate edit command depending on our _currentListType
>         // to remove an existing list. We don't have to do anything if _currentListType is NoList.
>-        if (_currentListType == OrderedList)
>+        if (_currentListType == WebKit::OrderedList)
>             _webViewImpl->page().executeEditCommand(@"InsertOrderedList", @"");
>-        else if (_currentListType == UnorderedList)
>+        else if (_currentListType == WebKit::UnorderedList)
>             _webViewImpl->page().executeEditCommand(@"InsertUnorderedList", @"");
>         break;
>     case unorderedListSegment:
>@@ -616,17 +614,17 @@ - (void)_selectList:(id)sender
>     _webViewImpl->dismissTextTouchBarPopoverItemWithIdentifier(NSTouchBarItemIdentifierTextList);
> }
> 
>-- (void)setCurrentListType:(ListType)listType
>+- (void)setCurrentListType:(WebKit::ListType)listType
> {
>     NSSegmentedControl *insertListControl = (NSSegmentedControl *)self.view;
>     switch (listType) {
>-    case NoList:
>+    case WebKit::NoList:
>         [insertListControl setSelected:YES forSegment:noListSegment];
>         break;
>-    case OrderedList:
>+    case WebKit::OrderedList:
>         [insertListControl setSelected:YES forSegment:orderedListSegment];
>         break;
>-    case UnorderedList:
>+    case WebKit::UnorderedList:
>         [insertListControl setSelected:YES forSegment:unorderedListSegment];
>         break;
>     }
>@@ -646,7 +644,7 @@ @private
>     RetainPtr<WKTextListTouchBarViewController> _textListTouchBarViewController;
> 
> @private
>-    WebViewImpl* _webViewImpl;
>+    WebKit::WebViewImpl* _webViewImpl;
> }
> 
> @property (nonatomic) BOOL textIsBold;
>@@ -655,7 +653,7 @@ @property (nonatomic) BOOL textIsUnderlined;
> @property (nonatomic) NSTextAlignment currentTextAlignment;
> @property (nonatomic, retain, readwrite) NSColor *textColor;
> 
>-- (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl;
>+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl;
> @end
> 
> @implementation WKTextTouchBarItemController
>@@ -665,7 +663,7 @@ @synthesize textIsItalic=_textIsItalic;
> @synthesize textIsUnderlined=_textIsUnderlined;
> @synthesize currentTextAlignment=_currentTextAlignment;
> 
>-- (instancetype)initWithWebViewImpl:(WebViewImpl*)webViewImpl
>+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl*)webViewImpl
> {
>     if (!(self = [super init]))
>         return nil;

Actions: View | Formatted Diff | Diff

Attachments on bug 192690: 357290