-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
REGRESSION (r241988): Switching tabs is slow
https://bugs.webkit.org/show_bug.cgi?id=197037 <rdar://problem/49951473> Reviewed by Simon Fraser. Source/WebKit: * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm: (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateActivityState): r241988 changed to wait for a WebPageProxy message to a given DrawingArea ID, but WebPageProxy messages are identified by their WebPageProxy ID. Revert that one change. The rest of the patch looks OK. Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/ReparentWebViewTimeout.mm: Added. (TEST): * TestWebKitAPI/cocoa/TestWKWebView.h: * TestWebKitAPI/cocoa/TestWKWebView.mm: (-[TestWKWebView addToTestWindow]): Add a test that hangs without this fix. Canonical link: https://commits.webkit.org/211296@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
1 parent
3ef2458
commit e6a3924
Showing
7 changed files
with
113 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
Tools/TestWebKitAPI/Tests/WebKitCocoa/ReparentWebViewTimeout.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (C) 2019 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. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #import "PlatformUtilities.h" | ||
| #import "TestWKWebView.h" | ||
| #import <WebKit/WKProcessPoolPrivate.h> | ||
| #import <WebKit/WKWebViewPrivate.h> | ||
| #import <WebKit/_WKProcessPoolConfiguration.h> | ||
| #import <wtf/RetainPtr.h> | ||
|
|
||
| TEST(WebKit, ReparentWebViewTimeout) | ||
| { | ||
| RetainPtr<_WKProcessPoolConfiguration> processPoolConfiguration = [[_WKProcessPoolConfiguration alloc] init]; | ||
| [processPoolConfiguration setIgnoreSynchronousMessagingTimeoutsForTesting:YES]; | ||
|
|
||
| RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| [configuration setProcessPool:[[[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()] autorelease]]; | ||
|
|
||
| RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:configuration.get() addToWindow:YES]); | ||
| [webView synchronouslyLoadHTMLString:@"hello"]; | ||
| [webView waitForNextPresentationUpdate]; | ||
|
|
||
| void (^runTest)(void) = ^{ | ||
| __block bool done = false; | ||
|
|
||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| [webView removeFromSuperview]; | ||
|
|
||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| [webView addToTestWindow]; | ||
| [webView waitForNextPresentationUpdate]; | ||
| done = true; | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| TestWebKitAPI::Util::run(&done); | ||
| done = false; | ||
| }; | ||
|
|
||
| runTest(); | ||
| runTest(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters