<!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>[184372] trunk/Source/WebCore</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/184372">184372</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 22:07:22 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have DOMWindow::createWindow() take references to frames
https://bugs.webkit.org/show_bug.cgi?id=145037
Reviewed by Gyuyoung Kim.
Have DOMWindow::createWindow() take references to frames instead of
pointers as they are expected to be non-null. Also return a RefPtr
instead of a PassRefPtr.
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::openInNewTab):
* loader/FrameLoader.cpp:
(WebCore::createWindow):
* loader/FrameLoader.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::createWindow):
(WebCore::DOMWindow::open):
(WebCore::DOMWindow::showModalDialog):
* page/DOMWindow.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/ChangeLog 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-14 Chris Dumez <cdumez@apple.com>
+
+ Have DOMWindow::createWindow() take references to frames
+ https://bugs.webkit.org/show_bug.cgi?id=145037
+
+ Reviewed by Gyuyoung Kim.
+
+ Have DOMWindow::createWindow() take references to frames instead of
+ pointers as they are expected to be non-null. Also return a RefPtr
+ instead of a PassRefPtr.
+
+ * inspector/InspectorFrontendClientLocal.cpp:
+ (WebCore::InspectorFrontendClientLocal::openInNewTab):
+ * loader/FrameLoader.cpp:
+ (WebCore::createWindow):
+ * loader/FrameLoader.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::createWindow):
+ (WebCore::DOMWindow::open):
+ (WebCore::DOMWindow::showModalDialog):
+ * page/DOMWindow.h:
+
</ins><span class="cx"> 2015-05-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r183794): Garbage tiles when body background switches to fixed
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> bool created;
</span><span class="cx"> WindowFeatures windowFeatures;
</span><del>- RefPtr<Frame> frame = WebCore::createWindow(mainFrame, &mainFrame, request, windowFeatures, created);
</del><ins>+ RefPtr<Frame> frame = WebCore::createWindow(mainFrame, mainFrame, request, windowFeatures, created);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -3415,19 +3415,19 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Frame> createWindow(Frame& openerFrame, Frame* lookupFrame, const FrameLoadRequest& request, const WindowFeatures& features, bool& created)
</del><ins>+RefPtr<Frame> createWindow(Frame& openerFrame, Frame& lookupFrame, const FrameLoadRequest& request, const WindowFeatures& features, bool& created)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!features.dialog || request.frameName().isEmpty());
</span><span class="cx">
</span><span class="cx"> created = false;
</span><span class="cx">
</span><span class="cx"> if (!request.frameName().isEmpty() && request.frameName() != "_blank") {
</span><del>- if (RefPtr<Frame> frame = lookupFrame->loader().findFrameForNavigation(request.frameName(), openerFrame.document())) {
</del><ins>+ if (RefPtr<Frame> frame = lookupFrame.loader().findFrameForNavigation(request.frameName(), openerFrame.document())) {
</ins><span class="cx"> if (request.frameName() != "_self") {
</span><span class="cx"> if (Page* page = frame->page())
</span><span class="cx"> page->chrome().focus();
</span><span class="cx"> }
</span><del>- return frame.release();
</del><ins>+ return WTF::move(frame);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3518,7 +3518,7 @@
</span><span class="cx"> page->chrome().show();
</span><span class="cx">
</span><span class="cx"> created = true;
</span><del>- return frame.release();
</del><ins>+ return WTF::move(frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> //
</span><span class="cx"> // FIXME: Consider making this function part of an appropriate class (not FrameLoader)
</span><span class="cx"> // and moving it to a more appropriate location.
</span><del>-PassRefPtr<Frame> createWindow(Frame& openerFrame, Frame* lookupFrame, const FrameLoadRequest&, const WindowFeatures&, bool& created);
</del><ins>+RefPtr<Frame> createWindow(Frame& openerFrame, Frame& lookupFrame, const FrameLoadRequest&, const WindowFeatures&, bool& created);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -2072,13 +2072,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Frame> DOMWindow::createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures& windowFeatures, DOMWindow& activeWindow, Frame* firstFrame, Frame* openerFrame, std::function<void (DOMWindow&)> prepareDialogFunction)
</del><ins>+RefPtr<Frame> DOMWindow::createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures& windowFeatures, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, std::function<void (DOMWindow&)> prepareDialogFunction)
</ins><span class="cx"> {
</span><span class="cx"> Frame* activeFrame = activeWindow.frame();
</span><span class="cx"> if (!activeFrame)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- URL completedURL = urlString.isEmpty() ? URL(ParsedURLString, emptyString()) : firstFrame->document()->completeURL(urlString);
</del><ins>+ URL completedURL = urlString.isEmpty() ? URL(ParsedURLString, emptyString()) : firstFrame.document()->completeURL(urlString);
</ins><span class="cx"> if (!completedURL.isEmpty() && !completedURL.isValid()) {
</span><span class="cx"> // Don't expose client code to invalid URLs.
</span><span class="cx"> activeWindow.printErrorMessage("Unable to open a window with invalid URL '" + completedURL.string() + "'.\n");
</span><span class="lines">@@ -2086,10 +2086,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For whatever reason, Firefox uses the first frame to determine the outgoingReferrer. We replicate that behavior here.
</span><del>- String referrer = SecurityPolicy::generateReferrerHeader(firstFrame->document()->referrerPolicy(), completedURL, firstFrame->loader().outgoingReferrer());
</del><ins>+ String referrer = SecurityPolicy::generateReferrerHeader(firstFrame.document()->referrerPolicy(), completedURL, firstFrame.loader().outgoingReferrer());
</ins><span class="cx">
</span><span class="cx"> ResourceRequest request(completedURL, referrer);
</span><del>- FrameLoader::addHTTPOriginIfNeeded(request, firstFrame->loader().outgoingOrigin());
</del><ins>+ FrameLoader::addHTTPOriginIfNeeded(request, firstFrame.loader().outgoingOrigin());
</ins><span class="cx"> FrameLoadRequest frameRequest(activeWindow.document()->securityOrigin(), request, frameName, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ReplaceDocumentIfJavaScriptURL);
</span><span class="cx">
</span><span class="cx"> // We pass the opener frame for the lookupFrame in case the active frame is different from
</span><span class="lines">@@ -2099,11 +2099,11 @@
</span><span class="cx"> if (!newFrame)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- newFrame->loader().setOpener(openerFrame);
</del><ins>+ newFrame->loader().setOpener(&openerFrame);
</ins><span class="cx"> newFrame->page()->setOpenedByDOM();
</span><span class="cx">
</span><span class="cx"> if (newFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
</span><del>- return newFrame.release();
</del><ins>+ return WTF::move(newFrame);
</ins><span class="cx">
</span><span class="cx"> if (prepareDialogFunction)
</span><span class="cx"> prepareDialogFunction(*newFrame->document()->domWindow());
</span><span class="lines">@@ -2121,7 +2121,7 @@
</span><span class="cx"> if (!newFrame->page())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return newFrame.release();
</del><ins>+ return WTF::move(newFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
</span><span class="lines">@@ -2137,8 +2137,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- if (firstFrame
- && firstFrame->document()
</del><ins>+ if (firstFrame->document()
</ins><span class="cx"> && firstFrame->mainFrame().page()
</span><span class="cx"> && firstFrame->mainFrame().page()->userContentController()
</span><span class="cx"> && firstFrame->mainFrame().document()) {
</span><span class="lines">@@ -2190,7 +2189,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WindowFeatures windowFeatures(windowFeaturesString);
</span><del>- RefPtr<Frame> result = createWindow(urlString, frameName, windowFeatures, activeWindow, firstFrame, m_frame);
</del><ins>+ RefPtr<Frame> result = createWindow(urlString, frameName, windowFeatures, activeWindow, *firstFrame, *m_frame);
</ins><span class="cx"> return result ? result->document()->domWindow() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2215,7 +2214,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_frame->view()));
</span><del>- RefPtr<Frame> dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, activeWindow, firstFrame, m_frame, WTF::move(prepareDialogFunction));
</del><ins>+ RefPtr<Frame> dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, activeWindow, *firstFrame, *m_frame, WTF::move(prepareDialogFunction));
</ins><span class="cx"> if (!dialogFrame)
</span><span class="cx"> return;
</span><span class="cx"> dialogFrame->page()->chrome().runModal();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (184371 => 184372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2015-05-15 04:43:05 UTC (rev 184371)
+++ trunk/Source/WebCore/page/DOMWindow.h 2015-05-15 05:07:22 UTC (rev 184372)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> virtual void refEventTarget() override { ref(); }
</span><span class="cx"> virtual void derefEventTarget() override { deref(); }
</span><span class="cx">
</span><del>- static PassRefPtr<Frame> createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures&, DOMWindow& activeWindow, Frame* firstFrame, Frame* openerFrame, std::function<void (DOMWindow&)> prepareDialogFunction = nullptr);
</del><ins>+ static RefPtr<Frame> createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures&, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, std::function<void (DOMWindow&)> prepareDialogFunction = nullptr);
</ins><span class="cx"> bool isInsecureScriptAccess(DOMWindow& activeWindow, const String& urlString);
</span><span class="cx">
</span><span class="cx"> void resetDOMWindowProperties();
</span></span></pre>
</div>
</div>
</body>
</html>