<!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>[185866] trunk/Source/WebKit2</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/185866">185866</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-23 00:00:22 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][CustomProtocol] Do not add duplicated custom scheme
https://bugs.webkit.org/show_bug.cgi?id=146199
Reviewed by Carlos Garcia Campos.
WebSoupCustomProtocolRequestManager::registerSchemeForCustomProtocol generates
a crash when duplicated scheme is registered on debug mode, or just registers it on release mode.
However application can register duplicate scheme by mistake or on purpose. Thus it would be good
if we don't register it instead of registering it or generating a crash when trying to regiseter
duplicated scheme.
EFL port want to allow user to change registered callback, thus EWK2ContextTest::ewk_context_url_scheme_register()
is modified to test it.
Test: ewk_context_url_scheme_register() in test_ewk2_context.cpp.
* UIProcess/API/efl/ewk_context.h: Added a comment to replace registered callback.
* UIProcess/API/efl/tests/test_ewk2_context.cpp:
(EWK2ContextTest::schemeRequestCallback1):
(EWK2ContextTest::schemeRequestCallback2):
(TEST_F):
(EWK2ContextTest::schemeRequestCallback): Deleted.
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
(WebKit::WebSoupCustomProtocolRequestManager::registerSchemeForCustomProtocol):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contexth">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagercpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185865 => 185866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-23 06:47:58 UTC (rev 185865)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-23 07:00:22 UTC (rev 185866)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-06-22 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL][CustomProtocol] Do not add duplicated custom scheme
+ https://bugs.webkit.org/show_bug.cgi?id=146199
+
+ Reviewed by Carlos Garcia Campos.
+
+ WebSoupCustomProtocolRequestManager::registerSchemeForCustomProtocol generates
+ a crash when duplicated scheme is registered on debug mode, or just registers it on release mode.
+ However application can register duplicate scheme by mistake or on purpose. Thus it would be good
+ if we don't register it instead of registering it or generating a crash when trying to regiseter
+ duplicated scheme.
+
+ EFL port want to allow user to change registered callback, thus EWK2ContextTest::ewk_context_url_scheme_register()
+ is modified to test it.
+
+ Test: ewk_context_url_scheme_register() in test_ewk2_context.cpp.
+
+ * UIProcess/API/efl/ewk_context.h: Added a comment to replace registered callback.
+ * UIProcess/API/efl/tests/test_ewk2_context.cpp:
+ (EWK2ContextTest::schemeRequestCallback1):
+ (EWK2ContextTest::schemeRequestCallback2):
+ (TEST_F):
+ (EWK2ContextTest::schemeRequestCallback): Deleted.
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
+ (WebKit::WebSoupCustomProtocolRequestManager::registerSchemeForCustomProtocol):
+
</ins><span class="cx"> 2015-06-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.3 release.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h (185865 => 185866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2015-06-23 06:47:58 UTC (rev 185865)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2015-06-23 07:00:22 UTC (rev 185866)
</span><span class="lines">@@ -304,6 +304,9 @@
</span><span class="cx"> * #Ewk_Url_Scheme_Request and calling ewk_url_scheme_request_finish() later when the data of
</span><span class="cx"> * the request is available.
</span><span class="cx"> *
</span><ins>+ * To replace registered callback with new callback, calls ewk_context_url_scheme_register()
+ * with new callback again.
+ *
</ins><span class="cx"> * @param context a #Ewk_Context object.
</span><span class="cx"> * @param scheme the network scheme to register
</span><span class="cx"> * @param callback the function to be called when an URL request with @a scheme is made.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp (185865 => 185866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2015-06-23 06:47:58 UTC (rev 185865)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2015-06-23 07:00:22 UTC (rev 185866)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class EWK2ContextTest : public EWK2UnitTestBase {
</span><span class="cx"> public:
</span><del>- static void schemeRequestCallback(Ewk_Url_Scheme_Request* request, void* userData)
</del><ins>+ static void schemeRequestCallback1(Ewk_Url_Scheme_Request* request, void* userData)
</ins><span class="cx"> {
</span><span class="cx"> const char* scheme = ewk_url_scheme_request_scheme_get(request);
</span><span class="cx"> ASSERT_STREQ("fooscheme", scheme);
</span><span class="lines">@@ -56,6 +56,19 @@
</span><span class="cx">
</span><span class="cx"> finishTest = true;
</span><span class="cx"> }
</span><ins>+
+ static void schemeRequestCallback2(Ewk_Url_Scheme_Request* request, void* userData)
+ {
+ const char* scheme = ewk_url_scheme_request_scheme_get(request);
+ ASSERT_STREQ("fooscheme", scheme);
+ const char* url = ewk_url_scheme_request_url_get(request);
+ ASSERT_STREQ("fooscheme:MyNewPath", url);
+ const char* path = ewk_url_scheme_request_path_get(request);
+ ASSERT_STREQ("MyNewPath", path);
+ ASSERT_TRUE(ewk_url_scheme_request_finish(request, htmlReply, strlen(htmlReply), "text/html"));
+
+ finishTest = true;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class EWK2ContextTestMultipleProcesses : public EWK2UnitTestBase {
</span><span class="lines">@@ -132,9 +145,13 @@
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2ContextTest, ewk_context_url_scheme_register)
</span><span class="cx"> {
</span><del>- ewk_context_url_scheme_register(ewk_view_context_get(webView()), "fooscheme", schemeRequestCallback, nullptr);
</del><ins>+ ewk_context_url_scheme_register(ewk_view_context_get(webView()), "fooscheme", schemeRequestCallback1, nullptr);
</ins><span class="cx"> ewk_view_url_set(webView(), "fooscheme:MyPath");
</span><ins>+ ASSERT_TRUE(waitUntilTrue(finishTest, testTimeoutSeconds));
</ins><span class="cx">
</span><ins>+ finishTest = false;
+ ewk_context_url_scheme_register(ewk_view_context_get(webView()), "fooscheme", schemeRequestCallback2, nullptr);
+ ewk_view_url_set(webView(), "fooscheme:MyNewPath");
</ins><span class="cx"> ASSERT_TRUE(waitUntilTrue(finishTest, testTimeoutSeconds));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp (185865 => 185866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2015-06-23 06:47:58 UTC (rev 185865)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2015-06-23 07:00:22 UTC (rev 185866)
</span><span class="lines">@@ -80,12 +80,15 @@
</span><span class="cx">
</span><span class="cx"> void WebSoupCustomProtocolRequestManager::registerSchemeForCustomProtocol(const String& scheme)
</span><span class="cx"> {
</span><ins>+ ASSERT(!scheme.isNull());
+ if (m_registeredSchemes.contains(scheme))
+ return;
+
</ins><span class="cx"> if (!processPool())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> processPool()->registerSchemeForCustomProtocol(scheme);
</span><span class="cx">
</span><del>- ASSERT(!m_registeredSchemes.contains(scheme));
</del><span class="cx"> m_registeredSchemes.append(scheme);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>