<!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>[47895] trunk/WebKit/win</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/47895">47895</a></dd>
<dt>Author</dt> <dd>aroben@apple.com</dd>
<dt>Date</dt> <dd>2009-08-31 08:05:11 -0700 (Mon, 31 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>A little clean-up in WebChromeClient::createWindow

Reviewed by Steve Falkenburg.

* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::createWindow): Refactored to share more code between
the dialog and non-dialog cases.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebCoreSupportWebChromeClientcpp">trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (47894 => 47895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2009-08-31 12:50:15 UTC (rev 47894)
+++ trunk/WebKit/win/ChangeLog        2009-08-31 15:05:11 UTC (rev 47895)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-08-20  Adam Roben  &lt;aroben@apple.com&gt;
+
+        A little clean-up in WebChromeClient::createWindow
+
+        Reviewed by Steve Falkenburg.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::createWindow): Refactored to share more code between
+        the dialog and non-dialog cases.
+
</ins><span class="cx"> 2009-08-28  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp (47894 => 47895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp        2009-08-31 12:50:15 UTC (rev 47894)
+++ trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp        2009-08-31 15:05:11 UTC (rev 47895)
</span><span class="lines">@@ -156,33 +156,20 @@
</span><span class="cx"> 
</span><span class="cx"> Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest&amp; frameLoadRequest, const WindowFeatures&amp; features)
</span><span class="cx"> {
</span><ins>+    COMPtr&lt;IWebUIDelegate&gt; delegate = uiDelegate();
+    if (!delegate)
+        return 0;
+
+    COMPtr&lt;IWebMutableURLRequest&gt; request(AdoptCOM, WebMutableURLRequest::createInstance(frameLoadRequest.resourceRequest()));
+    COMPtr&lt;IWebView&gt; newWebView;
+
</ins><span class="cx">     if (features.dialog) {
</span><del>-        COMPtr&lt;IWebUIDelegate&gt; delegate = uiDelegate();
-        if (!delegate)
</del><ins>+        if (FAILED(delegate-&gt;createModalDialog(m_webView, request.get(), &amp;newWebView)))
</ins><span class="cx">             return 0;
</span><del>-        COMPtr&lt;IWebMutableURLRequest&gt; request(AdoptCOM, WebMutableURLRequest::createInstance(frameLoadRequest.resourceRequest()));
-        COMPtr&lt;IWebView&gt; dialog;
-        if (FAILED(delegate-&gt;createModalDialog(m_webView, request.get(), &amp;dialog)))
-            return 0;
-        return core(dialog.get());
-    }
</del><ins>+    } else if (FAILED(delegate-&gt;createWebViewWithRequest(m_webView, request.get(), &amp;newWebView)))
+        return 0;
</ins><span class="cx"> 
</span><del>-    Page* page = 0;
-    IWebUIDelegate* uiDelegate = 0;
-    IWebMutableURLRequest* request = WebMutableURLRequest::createInstance(frameLoadRequest.resourceRequest());
-
-    if (SUCCEEDED(m_webView-&gt;uiDelegate(&amp;uiDelegate))) {
-        IWebView* webView = 0;
-        if (SUCCEEDED(uiDelegate-&gt;createWebViewWithRequest(m_webView, request, &amp;webView))) {
-            page = core(webView);
-            webView-&gt;Release();
-        }
-    
-        uiDelegate-&gt;Release();
-    }
-
-    request-&gt;Release();
-    return page;
</del><ins>+    return newWebView ? core(newWebView.get()) : 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebChromeClient::show()
</span></span></pre>
</div>
</div>

</body>
</html>