Diff
Modified: trunk/Source/WebKit2/ChangeLog (214642 => 214643)
--- trunk/Source/WebKit2/ChangeLog 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-31 00:45:06 UTC (rev 214643)
@@ -1,3 +1,16 @@
+2017-03-30 Sam Weinig <s...@webkit.org>
+
+ Expose the WKView SPI, _prepareForMoveToWindow:withCompletionHandler as WKWebView SPI
+ <rdar://problem/31350588>
+ https://bugs.webkit.org/show_bug.cgi?id=170315
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _prepareForMoveToWindow:completionHandler:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ Copy SPI to WKWebView. Remove 'with' prefix to match conventions.
+
2017-03-30 Wenson Hsieh <wenson_hs...@apple.com>
[WK2] Touches should not cancel when showing a custom action sheet while data interaction is active
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (214642 => 214643)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-31 00:45:06 UTC (rev 214643)
@@ -105,6 +105,7 @@
#import <WebCore/URLParser.h>
#import <WebCore/ValidationBubble.h>
#import <WebCore/WritingMode.h>
+#import <wtf/BlockPtr.h>
#import <wtf/HashMap.h>
#import <wtf/MathExtras.h>
#import <wtf/NeverDestroyed.h>
@@ -5028,6 +5029,14 @@
{
}
+- (void)_prepareForMoveToWindow:(NSWindow *)targetWindow completionHandler:(void(^)(void))completionHandler
+{
+ auto completionHandlerCopy = makeBlockPtr(completionHandler);
+ _impl->prepareForMoveToWindow(targetWindow, [completionHandlerCopy] {
+ completionHandlerCopy();
+ });
+}
+
#endif
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (214642 => 214643)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-03-31 00:45:06 UTC (rev 214643)
@@ -225,6 +225,8 @@
- (void)_addMediaPlaybackControlsView:(AVFunctionBarScrubber *)mediaPlaybackControlsView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
- (void)_removeMediaPlaybackControlsView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+- (void)_prepareForMoveToWindow:(NSWindow *)targetWindow completionHandler:(void(^)(void))completionHandler;
+
#endif
- (WKNavigation *)_reloadWithoutContentBlockers WK_API_AVAILABLE(macosx(10.12), ios(10.0));
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (214642 => 214643)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-03-31 00:45:06 UTC (rev 214643)
@@ -1260,10 +1260,9 @@
- (void)_prepareForMoveToWindow:(NSWindow *)targetWindow withCompletionHandler:(void(^)(void))completionHandler
{
- auto copiedCompletionHandler = Block_copy(completionHandler);
- _data->_impl->prepareForMoveToWindow(targetWindow, [copiedCompletionHandler] {
- copiedCompletionHandler();
- Block_release(copiedCompletionHandler);
+ auto completionHandlerCopy = makeBlockPtr(completionHandler);
+ _data->_impl->prepareForMoveToWindow(targetWindow, [completionHandlerCopy] {
+ completionHandlerCopy();
});
}
Modified: trunk/Tools/ChangeLog (214642 => 214643)
--- trunk/Tools/ChangeLog 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Tools/ChangeLog 2017-03-31 00:45:06 UTC (rev 214643)
@@ -1,3 +1,14 @@
+2017-03-30 Sam Weinig <s...@webkit.org>
+
+ Expose the WKView SPI, _prepareForMoveToWindow:withCompletionHandler as WKWebView SPI
+ https://bugs.webkit.org/show_bug.cgi?id=170315
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/PrepareForMoveToWindow.mm: Added.
+ Add test showing the completion handler is called.
+
2017-03-30 Filip Pizlo <fpi...@apple.com>
Air should support linear scan for optLevel<2
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (214642 => 214643)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-31 00:40:50 UTC (rev 214642)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-31 00:45:06 UTC (rev 214643)
@@ -217,6 +217,7 @@
7AE9E5091AE5AE8B00CF874B /* test.pdf in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7AE9E5081AE5AE8B00CF874B /* test.pdf */; };
7AEAD47F1E20116C00416EFE /* CrossPartitionFileSchemeAccess.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7AEAD47C1E20113800416EFE /* CrossPartitionFileSchemeAccess.mm */; };
7AEAD4811E20122700416EFE /* CrossPartitionFileSchemeAccess.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7AEAD47D1E20114E00416EFE /* CrossPartitionFileSchemeAccess.html */; };
+ 7C1AF7951E8DCBAB002645B9 /* PrepareForMoveToWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C1AF7931E8DCBAB002645B9 /* PrepareForMoveToWindow.mm */; };
7C3965061CDD74F90094DBB8 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3965051CDD74F90094DBB8 /* Color.cpp */; };
7C3DB8E41D12129B00AE8CC3 /* CommandBackForward.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */; };
7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */; };
@@ -1144,6 +1145,7 @@
7AE9E5081AE5AE8B00CF874B /* test.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test.pdf; sourceTree = "<group>"; };
7AEAD47C1E20113800416EFE /* CrossPartitionFileSchemeAccess.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CrossPartitionFileSchemeAccess.mm; sourceTree = "<group>"; };
7AEAD47D1E20114E00416EFE /* CrossPartitionFileSchemeAccess.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = CrossPartitionFileSchemeAccess.html; path = Tests/mac/CrossPartitionFileSchemeAccess.html; sourceTree = SOURCE_ROOT; };
+ 7C1AF7931E8DCBAB002645B9 /* PrepareForMoveToWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrepareForMoveToWindow.mm; sourceTree = "<group>"; };
7C3965051CDD74F90094DBB8 /* Color.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CommandBackForward.mm; sourceTree = "<group>"; };
7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewDefaultNavigationDelegate.mm; sourceTree = "<group>"; };
@@ -1655,6 +1657,7 @@
CEA6CF2219CCF5BD0064F5A7 /* OpenAndCloseWindow.mm */,
CEBCA12E1E3A660100C73293 /* OverrideContentSecurityPolicy.mm */,
C95501BE19AD2FAF0049BE3E /* Preferences.mm */,
+ 7C1AF7931E8DCBAB002645B9 /* PrepareForMoveToWindow.mm */,
5798E2AF1CAF5C2800C5CBA0 /* ProvisionalURLNotChange.mm */,
A1C4FB6C1BACCE50003742D0 /* QuickLook.mm */,
1A4F81D01BDFFDCF004E672E /* RemoteObjectRegistry.h */,
@@ -2724,6 +2727,7 @@
2D1C04A71D76298B000A6816 /* TestNavigationDelegate.mm in Sources */,
37FB72971DB2E82F00E41BE4 /* ContextMenuDefaultItemsHaveTags.mm in Sources */,
7CCE7EDB1A411A9200447C4C /* CSSParser.cpp in Sources */,
+ 7C1AF7951E8DCBAB002645B9 /* PrepareForMoveToWindow.mm in Sources */,
7CCE7F291A411B1000447C4C /* CustomProtocolsInvalidScheme.mm in Sources */,
7CCE7F2A1A411B1000447C4C /* CustomProtocolsSyncXHRTest.mm in Sources */,
7CCE7F2B1A411B1000447C4C /* CustomProtocolsTest.mm in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/PrepareForMoveToWindow.mm (0 => 214643)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/PrepareForMoveToWindow.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/PrepareForMoveToWindow.mm 2017-03-31 00:45:06 UTC (rev 214643)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import <WebKit/WKFoundation.h>
+
+#if PLATFORM(MAC) && WK_API_ENABLED
+
+#import "PlatformUtilities.h"
+#import "Test.h"
+#import "TestNavigationDelegate.h"
+#import <WebKit/WKWebViewPrivate.h>
+#import <wtf/RetainPtr.h>
+
+static bool isDone;
+
+TEST(WKWebView, PrepareForMoveToWindow)
+{
+ auto webView = adoptNS([[WKWebView alloc] init]);
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView loadRequest:request];
+
+ [webView _test_waitForDidFinishNavigation];
+
+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
+
+ [webView _prepareForMoveToWindow:window.get() completionHandler:[webView, window] {
+ [window.get().contentView addSubview:webView.get()];
+ isDone = true;
+ }];
+
+ TestWebKitAPI::Util::run(&isDone);
+}
+
+#endif
