Title: [193774] tags/Safari-602.1.13.2/Source/WebKit/mac
- Revision
- 193774
- Author
- bshaf...@apple.com
- Date
- 2015-12-08 13:00:53 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r193661. rdar://problem/23639610
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog (193773 => 193774)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog 2015-12-08 21:00:53 UTC (rev 193774)
@@ -1,3 +1,22 @@
+2015-12-08 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r193661.
+
+ 2015-12-07 Beth Dakin <bda...@apple.com>
+
+ Add support for WebViewAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=151967
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::respondToChangedSelection):
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView updateWebViewAdditions]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewInternal.h:
+
2015-12-01 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r192914.
Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (193773 => 193774)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-12-08 21:00:53 UTC (rev 193774)
@@ -348,8 +348,10 @@
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 (193773 => 193774)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm 2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm 2015-12-08 21:00:53 UTC (rev 193774)
@@ -911,6 +911,8 @@
}
#endif
+ [self updateWebViewAdditions];
+
#if !PLATFORM(IOS)
static bool didOneTimeInitialization = false;
#endif
@@ -6604,6 +6606,18 @@
@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 (193773 => 193774)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h 2015-12-08 21:00:53 UTC (rev 193774)
@@ -171,6 +171,11 @@
#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 (193773 => 193774)
--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h 2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h 2015-12-08 21:00:53 UTC (rev 193774)
@@ -290,3 +290,7 @@
#endif
@end
+
+@interface WebView (UpdateWebViewAdditions)
+- (void)updateWebViewAdditions;
+@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
