<!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>[189657] 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/189657">189657</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-12 12:02:17 -0700 (Sat, 12 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Extract InspectorFrontendAPI dispatching from WebInspectorUI
https://bugs.webkit.org/show_bug.cgi?id=149089
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-09-12
Reviewed by Brian Burg.
* CMakeLists.txt:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp: Added.
(WebKit::WebInspectorFrontendAPIDispatcher::WebInspectorFrontendAPIDispatcher):
(WebKit::WebInspectorFrontendAPIDispatcher::reset):
(WebKit::WebInspectorFrontendAPIDispatcher::frontendLoaded):
(WebKit::WebInspectorFrontendAPIDispatcher::dispatchCommand):
(WebKit::WebInspectorFrontendAPIDispatcher::dispatchMessageAsync):
(WebKit::WebInspectorFrontendAPIDispatcher::evaluateExpressionOnLoad):
* WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h: Added.
* WebProcess/WebPage/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::WebInspectorUI):
(WebKit::WebInspectorUI::establishConnection):
(WebKit::WebInspectorUI::frontendLoaded):
(WebKit::WebInspectorUI::setDockSide):
(WebKit::WebInspectorUI::setDockingUnavailable):
(WebKit::WebInspectorUI::showConsole):
(WebKit::WebInspectorUI::showResources):
(WebKit::WebInspectorUI::showMainResourceForFrame):
(WebKit::WebInspectorUI::startPageProfiling):
(WebKit::WebInspectorUI::stopPageProfiling):
(WebKit::WebInspectorUI::didSave):
(WebKit::WebInspectorUI::didAppend):
(WebKit::WebInspectorUI::sendMessageToFrontend):
(WebKit::WebInspectorUI::evaluateCommandOnLoad): Deleted.
(WebKit::WebInspectorUI::evaluateExpressionOnLoad): Deleted.
(WebKit::WebInspectorUI::evaluatePendingExpressions): Deleted.
* WebProcess/WebPage/WebInspectorUI.h:
(WebKit::WebInspectorUI::evaluateCommandOnLoad): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorFrontendAPIDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorFrontendAPIDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (189656 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-09-12 18:53:22 UTC (rev 189656)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -620,6 +620,7 @@
</span><span class="cx"> WebProcess/WebPage/WebDocumentLoader.cpp
</span><span class="cx"> WebProcess/WebPage/WebFrame.cpp
</span><span class="cx"> WebProcess/WebPage/WebInspector.cpp
</span><ins>+ WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp
</ins><span class="cx"> WebProcess/WebPage/WebInspectorUI.cpp
</span><span class="cx"> WebProcess/WebPage/WebOpenPanelResultListener.cpp
</span><span class="cx"> WebProcess/WebPage/WebPage.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189656 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-12 18:53:22 UTC (rev 189656)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2015-09-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Extract InspectorFrontendAPI dispatching from WebInspectorUI
+ https://bugs.webkit.org/show_bug.cgi?id=149089
+
+ Reviewed by Brian Burg.
+
+ * CMakeLists.txt:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp: Added.
+ (WebKit::WebInspectorFrontendAPIDispatcher::WebInspectorFrontendAPIDispatcher):
+ (WebKit::WebInspectorFrontendAPIDispatcher::reset):
+ (WebKit::WebInspectorFrontendAPIDispatcher::frontendLoaded):
+ (WebKit::WebInspectorFrontendAPIDispatcher::dispatchCommand):
+ (WebKit::WebInspectorFrontendAPIDispatcher::dispatchMessageAsync):
+ (WebKit::WebInspectorFrontendAPIDispatcher::evaluateExpressionOnLoad):
+ * WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h: Added.
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ (WebKit::WebInspectorUI::WebInspectorUI):
+ (WebKit::WebInspectorUI::establishConnection):
+ (WebKit::WebInspectorUI::frontendLoaded):
+ (WebKit::WebInspectorUI::setDockSide):
+ (WebKit::WebInspectorUI::setDockingUnavailable):
+ (WebKit::WebInspectorUI::showConsole):
+ (WebKit::WebInspectorUI::showResources):
+ (WebKit::WebInspectorUI::showMainResourceForFrame):
+ (WebKit::WebInspectorUI::startPageProfiling):
+ (WebKit::WebInspectorUI::stopPageProfiling):
+ (WebKit::WebInspectorUI::didSave):
+ (WebKit::WebInspectorUI::didAppend):
+ (WebKit::WebInspectorUI::sendMessageToFrontend):
+ (WebKit::WebInspectorUI::evaluateCommandOnLoad): Deleted.
+ (WebKit::WebInspectorUI::evaluateExpressionOnLoad): Deleted.
+ (WebKit::WebInspectorUI::evaluatePendingExpressions): Deleted.
+ * WebProcess/WebPage/WebInspectorUI.h:
+ (WebKit::WebInspectorUI::evaluateCommandOnLoad): Deleted.
+
+2015-09-12 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Move Already Generic Inspector Page Context Menu to Generic Setup
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149088
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (189656 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-09-12 18:53:22 UTC (rev 189656)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -1218,6 +1218,8 @@
</span><span class="cx"> A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF631118E0B7C8003A3E2A /* DownloadClient.h */; };
</span><span class="cx"> A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */; };
</span><span class="cx"> A54293A5195A43DD002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = A54293A3195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm */; };
</span><ins>+ A55BA8351BA3E70A007CD33D /* WebInspectorFrontendAPIDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */; };
+ A55BA8361BA3E70D007CD33D /* WebInspectorFrontendAPIDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55BA8321BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.cpp */; };
</ins><span class="cx"> A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
</span><span class="cx"> A58B6F0918FCA733008CBA53 /* WKFileUploadPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */; };
</span><span class="cx"> A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3417,6 +3419,8 @@
</span><span class="cx"> A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebProcessShim.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKInspectorNodeSearchGestureRecognizer.h; path = ios/WKInspectorNodeSearchGestureRecognizer.h; sourceTree = "<group>"; };
</span><span class="cx"> A54293A3195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInspectorNodeSearchGestureRecognizer.mm; path = ios/WKInspectorNodeSearchGestureRecognizer.mm; sourceTree = "<group>"; };
</span><ins>+ A55BA8321BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorFrontendAPIDispatcher.cpp; sourceTree = "<group>"; };
+ A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorFrontendAPIDispatcher.h; sourceTree = "<group>"; };
</ins><span class="cx"> A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFileUploadPanel.h; path = ios/forms/WKFileUploadPanel.h; sourceTree = "<group>"; };
</span><span class="cx"> A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFileUploadPanel.mm; path = ios/forms/WKFileUploadPanel.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6033,6 +6037,8 @@
</span><span class="cx"> 1C8E281F1275D15400BC7BD0 /* WebInspector.cpp */,
</span><span class="cx"> 1C8E281E1275D15400BC7BD0 /* WebInspector.h */,
</span><span class="cx"> 1C8E2A1C1277833F00BC7BD0 /* WebInspector.messages.in */,
</span><ins>+ A55BA8321BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.cpp */,
+ A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */,
</ins><span class="cx"> 1C891D6219B124FF00BA79DD /* WebInspectorUI.cpp */,
</span><span class="cx"> 1C891D6319B124FF00BA79DD /* WebInspectorUI.h */,
</span><span class="cx"> 1C891D6419B124FF00BA79DD /* WebInspectorUI.messages.in */,
</span><span class="lines">@@ -7933,6 +7939,7 @@
</span><span class="cx"> 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */,
</span><span class="cx"> 1A90C1EE1264FD50003E44D4 /* WebFindOptions.h in Headers */,
</span><span class="cx"> BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
</span><ins>+ A55BA8351BA3E70A007CD33D /* WebInspectorFrontendAPIDispatcher.h in Headers */,
</ins><span class="cx"> BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
</span><span class="cx"> BC032D8D10F437A00058C15A /* WebFrame.h in Headers */,
</span><span class="cx"> BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */,
</span><span class="lines">@@ -9546,6 +9553,7 @@
</span><span class="cx"> 5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */,
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
</span><span class="cx"> 513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
</span><ins>+ A55BA8361BA3E70D007CD33D /* WebInspectorFrontendAPIDispatcher.cpp in Sources */,
</ins><span class="cx"> 51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
</span><span class="cx"> 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
</span><span class="cx"> E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorFrontendAPIDispatchercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp (0 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+/*
+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebInspectorFrontendAPIDispatcher.h"
+
+#include "WebPage.h"
+#include <JavaScriptCore/ScriptValue.h>
+#include <WebCore/MainFrame.h>
+#include <WebCore/ScriptController.h>
+#include <WebCore/ScriptState.h>
+
+namespace WebKit {
+
+WebInspectorFrontendAPIDispatcher::WebInspectorFrontendAPIDispatcher(WebPage& page)
+ : m_page(page)
+{
+}
+
+void WebInspectorFrontendAPIDispatcher::reset()
+{
+ m_frontendLoaded = false;
+
+ m_queue.clear();
+}
+
+void WebInspectorFrontendAPIDispatcher::frontendLoaded()
+{
+ m_frontendLoaded = true;
+
+ for (const String& expression : m_queue)
+ m_page.corePage()->mainFrame().script().executeScript(expression);
+
+ m_queue.clear();
+}
+
+void WebInspectorFrontendAPIDispatcher::dispatchCommand(const String& command)
+{
+ evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\"])"));
+}
+
+void WebInspectorFrontendAPIDispatcher::dispatchCommand(const String& command, const String& argument)
+{
+ evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\", \"", argument, "\"])"));
+}
+
+void WebInspectorFrontendAPIDispatcher::dispatchCommand(const String& command, bool argument)
+{
+ evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\", ", argument ? "true" : "false", "])"));
+}
+
+void WebInspectorFrontendAPIDispatcher::dispatchMessageAsync(const String& message)
+{
+ evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatchMessageAsync(", message, ")"));
+}
+
+void WebInspectorFrontendAPIDispatcher::evaluateExpressionOnLoad(const String& expression)
+{
+ if (m_frontendLoaded) {
+ ASSERT(m_queue.isEmpty());
+ m_page.corePage()->mainFrame().script().executeScript(expression);
+ return;
+ }
+
+ m_queue.append(expression);
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorFrontendAPIDispatcherh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h (0 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebInspectorFrontendAPIDispatcher_h
+#define WebInspectorFrontendAPIDispatcher_h
+
+#include <wtf/Deque.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class WebPage;
+
+class WebInspectorFrontendAPIDispatcher {
+public:
+ WebInspectorFrontendAPIDispatcher(WebPage& page);
+
+ void reset();
+ void frontendLoaded();
+
+ void dispatchCommand(const String& command);
+ void dispatchCommand(const String& command, const String& argument);
+ void dispatchCommand(const String& command, bool argument);
+ void dispatchMessageAsync(const String& message);
+
+private:
+ void evaluateExpressionOnLoad(const String& expression);
+
+ WebPage& m_page;
+ Deque<String> m_queue;
+ bool m_frontendLoaded { false };
+};
+
+} // namespace WebKit
+
+#endif // WebInspectorFrontendAPIDispatcher_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (189656 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-09-12 18:53:22 UTC (rev 189656)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -30,13 +30,10 @@
</span><span class="cx"> #include "WebInspectorProxyMessages.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebProcess.h"
</span><del>-#include <JavaScriptCore/ScriptValue.h>
</del><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="cx"> #include <WebCore/DOMWrapperWorld.h>
</span><span class="cx"> #include <WebCore/InspectorController.h>
</span><del>-#include <WebCore/MainFrame.h>
</del><span class="cx"> #include <WebCore/NotImplemented.h>
</span><del>-#include <WebCore/ScriptController.h>
</del><span class="cx"> #include <WebCore/ScriptGlobalObject.h>
</span><span class="cx"> #include <WebCore/ScriptState.h>
</span><span class="cx">
</span><span class="lines">@@ -51,13 +48,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspectorUI::WebInspectorUI(WebPage& page)
</span><span class="cx"> : m_page(page)
</span><del>- , m_inspectedPageIdentifier(0)
- , m_underTest(false)
- , m_frontendLoaded(false)
- , m_dockSide(DockSide::Undocked)
-#if PLATFORM(COCOA)
- , m_hasLocalizedStringsURL(false)
-#endif
</del><ins>+ , m_frontendAPIDispatcher(page)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +67,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_inspectedPageIdentifier = inspectedPageIdentifier;
</span><del>- m_frontendLoaded = false;
</del><ins>+ m_frontendAPIDispatcher.reset();
</ins><span class="cx"> m_underTest = underTest;
</span><span class="cx">
</span><span class="cx"> m_page.corePage()->inspectorController().setInspectorFrontendClient(this);
</span><span class="lines">@@ -96,9 +87,8 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::frontendLoaded()
</span><span class="cx"> {
</span><del>- m_frontendLoaded = true;
</del><ins>+ m_frontendAPIDispatcher.frontendLoaded();
</ins><span class="cx">
</span><del>- evaluatePendingExpressions();
</del><span class="cx"> bringToFront();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,12 +157,12 @@
</span><span class="cx">
</span><span class="cx"> m_dockSide = side;
</span><span class="cx">
</span><del>- evaluateCommandOnLoad(ASCIILiteral("setDockSide"), ASCIILiteral(sideString));
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("setDockSide"), String(ASCIILiteral(sideString)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::setDockingUnavailable(bool unavailable)
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("setDockingUnavailable"), unavailable);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("setDockingUnavailable"), unavailable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::changeAttachedWindowHeight(unsigned height)
</span><span class="lines">@@ -213,42 +203,42 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::showConsole()
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("showConsole"));
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("showConsole"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::showResources()
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("showResources"));
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("showResources"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::showMainResourceForFrame(const String& frameIdentifier)
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("showMainResourceForFrame"), frameIdentifier);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("showMainResourceForFrame"), frameIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::startPageProfiling()
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("setTimelineProfilingEnabled"), true);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("setTimelineProfilingEnabled"), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::stopPageProfiling()
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("setTimelineProfilingEnabled"), false);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("setTimelineProfilingEnabled"), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::didSave(const String& url)
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("savedURL"), url);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("savedURL"), url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::didAppend(const String& url)
</span><span class="cx"> {
</span><del>- evaluateCommandOnLoad(ASCIILiteral("appendedToURL"), url);
</del><ins>+ m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("appendedToURL"), url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::sendMessageToFrontend(const String& message)
</span><span class="cx"> {
</span><del>- evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatchMessageAsync(", message, ")"));
</del><ins>+ m_frontendAPIDispatcher.dispatchMessageAsync(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::sendMessageToBackend(const String& message)
</span><span class="lines">@@ -257,38 +247,4 @@
</span><span class="cx"> m_backendConnection->send(Messages::WebInspector::SendMessageToBackend(message), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebInspectorUI::evaluateCommandOnLoad(const String& command, const String& argument)
-{
- if (argument.isNull())
- evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\"])"));
- else
- evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\", \"", argument, "\"])"));
-}
-
-void WebInspectorUI::evaluateCommandOnLoad(const String& command, bool argument)
-{
- evaluateExpressionOnLoad(makeString("InspectorFrontendAPI.dispatch([\"", command, "\", ", ASCIILiteral(argument ? "true" : "false"), "])"));
-}
-
-void WebInspectorUI::evaluateExpressionOnLoad(const String& expression)
-{
- if (m_frontendLoaded) {
- ASSERT(m_queue.isEmpty());
- m_page.corePage()->mainFrame().script().executeScript(expression);
- return;
- }
-
- m_queue.append(expression);
-}
-
-void WebInspectorUI::evaluatePendingExpressions()
-{
- ASSERT(m_frontendLoaded);
-
- for (const String& expression : m_queue)
- m_page.corePage()->mainFrame().script().executeScript(expression);
-
- m_queue.clear();
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (189656 => 189657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-12 18:53:22 UTC (rev 189656)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-12 19:02:17 UTC (rev 189657)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WebInspectorUI_h
</span><span class="cx"> #define WebInspectorUI_h
</span><span class="cx">
</span><del>-#include "APIObject.h"
</del><span class="cx"> #include "Connection.h"
</span><ins>+#include "WebInspectorFrontendAPIDispatcher.h"
</ins><span class="cx"> #include <WebCore/InspectorFrontendClient.h>
</span><span class="cx"> #include <WebCore/InspectorFrontendHost.h>
</span><span class="cx">
</span><span class="lines">@@ -104,28 +104,18 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebInspectorUI(WebPage&);
</span><span class="cx">
</span><del>- void evaluateCommandOnLoad(const String& command, const String& argument = String());
- void evaluateCommandOnLoad(const String& command, const ASCIILiteral& argument) { evaluateCommandOnLoad(command, String(argument)); }
- void evaluateCommandOnLoad(const String& command, bool argument);
- void evaluateExpressionOnLoad(const String& expression);
- void evaluatePendingExpressions();
-
</del><span class="cx"> WebPage& m_page;
</span><del>-
</del><ins>+ WebInspectorFrontendAPIDispatcher m_frontendAPIDispatcher;
+ RefPtr<WebCore::InspectorFrontendHost> m_frontendHost;
</ins><span class="cx"> RefPtr<IPC::Connection> m_backendConnection;
</span><del>- uint64_t m_inspectedPageIdentifier;
</del><span class="cx">
</span><del>- bool m_underTest;
- bool m_frontendLoaded;
- Deque<String> m_queue;
</del><ins>+ uint64_t m_inspectedPageIdentifier { 0 };
+ bool m_underTest { false };
+ DockSide m_dockSide { DockSide::Undocked };
</ins><span class="cx">
</span><del>- RefPtr<WebCore::InspectorFrontendHost> m_frontendHost;
-
- DockSide m_dockSide;
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> mutable String m_localizedStringsURL;
</span><del>- mutable bool m_hasLocalizedStringsURL;
</del><ins>+ mutable bool m_hasLocalizedStringsURL { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>