[webkit-changes] [193803] tags/Safari-602.1.13.2/Source/WebKit/mac

Tue, 08 Dec 2015 18:02:25 -0800

Title: [193803] tags/Safari-602.1.13.2/Source/WebKit/mac

Diff

Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog (193802 => 193803)


--- tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog	2015-12-09 01:59:59 UTC (rev 193802)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog	2015-12-09 02:01:25 UTC (rev 193803)
@@ -1,5 +1,9 @@
 2015-12-08  Babak Shafiei  <[email protected]>
 
+        Roll out r193661.
+
+2015-12-08  Babak Shafiei  <[email protected]>
+
         Roll out r193675.
 
 2015-12-08  Babak Shafiei  <[email protected]>

Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (193802 => 193803)


--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm	2015-12-09 01:59:59 UTC (rev 193802)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm	2015-12-09 02:01:25 UTC (rev 193803)
@@ -348,10 +348,8 @@
 void WebEditorClient::respondToChangedSelection(Frame* frame)
 {
     NSView<WebDocumentView> *documentView = [[kit(frame) frameView] documentView];
-    if ([documentView isKindOfClass:[WebHTMLView class]]) {
+    if ([documentView isKindOfClass:[WebHTMLView class]])
         [(WebHTMLView *)documentView _selectionChanged];
-        [m_webView updateWebViewAdditions];
-    }
 
 #if !PLATFORM(IOS)
     // FIXME: This quirk is needed due to <rdar://problem/5009625> - We can phase it out once Aperture can adopt the new behavior on their end

Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm (193802 => 193803)


--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm	2015-12-09 01:59:59 UTC (rev 193802)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm	2015-12-09 02:01:25 UTC (rev 193803)
@@ -911,8 +911,6 @@
     }
 #endif
 
-    [self updateWebViewAdditions];
-
 #if !PLATFORM(IOS)
     static bool didOneTimeInitialization = false;
 #endif
@@ -6606,18 +6604,6 @@
 
 @end
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewAdditions.mm>
-#else
-@implementation WebView (UpdateWebViewAdditions)
-
-- (void)updateWebViewAdditions
-{
-}
-
-@end
-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
-
 @implementation WebView (WebPendingPublic)
 
 #if !PLATFORM(IOS)

Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h (193802 => 193803)


--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h	2015-12-09 01:59:59 UTC (rev 193802)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h	2015-12-09 02:01:25 UTC (rev 193803)
@@ -171,11 +171,6 @@
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     WebImmediateActionController *immediateActionController;
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewDataAdditions.h>
-#endif
-
     std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
     BOOL hasInitializedLookupObserver;
     RetainPtr<WebWindowVisibilityObserver> windowVisibilityObserver;

Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h (193802 => 193803)


--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h	2015-12-09 01:59:59 UTC (rev 193802)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h	2015-12-09 02:01:25 UTC (rev 193803)
@@ -290,7 +290,3 @@
 #endif
 
 @end
-
-@interface WebView (UpdateWebViewAdditions)
-- (void)updateWebViewAdditions;
-@end

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to