<!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>[160751] trunk</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/160751">160751</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-17 22:22:58 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
https://bugs.webkit.org/show_bug.cgi?id=125906
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-12-17
Reviewed by Timothy Hatcher.
Source/WebCore:
Remove stale code related to a since removed feature,
Inspector extensions. This allows us to remove a number
of entry points into InspectorAgent.
* inspector/InspectorAgent.cpp:
(WebCore::InspectorAgent::InspectorAgent):
(WebCore::InspectorAgent::willDestroyFrontendAndBackend):
* inspector/InspectorAgent.h:
(WebCore::InspectorAgent::create):
Remove setInjectedScriptForOrigin and InjectedScript management.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorController.h:
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.idl:
Remove the API and calling through InspectorController.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didClearWindowObjectInWorldImpl):
(WebCore::InspectorInstrumentation::domContentLoadedEventFiredImpl):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
Remove now unnecessary calls into InspectorAgent.
LayoutTests:
* http/tests/inspector/injected-script-for-origin-expected.txt: Removed.
* http/tests/inspector/injected-script-for-origin.html: Removed.
* http/tests/inspector/resources/injected-script-for-origin-frame.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgentcpp">trunk/Source/WebCore/inspector/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgenth">trunk/Source/WebCore/inspector/InspectorAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostidl">trunk/Source/WebCore/inspector/InspectorFrontendHost.idl</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsinspectorinjectedscriptfororiginexpectedtxt">trunk/LayoutTests/http/tests/inspector/injected-script-for-origin-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorinjectedscriptfororiginhtml">trunk/LayoutTests/http/tests/inspector/injected-script-for-origin.html</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesinjectedscriptfororiginframehtml">trunk/LayoutTests/http/tests/inspector/resources/injected-script-for-origin-frame.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
+ https://bugs.webkit.org/show_bug.cgi?id=125906
+
+ Reviewed by Timothy Hatcher.
+
+ * http/tests/inspector/injected-script-for-origin-expected.txt: Removed.
+ * http/tests/inspector/injected-script-for-origin.html: Removed.
+ * http/tests/inspector/resources/injected-script-for-origin-frame.html: Removed.
+
</ins><span class="cx"> 2013-12-17 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT setting pseudoID with registered DOMSubtreeModified listener
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorinjectedscriptfororiginexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/inspector/injected-script-for-origin-expected.txt (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/injected-script-for-origin-expected.txt 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/LayoutTests/http/tests/inspector/injected-script-for-origin-expected.txt 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-Tests that different scripts are injected inso subframes of inspector window depending on the origin
-
-{
- 0 : "http://127.0.0.1:8000/inspector/resources/injected-script-for-origin-frame.html, data: 127.0.0.1"
- 1 : "http://localhost:8000/inspector/resources/injected-script-for-origin-frame.html, data: localhost"
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorinjectedscriptfororiginhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/inspector/injected-script-for-origin.html (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/injected-script-for-origin.html 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/LayoutTests/http/tests/inspector/injected-script-for-origin.html 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-<html>
-<head>
-<script src="inspector-test.js"></script>
-
-<script>
-function test()
-{
- var messages = [];
- function onMessage(event)
- {
- messages.push(event.data);
- if (messages.length === 2) {
- top.removeEventListener("message", onMessage, false);
- messages.sort();
- InspectorTest.addObject(messages);
- InspectorTest.completeTest();
- }
- }
- top.addEventListener("message", onMessage, false);
- InspectorFrontendHost.setInjectedScriptForOrigin("http://127.0.0.1:8000", "(function() { window.foo = '127.0.0.1'; return {}})");
- InspectorFrontendHost.setInjectedScriptForOrigin("http://localhost:8000", "(function() { window.foo = 'localhost'; return {}})");
- function addSubframe(url)
- {
- var iframe = document.createElement("iframe");
- iframe.src = url;
- document.body.appendChild(iframe);
- }
- addSubframe("http://127.0.0.1:8000/inspector/resources/injected-script-for-origin-frame.html");
- addSubframe("http://localhost:8000/inspector/resources/injected-script-for-origin-frame.html");
-}
-</script>
-</head>
-<body onload="runTest()">
-<p>
-Tests that different scripts are injected inso subframes of inspector window depending on the origin
-</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesinjectedscriptfororiginframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/inspector/resources/injected-script-for-origin-frame.html (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/injected-script-for-origin-frame.html 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/LayoutTests/http/tests/inspector/resources/injected-script-for-origin-frame.html 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-<html>
-<head>
-<script type="text/javascript">
-top.postMessage(location.href + ", data: " + window.foo, "*");
-</script>
-</head>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2013-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
+ https://bugs.webkit.org/show_bug.cgi?id=125906
+
+ Reviewed by Timothy Hatcher.
+
+ Remove stale code related to a since removed feature,
+ Inspector extensions. This allows us to remove a number
+ of entry points into InspectorAgent.
+
+ * inspector/InspectorAgent.cpp:
+ (WebCore::InspectorAgent::InspectorAgent):
+ (WebCore::InspectorAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorAgent.h:
+ (WebCore::InspectorAgent::create):
+ Remove setInjectedScriptForOrigin and InjectedScript management.
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorController.h:
+ * inspector/InspectorFrontendHost.cpp:
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+ Remove the API and calling through InspectorController.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didClearWindowObjectInWorldImpl):
+ (WebCore::InspectorInstrumentation::domContentLoadedEventFiredImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ Remove now unnecessary calls into InspectorAgent.
+
</ins><span class="cx"> 2013-12-17 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix TimeRanges::intersectWith
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.cpp (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.cpp 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorAgent.cpp 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -34,19 +34,8 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorAgent.h"
</span><span class="cx">
</span><del>-#include "Document.h"
-#include "DocumentLoader.h"
-#include "GraphicsContext.h"
-#include "InjectedScriptHost.h"
-#include "InjectedScriptManager.h"
-#include "InspectorController.h"
-#include "InspectorInstrumentation.h"
</del><span class="cx"> #include "InstrumentingAgents.h"
</span><del>-#include "MainFrame.h"
</del><span class="cx"> #include "Page.h"
</span><del>-#include "ResourceRequest.h"
-#include "ScriptController.h"
-#include "SecurityOrigin.h"
</del><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <inspector/InspectorJSFrontendDispatchers.h>
</span><span class="lines">@@ -58,10 +47,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorAgent::InspectorAgent(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents)
</del><ins>+InspectorAgent::InspectorAgent(Page* page, InstrumentingAgents* instrumentingAgents)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Inspector"), instrumentingAgents)
</span><span class="cx"> , m_inspectedPage(page)
</span><del>- , m_injectedScriptManager(injectedScriptManager)
</del><span class="cx"> , m_enabled(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(page, page);
</span><span class="lines">@@ -73,27 +61,6 @@
</span><span class="cx"> m_instrumentingAgents->setInspectorAgent(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::didClearWindowObjectInWorld(Frame* frame, DOMWrapperWorld& world)
-{
- if (&world != &mainThreadNormalWorld())
- return;
-
- if (m_injectedScriptForOrigin.isEmpty())
- return;
-
- String origin = frame->document()->securityOrigin()->toRawString();
- String script = m_injectedScriptForOrigin.get(origin);
- if (script.isEmpty())
- return;
- int injectedScriptId = m_injectedScriptManager->injectedScriptIdFor(mainWorldExecState(frame));
- StringBuilder scriptSource;
- scriptSource.append(script);
- scriptSource.append("(");
- scriptSource.appendNumber(injectedScriptId);
- scriptSource.append(")");
- frame->script().executeScript(scriptSource.toString());
-}
-
</del><span class="cx"> void InspectorAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</span><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = std::make_unique<InspectorInspectorFrontendDispatcher>(frontendChannel);
</span><span class="lines">@@ -106,16 +73,11 @@
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><span class="cx"> m_pendingEvaluateTestCommands.clear();
</span><del>- m_injectedScriptManager->discardInjectedScripts();
</del><ins>+
</ins><span class="cx"> ErrorString error;
</span><span class="cx"> disable(&error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::didCommitLoad()
-{
- m_injectedScriptManager->discardInjectedScripts();
-}
-
</del><span class="cx"> void InspectorAgent::enable(ErrorString*)
</span><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><span class="lines">@@ -133,11 +95,6 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::domContentLoadedEventFired()
-{
- m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
-}
-
</del><span class="cx"> void InspectorAgent::evaluateForTestInFrontend(long callId, const String& script)
</span><span class="cx"> {
</span><span class="cx"> if (m_enabled && m_frontendDispatcher)
</span><span class="lines">@@ -146,11 +103,6 @@
</span><span class="cx"> m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::setInjectedScriptForOrigin(const String& origin, const String& source)
-{
- m_injectedScriptForOrigin.set(origin, source);
-}
-
</del><span class="cx"> void InspectorAgent::inspect(PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
</span><span class="cx"> {
</span><span class="cx"> if (m_enabled && m_frontendDispatcher) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.h (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.h 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorAgent.h 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class DOMWrapperWorld;
</span><span class="cx"> class DocumentLoader;
</span><span class="cx"> class Frame;
</span><del>-class InjectedScriptManager;
</del><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Page;
</span><span class="cx">
</span><span class="lines">@@ -56,9 +55,9 @@
</span><span class="cx"> class InspectorAgent : public InspectorAgentBase, public Inspector::InspectorInspectorBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorAgent);
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<InspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents)
</del><ins>+ static PassOwnPtr<InspectorAgent> create(Page* page, InstrumentingAgents* instrumentingAgents)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new InspectorAgent(page, injectedScriptManager, instrumentingAgents));
</del><ins>+ return adoptPtr(new InspectorAgent(page, instrumentingAgents));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorAgent();
</span><span class="lines">@@ -72,31 +71,22 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) OVERRIDE;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend() OVERRIDE;
</span><span class="cx">
</span><del>- void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
-
- void didCommitLoad();
- void domContentLoadedEventFired();
-
</del><span class="cx"> bool hasFrontend() const { return !!m_frontendDispatcher; }
</span><span class="cx">
</span><span class="cx"> // Generic code called from custom implementations.
</span><span class="cx"> void evaluateForTestInFrontend(long testCallId, const String& script);
</span><span class="cx">
</span><del>- void setInjectedScriptForOrigin(const String& origin, const String& source);
-
</del><span class="cx"> void inspect(PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<Inspector::InspectorObject> hints);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*);
</del><ins>+ InspectorAgent(Page*, InstrumentingAgents*);
</ins><span class="cx">
</span><span class="cx"> Page* m_inspectedPage;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorInspectorBackendDispatcher> m_backendDispatcher;
</span><del>- InjectedScriptManager* m_injectedScriptManager;
</del><span class="cx">
</span><span class="cx"> Vector<pair<long, String>> m_pendingEvaluateTestCommands;
</span><span class="cx"> pair<RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>, RefPtr<Inspector::InspectorObject>> m_pendingInspectData;
</span><del>- HashMap<String, String> m_injectedScriptForOrigin;
</del><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> , m_hasRemoteFrontend(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(page, m_injectedScriptManager.get(), m_instrumentingAgents.get()));
</del><ins>+ OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(page, m_instrumentingAgents.get()));
</ins><span class="cx"> m_inspectorAgent = inspectorAgentPtr.get();
</span><span class="cx"> m_agents.append(inspectorAgentPtr.release());
</span><span class="cx">
</span><span class="lines">@@ -359,11 +359,6 @@
</span><span class="cx"> return m_page;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::setInjectedScriptForOrigin(const String& origin, const String& source)
-{
- m_inspectorAgent->setInjectedScriptForOrigin(origin, source);
-}
-
</del><span class="cx"> void InspectorController::dispatchMessageFromFrontend(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (m_inspectorBackendDispatcher)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient>);
</span><span class="cx"> bool hasInspectorFrontendClient() const;
</span><span class="cx"> void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
</span><del>- void setInjectedScriptForOrigin(const String& origin, const String& source);
</del><span class="cx">
</span><span class="cx"> void dispatchMessageFromFrontend(const String& message);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><del>-#include "InspectorAgent.h"
-#include "InspectorController.h"
</del><span class="cx"> #include "InspectorFrontendClient.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="lines">@@ -218,12 +216,6 @@
</span><span class="cx"> m_client->moveWindowBy(x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorFrontendHost::setInjectedScriptForOrigin(const String& origin, const String& script)
-{
- ASSERT(m_frontendPage->inspectorController());
- m_frontendPage->inspectorController()->setInjectedScriptForOrigin(origin, script);
-}
-
</del><span class="cx"> String InspectorFrontendHost::localizedStringsURL()
</span><span class="cx"> {
</span><span class="cx"> return m_client ? m_client->localizedStringsURL() : "";
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> void setToolbarHeight(unsigned);
</span><span class="cx">
</span><span class="cx"> void moveWindowBy(float x, float y) const;
</span><del>- void setInjectedScriptForOrigin(const String& origin, const String& script);
</del><span class="cx">
</span><span class="cx"> String localizedStringsURL();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> void setToolbarHeight(float height);
</span><span class="cx">
</span><span class="cx"> void moveWindowBy(float x, float y);
</span><del>- void setInjectedScriptForOrigin(DOMString origin, DOMString script);
</del><span class="cx">
</span><span class="cx"> DOMString localizedStringsURL();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (160750 => 160751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2013-12-18 06:04:51 UTC (rev 160750)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2013-12-18 06:22:58 UTC (rev 160751)
</span><span class="lines">@@ -144,8 +144,6 @@
</span><span class="cx"> InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent();
</span><span class="cx"> if (pageAgent)
</span><span class="cx"> pageAgent->didClearWindowObjectInWorld(frame, world);
</span><del>- if (InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent())
- inspectorAgent->didClearWindowObjectInWorld(frame, world);
</del><span class="cx"> #if ENABLE(JAVASCRIPT_DEBUGGER)
</span><span class="cx"> if (PageDebuggerAgent* debuggerAgent = instrumentingAgents->pageDebuggerAgent()) {
</span><span class="cx"> if (pageAgent && &world == &mainThreadNormalWorld() && frame == pageAgent->mainFrame())
</span><span class="lines">@@ -862,9 +860,6 @@
</span><span class="cx"> if (&frame->page()->mainFrame() != frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent())
- inspectorAgent->domContentLoadedEventFired();
-
</del><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->mainFrameDOMContentLoaded();
</span><span class="cx">
</span><span class="lines">@@ -922,7 +917,6 @@
</span><span class="cx"> if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents->inspectorLayerTreeAgent())
</span><span class="cx"> layerTreeAgent->reset();
</span><span class="cx"> #endif
</span><del>- inspectorAgent->didCommitLoad();
</del><span class="cx"> }
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->didCommitLoad(loader->frame()->document());
</span></span></pre>
</div>
</div>
</body>
</html>