Changeset 176574 in webkit

Timestamp:

Nov 29, 2014, 1:12:55 PM (12 years ago)

Author:

andersca@apple.com

Message:

Crash when calling WKPageClose on the originated page from within createNewPage callback
​https://bugs.webkit.org/show_bug.cgi?id=139099
<rdar://problem/19052564>

Reviewed by Sam Weinig.

Source/WebKit2:

Null check the namespace ID.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::cloneSessionStorageNamespaceInternal):

Tools:

Add a test.

• TestWebKitAPI/PlatformWebView.h:
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp: Added.

(TestWebKitAPI::runJavaScriptAlert):
(TestWebKitAPI::createNewPage):
(TestWebKitAPI::TEST):

• TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html: Added.
• TestWebKitAPI/mac/PlatformWebViewMac.mm:

(TestWebKitAPI::PlatformWebView::PlatformWebView):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/Storage/StorageManager.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/PlatformWebView.h (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (9 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp (added)
• Tools/TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html (added)
• Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-29  Anders Carlsson  <andersca@apple.com>
+
+        Crash when calling WKPageClose on the originated page from within createNewPage callback
+        https://bugs.webkit.org/show_bug.cgi?id=139099
+        <rdar://problem/19052564>
+
+        Reviewed by Sam Weinig.
+
+        Null check the namespace ID.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::cloneSessionStorageNamespaceInternal):
+
 2014-11-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -582 +582 @@
 {
     SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
-    ASSERT(sessionStorageNamespace);
+    if (!sessionStorageNamespace) {
+        // FIXME: We can get into this situation if someone closes the originating page from within a
+        // createNewPage callback. We bail for now, but we should really find a way to keep the session storage alive
+        // so we we'll clone the session storage correctly.
+        return;
+    }
 
     SessionStorageNamespace* newSessionStorageNamespace = m_sessionStorageNamespaces.get(newStorageNamespaceID);

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-29  Anders Carlsson  <andersca@apple.com>
+
+        Crash when calling WKPageClose on the originated page from within createNewPage callback
+        https://bugs.webkit.org/show_bug.cgi?id=139099
+        <rdar://problem/19052564>
+
+        Reviewed by Sam Weinig.
+
+        Add a test.
+
+        * TestWebKitAPI/PlatformWebView.h:
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp: Added.
+        (TestWebKitAPI::runJavaScriptAlert):
+        (TestWebKitAPI::createNewPage):
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html: Added.
+        * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+        (TestWebKitAPI::PlatformWebView::PlatformWebView):
+
 2014-11-28  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/TestWebKitAPI/PlatformWebView.h

@@ -53 +53 @@
 class PlatformWebView {
 public:
-    PlatformWebView(WKContextRef, WKPageGroupRef = 0);
+    explicit PlatformWebView(WKContextRef, WKPageGroupRef = 0);
+    explicit PlatformWebView(WKPageRef relatedPage);
     ~PlatformWebView();
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -19 +19 @@
                 1A02C84F125D4A8400E3F4BD /* Find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02C84E125D4A8400E3F4BD /* Find.cpp */; };
                 1A02C870125D4CFD00E3F4BD /* find.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A02C84B125D4A5E00E3F4BD /* find.html */; };
+                1A50AA1E1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */; };
+                1A50AA201A2A51FC00F4C345 /* close-from-within-create-page.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */; };
                 1A5FEFDD1270E2A3000E2921 /* EvaluateJavaScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5FEFDC1270E2A3000E2921 /* EvaluateJavaScript.cpp */; };
                 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
@@ -148 +150 @@
                 93ABA80916DDAB91002DB2FA /* StringHasher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93ABA80816DDAB91002DB2FA /* StringHasher.cpp */; };
                 93AF4ECE1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4ECD1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp */; };
-                93AF4ED01506F123007FD57E /* lots-of-images.html in Resources */ = {isa = PBXBuildFile; fileRef = 93AF4ECF1506F123007FD57E /* lots-of-images.html */; };
                 93AF4ED11506F130007FD57E /* lots-of-images.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93AF4ECF1506F123007FD57E /* lots-of-images.html */; };
-                93D3D19C17B1A7B000C7C415 /* all-content-in-one-iframe.html in Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
                 93D3D19E17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93D3D19D17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp */; };
                 93F1DB3114DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1DB3014DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp */; };
@@ -307 +307 @@
                                 51E5C7031919C3B200D8B3E1 /* simple3.html in Copy Resources */,
                                 290A9BB91735F63800D71BBC /* OpenNewWindow.html in Copy Resources */,
+                                1A50AA201A2A51FC00F4C345 /* close-from-within-create-page.html in Copy Resources */,
                                 290F4275172A221C00939FF0 /* custom-protocol-sync-xhr.html in Copy Resources */,
                                 C2CF975B16CEC71B0054E99D /* JSContextBackForwardCache1.html in Copy Resources */,
@@ -377 +378 @@
                 1A02C84B125D4A5E00E3F4BD /* find.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = find.html; sourceTree = "<group>"; };
                 1A02C84E125D4A8400E3F4BD /* Find.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Find.cpp; sourceTree = "<group>"; };
+                1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CloseFromWithinCreatePage.cpp; sourceTree = "<group>"; };
+                1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "close-from-within-create-page.html"; sourceTree = "<group>"; };
                 1A5FEFDC1270E2A3000E2921 /* EvaluateJavaScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EvaluateJavaScript.cpp; sourceTree = "<group>"; };
                 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WillSendSubmitEvent.mm; sourceTree = "<group>"; };
@@ -842 +845 @@
                         isa = PBXGroup;
                         children = (
-                                4A410F4B19AF7BD6002EBAB5 /* UserMedia.cpp */,
                                 C0C5D3BB14598B6F00A802A6 /* mac */,
                                 BC90977B125571AE00083756 /* Resources */,
                                 BC246D8C132F115A00B56D7C /* AboutBlankLoad.cpp */,
                                 7C8DDAA91735DE1D00EA5AC0 /* CloseThenTerminate.cpp */,
+                                1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */,
                                 BC246D98132F1FE100B56D7C /* CanHandleRequest.cpp */,
                                 BC246D97132F1FE100B56D7C /* CanHandleRequest_Bundle.cpp */,
@@ -916 +919 @@
                                 C02B77F1126612140026BF0F /* SpacebarScrolling.cpp */,
                                 1AE72F47173EB214006362F0 /* TerminateTwice.cpp */,
+                                4A410F4B19AF7BD6002EBAB5 /* UserMedia.cpp */,
                                 BC22D31314DC689800FFB1DD /* UserMessage.cpp */,
                                 BC22D31714DC68B800FFB1DD /* UserMessage_Bundle.cpp */,
@@ -981 +985 @@
                                 F6B7BE9617469B7E008A3445 /* associate-form-controls.html */,
                                 76E182DE15475A8300F1FADD /* auto-submitting-form.html */,
+                                1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */,
                                 290F4274172A1FDE00939FF0 /* custom-protocol-sync-xhr.html */,
                                 C5E1AFFD16B22179006CC1F2 /* execCopy.html */,
@@ -1249 +1254 @@
                         buildActionMask = 2147483647;
                         files = (
-                                93D3D19C17B1A7B000C7C415 /* all-content-in-one-iframe.html in Resources */,
-                                93AF4ED01506F123007FD57E /* lots-of-images.html in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1413 +1416 @@
                                 290F4278172A232C00939FF0 /* CustomProtocolsSyncXHRTest.mm in Sources */,
                                 C08587BF13FE956C001EF4E5 /* WebKitAgnosticTest.mm in Sources */,
+                                1A50AA1E1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp in Sources */,
                                 51FBBB4D1513D4E900822738 /* WebViewCanPasteURL.mm in Sources */,
                                 37E38C34169B7D010084C28C /* WebViewDidRemoveFrameFromHierarchy.mm in Sources */,

trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm

@@ -50 +50 @@
     NSRect rect = NSMakeRect(0, 0, 800, 600);
     m_view = [[WKView alloc] initWithFrame:rect contextRef:contextRef pageGroupRef:pageGroupRef];
+    [m_view setWindowOcclusionDetectionEnabled:NO];
+
+    NSRect windowRect = NSOffsetRect(rect, -10000, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
+    m_window = [[ActiveOffscreenWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
+    [m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
+    [[m_window contentView] addSubview:m_view];
+    [m_window orderBack:nil];
+    [m_window setAutodisplay:NO];
+    [m_window setReleasedWhenClosed:NO];
+}
+
+PlatformWebView::PlatformWebView(WKPageRef relatedPage)
+{
+    NSRect rect = NSMakeRect(0, 0, 800, 600);
+    m_view = [[WKView alloc] initWithFrame:rect contextRef:WKPageGetContext(relatedPage) pageGroupRef:WKPageGetPageGroup(relatedPage) relatedToPage:relatedPage];
     [m_view setWindowOcclusionDetectionEnabled:NO];