<!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>[161639] 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/161639">161639</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 09:07:56 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DOMWindow::showModalDialog should use std::function
https://bugs.webkit.org/show_bug.cgi?id=126753
Reviewed by Antti Koivisto.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::DialogHandler::dialogCreated):
(WebCore::JSDOMWindow::showModalDialog):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::createWindow):
(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="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</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 (161638 => 161639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 17:06:52 UTC (rev 161638)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 17:07:56 UTC (rev 161639)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ DOMWindow::showModalDialog should use std::function
+ https://bugs.webkit.org/show_bug.cgi?id=126753
+
+ Reviewed by Antti Koivisto.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::DialogHandler::dialogCreated):
+ (WebCore::JSDOMWindow::showModalDialog):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::createWindow):
+ (WebCore::DOMWindow::showModalDialog):
+ * page/DOMWindow.h:
+
</ins><span class="cx"> 2014-01-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore and Tools miscellaneous changes
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (161638 => 161639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-01-10 17:06:52 UTC (rev 161638)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-01-10 17:07:56 UTC (rev 161639)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void dialogCreated(DOMWindow*);
</del><ins>+ void dialogCreated(DOMWindow&);
</ins><span class="cx"> JSValue returnValue() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -504,9 +504,10 @@
</span><span class="cx"> RefPtr<Frame> m_frame;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline void DialogHandler::dialogCreated(DOMWindow* dialog)
</del><ins>+inline void DialogHandler::dialogCreated(DOMWindow& dialog)
</ins><span class="cx"> {
</span><del>- m_frame = dialog->frame();
</del><ins>+ m_frame = dialog.frame();
+
</ins><span class="cx"> // FIXME: This looks like a leak between the normal world and an isolated
</span><span class="cx"> // world if dialogArguments comes from an isolated world.
</span><span class="cx"> JSDOMWindow* globalObject = toJSDOMWindow(m_frame.get(), normalWorld(m_exec->vm()));
</span><span class="lines">@@ -526,11 +527,6 @@
</span><span class="cx"> return slot.getValue(m_exec, identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setUpDialog(DOMWindow* dialog, void* handler)
-{
- static_cast<DialogHandler*>(handler)->dialogCreated(dialog);
-}
-
</del><span class="cx"> JSValue JSDOMWindow::showModalDialog(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> String urlString = valueToStringWithUndefinedOrNullCheck(exec, exec->argument(0));
</span><span class="lines">@@ -542,7 +538,9 @@
</span><span class="cx">
</span><span class="cx"> DialogHandler handler(exec);
</span><span class="cx">
</span><del>- impl().showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(exec), firstDOMWindow(exec), setUpDialog, &handler);
</del><ins>+ impl().showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(exec), firstDOMWindow(exec), [&handler](DOMWindow& dialog) {
+ handler.dialogCreated(dialog);
+ });
</ins><span class="cx">
</span><span class="cx"> return handler.returnValue();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (161638 => 161639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-01-10 17:06:52 UTC (rev 161638)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-01-10 17:07:56 UTC (rev 161639)
</span><span class="lines">@@ -2012,8 +2012,7 @@
</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, PrepareDialogFunction function, void* functionContext)
</del><ins>+PassRefPtr<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">
</span><span class="lines">@@ -2044,8 +2043,8 @@
</span><span class="cx"> if (newFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
</span><span class="cx"> return newFrame.release();
</span><span class="cx">
</span><del>- if (function)
- function(newFrame->document()->domWindow(), functionContext);
</del><ins>+ if (prepareDialogFunction)
+ prepareDialogFunction(*newFrame->document()->domWindow());
</ins><span class="cx">
</span><span class="cx"> if (created)
</span><span class="cx"> newFrame->loader().changeLocation(activeWindow.document()->securityOrigin(), completedURL, referrer, false, false);
</span><span class="lines">@@ -2120,8 +2119,7 @@
</span><span class="cx"> return result ? result->document()->domWindow() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMWindow::showModalDialog(const String& urlString, const String& dialogFeaturesString,
- DOMWindow& activeWindow, DOMWindow& firstWindow, PrepareDialogFunction function, void* functionContext)
</del><ins>+void DOMWindow::showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, std::function<void (DOMWindow&)> prepareDialogFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><span class="cx"> return;
</span><span class="lines">@@ -2142,8 +2140,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, function, functionContext);
</del><ins>+ RefPtr<Frame> dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, activeWindow, firstFrame, m_frame, std::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 (161638 => 161639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2014-01-10 17:06:52 UTC (rev 161638)
+++ trunk/Source/WebCore/page/DOMWindow.h 2014-01-10 17:07:56 UTC (rev 161639)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "FrameDestructionObserver.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "Supplementable.h"
</span><ins>+#include <functional>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -161,9 +162,7 @@
</span><span class="cx"> PassRefPtr<DOMWindow> open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
</span><span class="cx"> DOMWindow& activeWindow, DOMWindow& firstWindow);
</span><span class="cx">
</span><del>- typedef void (*PrepareDialogFunction)(DOMWindow*, void* context);
- void showModalDialog(const String& urlString, const String& dialogFeaturesString,
- DOMWindow& activeWindow, DOMWindow& firstWindow, PrepareDialogFunction, void* functionContext);
</del><ins>+ void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, std::function<void (DOMWindow&)> prepareDialogFunction);
</ins><span class="cx">
</span><span class="cx"> void alert(const String& message);
</span><span class="cx"> bool confirm(const String& message);
</span><span class="lines">@@ -443,9 +442,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,
- PrepareDialogFunction = 0, void* functionContext = 0);
</del><ins>+ static PassRefPtr<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>