<!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>[189601] 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/189601">189601</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-10 18:42:09 -0700 (Thu, 10 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebInspectorUI should have a WebPage reference
https://bugs.webkit.org/show_bug.cgi?id=149046
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-09-10
Reviewed by Geoffrey Garen.
* WebProcess/WebPage/WebInspectorUI.cpp:
* WebProcess/WebPage/WebInspectorUI.h:
(WebKit::WebInspectorUI::page): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::inspectorUI):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189600 => 189601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-11 01:39:37 UTC (rev 189600)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-11 01:42:09 UTC (rev 189601)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-09-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ WebInspectorUI should have a WebPage reference
+ https://bugs.webkit.org/show_bug.cgi?id=149046
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ * WebProcess/WebPage/WebInspectorUI.h:
+ (WebKit::WebInspectorUI::page): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::inspectorUI):
+
+2015-09-10 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: WebInspectorUI does not need to be an API::Object
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149045
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (189600 => 189601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-09-11 01:39:37 UTC (rev 189600)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-09-11 01:42:09 UTC (rev 189601)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<WebInspectorUI> WebInspectorUI::create(WebPage* page)
</del><ins>+Ref<WebInspectorUI> WebInspectorUI::create(WebPage& page)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebInspectorUI(page));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebInspectorUI::WebInspectorUI(WebPage* page)
</del><ins>+WebInspectorUI::WebInspectorUI(WebPage& page)
</ins><span class="cx"> : m_page(page)
</span><span class="cx"> , m_inspectedPageIdentifier(0)
</span><span class="cx"> , m_underTest(false)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> m_frontendLoaded = false;
</span><span class="cx"> m_underTest = underTest;
</span><span class="cx">
</span><del>- m_page->corePage()->inspectorController().setInspectorFrontendClient(this);
</del><ins>+ m_page.corePage()->inspectorController().setInspectorFrontendClient(this);
</ins><span class="cx">
</span><span class="cx"> m_backendConnection = IPC::Connection::createClientConnection(connectionIdentifier, *this);
</span><span class="cx"> m_backendConnection->open();
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> if (m_frontendHost)
</span><span class="cx"> m_frontendHost->disconnectClient();
</span><span class="cx">
</span><del>- m_frontendHost = InspectorFrontendHost::create(this, m_page->corePage());
- ScriptGlobalObject::set(execStateFromPage(mainThreadNormalWorld(), m_page->corePage()), ASCIILiteral("InspectorFrontendHost"), m_frontendHost.get());
</del><ins>+ m_frontendHost = InspectorFrontendHost::create(this, m_page.corePage());
+ ScriptGlobalObject::set(execStateFromPage(mainThreadNormalWorld(), m_page.corePage()), ASCIILiteral("InspectorFrontendHost"), m_frontendHost.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::frontendLoaded()
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::moveWindowBy(float x, float y)
</span><span class="cx"> {
</span><del>- FloatRect frameRect = m_page->corePage()->chrome().windowRect();
</del><ins>+ FloatRect frameRect = m_page.corePage()->chrome().windowRect();
</ins><span class="cx"> frameRect.move(x, y);
</span><del>- m_page->corePage()->chrome().setWindowRect(frameRect);
</del><ins>+ m_page.corePage()->chrome().setWindowRect(frameRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::bringToFront()
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_frontendLoaded) {
</span><span class="cx"> ASSERT(m_queue.isEmpty());
</span><del>- m_page->corePage()->mainFrame().script().executeScript(expression);
</del><ins>+ m_page.corePage()->mainFrame().script().executeScript(expression);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> ASSERT(m_frontendLoaded);
</span><span class="cx">
</span><span class="cx"> for (const String& expression : m_queue)
</span><del>- m_page->corePage()->mainFrame().script().executeScript(expression);
</del><ins>+ m_page.corePage()->mainFrame().script().executeScript(expression);
</ins><span class="cx">
</span><span class="cx"> m_queue.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (189600 => 189601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-11 01:39:37 UTC (rev 189600)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-11 01:42:09 UTC (rev 189601)
</span><span class="lines">@@ -37,10 +37,8 @@
</span><span class="cx">
</span><span class="cx"> class WebInspectorUI : public RefCounted<WebInspectorUI>, public IPC::Connection::Client, public WebCore::InspectorFrontendClient {
</span><span class="cx"> public:
</span><del>- static Ref<WebInspectorUI> create(WebPage*);
</del><ins>+ static Ref<WebInspectorUI> create(WebPage&);
</ins><span class="cx">
</span><del>- WebPage* page() const { return m_page; }
-
</del><span class="cx"> // Implemented in generated WebInspectorUIMessageReceiver.cpp
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><span class="lines">@@ -104,7 +102,7 @@
</span><span class="cx"> bool isUnderTest() override { return m_underTest; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebInspectorUI(WebPage*);
</del><ins>+ explicit WebInspectorUI(WebPage&);
</ins><span class="cx">
</span><span class="cx"> void evaluateCommandOnLoad(const String& command, const String& argument = String());
</span><span class="cx"> void evaluateCommandOnLoad(const String& command, const ASCIILiteral& argument) { evaluateCommandOnLoad(command, String(argument)); }
</span><span class="lines">@@ -112,7 +110,7 @@
</span><span class="cx"> void evaluateExpressionOnLoad(const String& expression);
</span><span class="cx"> void evaluatePendingExpressions();
</span><span class="cx">
</span><del>- WebPage* m_page;
</del><ins>+ WebPage& m_page;
</ins><span class="cx">
</span><span class="cx"> RefPtr<IPC::Connection> m_backendConnection;
</span><span class="cx"> uint64_t m_inspectedPageIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (189600 => 189601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-09-11 01:39:37 UTC (rev 189600)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-09-11 01:42:09 UTC (rev 189601)
</span><span class="lines">@@ -2943,7 +2943,7 @@
</span><span class="cx"> if (m_isClosed)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!m_inspectorUI)
</span><del>- m_inspectorUI = WebInspectorUI::create(this);
</del><ins>+ m_inspectorUI = WebInspectorUI::create(*this);
</ins><span class="cx"> return m_inspectorUI.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>