<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178280] releases/WebKitGTK/webkit-2.6</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178280">178280</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-12 10:10:36 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176574">r176574</a> - 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessStorageStorageManagercpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsChangeLog">releases/WebKitGTK/webkit-2.6/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPIPlatformWebViewh">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformWebView.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPImacPlatformWebViewMacmm">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2CloseFromWithinCreatePagecpp">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2closefromwithincreatepagehtml">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-11-25 Ting-Wei Lan <lantw44@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use LD_LIBRARY_PATH to make g-ir-scanner use the newly-built
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -581,7 +581,12 @@
</span><span class="cx"> void StorageManager::cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID)
</span><span class="cx"> {
</span><span class="cx"> SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
</span><del>- ASSERT(sessionStorageNamespace);
</del><ins>+ 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;
+ }
</ins><span class="cx">
</span><span class="cx"> SessionStorageNamespace* newSessionStorageNamespace = m_sessionStorageNamespaces.get(newStorageNamespaceID);
</span><span class="cx"> ASSERT(newSessionStorageNamespace);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-11-17 Ting-Wei Lan <lantw44@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add library search paths from LDFLAGS before pkg-config --libs
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPIPlatformWebViewh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformWebView.h (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformWebView.h 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformWebView.h 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -52,7 +52,8 @@
</span><span class="cx">
</span><span class="cx"> class PlatformWebView {
</span><span class="cx"> public:
</span><del>- PlatformWebView(WKContextRef, WKPageGroupRef = 0);
</del><ins>+ explicit PlatformWebView(WKContextRef, WKPageGroupRef = 0);
+ explicit PlatformWebView(WKPageRef relatedPage);
</ins><span class="cx"> ~PlatformWebView();
</span><span class="cx">
</span><span class="cx"> WKPageRef page() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx"> 14F3B11315E45EAB00210069 /* SaturatedArithmeticOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14F3B11215E45EAB00210069 /* SaturatedArithmeticOperations.cpp */; };
</span><span class="cx"> 1A02C84F125D4A8400E3F4BD /* Find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02C84E125D4A8400E3F4BD /* Find.cpp */; };
</span><span class="cx"> 1A02C870125D4CFD00E3F4BD /* find.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A02C84B125D4A5E00E3F4BD /* find.html */; };
</span><ins>+ 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 */; };
</ins><span class="cx"> 1A5FEFDD1270E2A3000E2921 /* EvaluateJavaScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5FEFDC1270E2A3000E2921 /* EvaluateJavaScript.cpp */; };
</span><span class="cx"> 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
</span><span class="cx"> 1A7BFC0C171A0BDB00BC5F64 /* WillSendSubmitEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */; };
</span><span class="lines">@@ -142,9 +144,7 @@
</span><span class="cx"> 93A7EB3D18FA63A4009E7670 /* URLExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93A7EB3C18FA63A4009E7670 /* URLExtras.mm */; };
</span><span class="cx"> 93ABA80916DDAB91002DB2FA /* StringHasher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93ABA80816DDAB91002DB2FA /* StringHasher.cpp */; };
</span><span class="cx"> 93AF4ECE1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4ECD1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp */; };
</span><del>- 93AF4ED01506F123007FD57E /* lots-of-images.html in Resources */ = {isa = PBXBuildFile; fileRef = 93AF4ECF1506F123007FD57E /* lots-of-images.html */; };
</del><span class="cx"> 93AF4ED11506F130007FD57E /* lots-of-images.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93AF4ECF1506F123007FD57E /* lots-of-images.html */; };
</span><del>- 93D3D19C17B1A7B000C7C415 /* all-content-in-one-iframe.html in Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
</del><span class="cx"> 93D3D19E17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93D3D19D17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp */; };
</span><span class="cx"> 93F1DB3114DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1DB3014DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp */; };
</span><span class="cx"> 93F1DB3414DA20870024C362 /* NewFirstVisuallyNonEmptyLayout_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1DB3314DA20870024C362 /* NewFirstVisuallyNonEmptyLayout_Bundle.cpp */; };
</span><span class="lines">@@ -294,6 +294,7 @@
</span><span class="cx"> 51E5C7021919C3B200D8B3E1 /* simple2.html in Copy Resources */,
</span><span class="cx"> 51E5C7031919C3B200D8B3E1 /* simple3.html in Copy Resources */,
</span><span class="cx"> 290A9BB91735F63800D71BBC /* OpenNewWindow.html in Copy Resources */,
</span><ins>+ 1A50AA201A2A51FC00F4C345 /* close-from-within-create-page.html in Copy Resources */,
</ins><span class="cx"> 290F4275172A221C00939FF0 /* custom-protocol-sync-xhr.html in Copy Resources */,
</span><span class="cx"> C2CF975B16CEC71B0054E99D /* JSContextBackForwardCache1.html in Copy Resources */,
</span><span class="cx"> C2CF975A16CEC7140054E99D /* JSContextBackForwardCache2.html in Copy Resources */,
</span><span class="lines">@@ -361,6 +362,8 @@
</span><span class="cx"> 14F3B11215E45EAB00210069 /* SaturatedArithmeticOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SaturatedArithmeticOperations.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A02C84B125D4A5E00E3F4BD /* find.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = find.html; sourceTree = "<group>"; };
</span><span class="cx"> 1A02C84E125D4A8400E3F4BD /* Find.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Find.cpp; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
</ins><span class="cx"> 1A5FEFDC1270E2A3000E2921 /* EvaluateJavaScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EvaluateJavaScript.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WillSendSubmitEvent.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -814,6 +817,7 @@
</span><span class="cx"> BC90977B125571AE00083756 /* Resources */,
</span><span class="cx"> BC246D8C132F115A00B56D7C /* AboutBlankLoad.cpp */,
</span><span class="cx"> 7C8DDAA91735DE1D00EA5AC0 /* CloseThenTerminate.cpp */,
</span><ins>+ 1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */,
</ins><span class="cx"> BC246D98132F1FE100B56D7C /* CanHandleRequest.cpp */,
</span><span class="cx"> BC246D97132F1FE100B56D7C /* CanHandleRequest_Bundle.cpp */,
</span><span class="cx"> F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */,
</span><span class="lines">@@ -883,6 +887,7 @@
</span><span class="cx"> 51E5C7041919EA5F00D8B3E1 /* ShouldKeepCurrentBackForwardListItemInList.cpp */,
</span><span class="cx"> C02B77F1126612140026BF0F /* SpacebarScrolling.cpp */,
</span><span class="cx"> 1AE72F47173EB214006362F0 /* TerminateTwice.cpp */,
</span><ins>+ 4A410F4B19AF7BD6002EBAB5 /* UserMedia.cpp */,
</ins><span class="cx"> BC22D31314DC689800FFB1DD /* UserMessage.cpp */,
</span><span class="cx"> BC22D31714DC68B800FFB1DD /* UserMessage_Bundle.cpp */,
</span><span class="cx"> 520BCF4B141EB09E00937EA8 /* WebArchive.cpp */,
</span><span class="lines">@@ -946,6 +951,7 @@
</span><span class="cx"> C045F9461385C2F800C0F3CD /* 18-characters.html */,
</span><span class="cx"> F6B7BE9617469B7E008A3445 /* associate-form-controls.html */,
</span><span class="cx"> 76E182DE15475A8300F1FADD /* auto-submitting-form.html */,
</span><ins>+ 1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */,
</ins><span class="cx"> 290F4274172A1FDE00939FF0 /* custom-protocol-sync-xhr.html */,
</span><span class="cx"> C5E1AFFD16B22179006CC1F2 /* execCopy.html */,
</span><span class="cx"> BC2D004A12A9FEB300E732A3 /* file-with-anchor.html */,
</span><span class="lines">@@ -1209,8 +1215,6 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 93D3D19C17B1A7B000C7C415 /* all-content-in-one-iframe.html in Resources */,
- 93AF4ED01506F123007FD57E /* lots-of-images.html in Resources */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -1370,6 +1374,7 @@
</span><span class="cx"> 0F17BBD615AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp in Sources */,
</span><span class="cx"> 290F4278172A232C00939FF0 /* CustomProtocolsSyncXHRTest.mm in Sources */,
</span><span class="cx"> C08587BF13FE956C001EF4E5 /* WebKitAgnosticTest.mm in Sources */,
</span><ins>+ 1A50AA1E1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp in Sources */,
</ins><span class="cx"> 51FBBB4D1513D4E900822738 /* WebViewCanPasteURL.mm in Sources */,
</span><span class="cx"> 37E38C34169B7D010084C28C /* WebViewDidRemoveFrameFromHierarchy.mm in Sources */,
</span><span class="cx"> 76E182DA1547550100F1FADD /* WillSendSubmitEvent.cpp in Sources */,
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2CloseFromWithinCreatePagecpp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp (0 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp (rev 0)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+/*
+ * Copyright (C) 2014 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"
+#include "PlatformUtilities.h"
+#include "PlatformWebView.h"
+
+namespace TestWebKitAPI {
+
+static bool testDone;
+static std::unique_ptr<PlatformWebView> openedWebView;
+
+static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
+{
+ // FIXME: Check that the alert text matches the storage.
+ testDone = true;
+}
+
+static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo)
+{
+ EXPECT_TRUE(openedWebView == nullptr);
+
+ openedWebView = std::make_unique<PlatformWebView>(page);
+
+ WKPageUIClientV5 uiClient;
+ memset(&uiClient, 0, sizeof(uiClient));
+
+ uiClient.base.version = 5;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
+ WKPageSetPageUIClient(openedWebView->page(), &uiClient.base);
+
+ WKPageClose(page);
+
+ WKRetain(openedWebView->page());
+ return openedWebView->page();
+}
+
+TEST(WebKit2, CloseFromWithinCreatePage)
+{
+ WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
+
+ PlatformWebView webView(context.get());
+
+ WKPageUIClientV5 uiClient;
+ memset(&uiClient, 0, sizeof(uiClient));
+
+ uiClient.base.version = 5;
+ uiClient.createNewPage = createNewPage;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
+ WKPageSetPageUIClient(webView.page(), &uiClient.base);
+
+ WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("close-from-within-create-page", "html"));
+ WKPageLoadURL(webView.page(), url.get());
+
+ Util::run(&testDone);
+
+ openedWebView = nullptr;
+}
+
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2closefromwithincreatepagehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html (0 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<html>
+<script>
+function runTest()
+{
+ if (document.location.search === "?opened-window") {
+ alert(window.sessionStorage['storageKey'])
+ return;
+ }
+
+ window.sessionStorage['storageKey'] = 'value';
+ window.open("close-from-within-create-page.html?opened-window");
+}
+</script>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPImacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (178279 => 178280)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2015-01-12 18:09:10 UTC (rev 178279)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2015-01-12 18:10:36 UTC (rev 178280)
</span><span class="lines">@@ -60,6 +60,21 @@
</span><span class="cx"> [m_window setReleasedWhenClosed:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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];
+
+ 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];
+}
+
</ins><span class="cx"> PlatformWebView::~PlatformWebView()
</span><span class="cx"> {
</span><span class="cx"> [m_window close];
</span></span></pre>
</div>
</div>
</body>
</html>