<!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>[189572] 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/189572">189572</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2015-09-10 10:27:46 -0700 (Thu, 10 Sep 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: Make WebInspectorProxy inspectorURL path methods static

https://bugs.webkit.org/show_bug.cgi?id=149021

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2015-09-10

Reviewed by Brian Burg.

* UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess):

(WebKit::isMainOrTestInspectorPage):

(WebKit::decidePolicyForNavigationAction):

(WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):

(WebKit::WebInspectorProxy::createInspectorPage):

* UIProcess/WebInspectorProxy.h:

* UIProcess/efl/WebInspectorProxyEfl.cpp:

(WebKit::WebInspectorProxy::inspectorPageURL):

(WebKit::WebInspectorProxy::inspectorTestPageURL):

(WebKit::WebInspectorProxy::inspectorBaseURL):

* UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::inspectorPageURL):

(WebKit::WebInspectorProxy::inspectorTestPageURL):

(WebKit::WebInspectorProxy::inspectorBaseURL):

* UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::inspectorPageURL):

(WebKit::WebInspectorProxy::inspectorTestPageURL):

(WebKit::WebInspectorProxy::inspectorBaseURL):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/ChangeLog        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -1,3 +1,30 @@

</span><ins>+2015-09-10  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        Web Inspector: Make WebInspectorProxy inspectorURL path methods static

+        https://bugs.webkit.org/show_bug.cgi?id=149021

+

+        Reviewed by Brian Burg.

+

+        * UIProcess/WebInspectorProxy.cpp:

+        (WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess):

+        (WebKit::isMainOrTestInspectorPage):

+        (WebKit::decidePolicyForNavigationAction):

+        (WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):

+        (WebKit::WebInspectorProxy::createInspectorPage):

+        * UIProcess/WebInspectorProxy.h:

+        * UIProcess/efl/WebInspectorProxyEfl.cpp:

+        (WebKit::WebInspectorProxy::inspectorPageURL):

+        (WebKit::WebInspectorProxy::inspectorTestPageURL):

+        (WebKit::WebInspectorProxy::inspectorBaseURL):

+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:

+        (WebKit::WebInspectorProxy::inspectorPageURL):

+        (WebKit::WebInspectorProxy::inspectorTestPageURL):

+        (WebKit::WebInspectorProxy::inspectorBaseURL):

+        * UIProcess/mac/WebInspectorProxyMac.mm:

+        (WebKit::WebInspectorProxy::inspectorPageURL):

+        (WebKit::WebInspectorProxy::inspectorTestPageURL):

+        (WebKit::WebInspectorProxy::inspectorBaseURL):

+

</ins><span class="cx"> 2015-09-09  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Web Inspector: Remove dead WebInspectorProxy related code

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -178,7 +178,7 @@

</span><span class="cx"> void WebInspectorProxy::didRelaunchInspectorPageProcess()

</span><span class="cx"> {

</span><span class="cx">     m_inspectorPage-&gt;process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage-&gt;pageID(), *this);

</span><del>-    m_inspectorPage-&gt;process().assumeReadAccessToBaseURL(inspectorBaseURL());

</del><ins>+    m_inspectorPage-&gt;process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());

</ins><span class="cx"> 

<span class="cx">     // When didRelaunchInspectorPageProcess is called we can assume it is during a load request.

<span class="cx">     // Any messages we would have sent to a terminated process need to be re-sent.

</span><span class="lines">@@ -329,24 +329,24 @@

</span><span class="cx">     return pageLevelMap().contains(&amp;webPage);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static bool isMainOrTestInspectorPage(const WebInspectorProxy* webInspectorProxy, WKURLRequestRef requestRef)

</del><ins>+static bool isMainOrTestInspectorPage(WKURLRequestRef requestRef)

</ins><span class="cx"> {

</span><span class="cx">     URL requestURL(URL(), toImpl(requestRef)-&gt;resourceRequest().url());

</span><span class="cx">     if (!WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(requestURL.protocol()))

</span><span class="cx">         return false;

</span><span class="cx"> 

<span class="cx">     // Use URL so we can compare just the paths.

</span><del>-    URL mainPageURL(URL(), webInspectorProxy-&gt;inspectorPageURL());

</del><ins>+    URL mainPageURL(URL(), WebInspectorProxy::inspectorPageURL());

</ins><span class="cx">     ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(mainPageURL.protocol()));

</span><span class="cx">     if (decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(mainPageURL.path()))

</span><span class="cx">         return true;

</span><span class="cx"> 

<span class="cx">     // We might not have a Test URL in Production builds.

</span><del>-    String testPageURLString = webInspectorProxy-&gt;inspectorTestPageURL();

</del><ins>+    String testPageURLString = WebInspectorProxy::inspectorTestPageURL();

</ins><span class="cx">     if (testPageURLString.isNull())

</span><span class="cx">         return false;

</span><span class="cx"> 

</span><del>-    URL testPageURL(URL(), webInspectorProxy-&gt;inspectorTestPageURL());

</del><ins>+    URL testPageURL(URL(), testPageURLString);

</ins><span class="cx">     ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(testPageURL.protocol()));

</span><span class="cx">     return decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(testPageURL.path());

</span><span class="cx"> }

</span><span class="lines">@@ -370,7 +370,7 @@

</span><span class="cx">     ASSERT(webInspectorProxy);

</span><span class="cx"> 

<span class="cx">     // Allow loading of the main inspector file.

</span><del>-    if (isMainOrTestInspectorPage(webInspectorProxy, requestRef)) {

</del><ins>+    if (isMainOrTestInspectorPage(requestRef)) {

</ins><span class="cx">         toImpl(listenerRef)-&gt;use();

</span><span class="cx">         return;

</span><span class="cx">     }

</span><span class="lines">@@ -474,7 +474,7 @@

</span><span class="cx">     WKPageSetPageLoaderClient(toAPI(m_inspectorPage), &amp;loaderClient.base);

</span><span class="cx"> 

</span><span class="cx">     m_inspectorPage-&gt;process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage-&gt;pageID(), *this);

</span><del>-    m_inspectorPage-&gt;process().assumeReadAccessToBaseURL(inspectorBaseURL());

</del><ins>+    m_inspectorPage-&gt;process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> // Called by WebInspectorProxy messages

</span><span class="lines">@@ -517,7 +517,7 @@

</span><span class="cx">         m_inspectorPage-&gt;process().send(Messages::WebInspectorUI::SetDockingUnavailable(!m_canAttach), m_inspectorPage-&gt;pageID());

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    m_inspectorPage-&gt;loadRequest(URL(URL(), m_underTest ? inspectorTestPageURL() : inspectorPageURL()));

</del><ins>+    m_inspectorPage-&gt;loadRequest(URL(URL(), m_underTest ? WebInspectorProxy::inspectorTestPageURL() : WebInspectorProxy::inspectorPageURL()));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void WebInspectorProxy::open()

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -139,9 +139,9 @@

</span><span class="cx">     static bool isInspectorPage(WebPageProxy&amp;);

</span><span class="cx"> 

<span class="cx">     // Provided by platform WebInspectorProxy implementations.

</span><del>-    String inspectorPageURL() const;

-    String inspectorTestPageURL() const;

-    String inspectorBaseURL() const;

</del><ins>+    static String inspectorPageURL();

+    static String inspectorTestPageURL();

+    static String inspectorBaseURL();

</ins><span class="cx"> 

</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)

</span><span class="cx">     void enableRemoteInspection();

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -170,25 +170,23 @@

</span><span class="cx">     ecore_evas_title_set(m_inspectorWindow, title.utf8().data());

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorPageURL() const

</del><ins>+String WebInspectorProxy::inspectorPageURL()

</ins><span class="cx"> {

</span><span class="cx">     StringBuilder builder;

</span><del>-    builder.append(inspectorBaseURL());

</del><ins>+    builder.append(WebInspectorProxy::inspectorBaseURL());

</ins><span class="cx">     builder.appendLiteral(&quot;/Main.html&quot;);

</span><del>-

</del><span class="cx">     return builder.toString();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorTestPageURL() const

</del><ins>+String WebInspectorProxy::inspectorTestPageURL()

</ins><span class="cx"> {

</span><span class="cx">     StringBuilder builder;

</span><del>-    builder.append(inspectorBaseURL());

</del><ins>+    builder.append(WebInspectorProxy::inspectorBaseURL());

</ins><span class="cx">     builder.appendLiteral(&quot;/Test.html&quot;);

</span><del>-

</del><span class="cx">     return builder.toString();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorBaseURL() const

</del><ins>+String WebInspectorProxy::inspectorBaseURL()

</ins><span class="cx"> {

</span><span class="cx">     StringBuilder builder;

</span><span class="cx">     builder.appendLiteral(&quot;file://&quot;);

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -250,17 +250,17 @@

</span><span class="cx">         updateInspectorWindowTitle();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorPageURL() const

</del><ins>+String WebInspectorProxy::inspectorPageURL()

</ins><span class="cx"> {

</span><span class="cx">     return String(&quot;resource:///org/webkitgtk/inspector/UserInterface/Main.html&quot;);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorTestPageURL() const

</del><ins>+String WebInspectorProxy::inspectorTestPageURL()

</ins><span class="cx"> {

</span><span class="cx">     return String(&quot;resource:///org/webkitgtk/inspector/UserInterface/Test.html&quot;);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorBaseURL() const

</del><ins>+String WebInspectorProxy::inspectorBaseURL()

</ins><span class="cx"> {

</span><span class="cx">     return String(&quot;resource:///org/webkitgtk/inspector/UserInterface/&quot;);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (189571 => 189572)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm        2015-09-10 17:11:35 UTC (rev 189571)

+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm        2015-09-10 17:27:46 UTC (rev 189572)

</span><span class="lines">@@ -850,7 +850,7 @@

</span><span class="cx"> #endif

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorPageURL() const

</del><ins>+String WebInspectorProxy::inspectorPageURL()

</ins><span class="cx"> {

<span class="cx">     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.

</span><span class="cx">     WebInspectorUILibrary();

</span><span class="lines">@@ -861,7 +861,7 @@

</span><span class="cx">     return [[NSURL fileURLWithPath:path] absoluteString];

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorTestPageURL() const

</del><ins>+String WebInspectorProxy::inspectorTestPageURL()

</ins><span class="cx"> {

<span class="cx">     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.

</span><span class="cx">     WebInspectorUILibrary();

</span><span class="lines">@@ -875,7 +875,7 @@

</span><span class="cx">     return [[NSURL fileURLWithPath:path] absoluteString];

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-String WebInspectorProxy::inspectorBaseURL() const

</del><ins>+String WebInspectorProxy::inspectorBaseURL()

</ins><span class="cx"> {

<span class="cx">     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.

</span><span class="cx">     WebInspectorUILibrary();

</span></span></pre>

</div>

</div>

</body>

</html>