Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (91249 => 91250)
--- trunk/Source/WebCore/CMakeLists.txt 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-07-19 13:02:19 UTC (rev 91250)
@@ -858,6 +858,7 @@
inspector/ConsoleMessage.cpp
inspector/DOMNodeHighlighter.cpp
inspector/EventsCollector.cpp
+ inspector/IdentifiersFactory.cpp
inspector/InjectedScript.cpp
inspector/InjectedScriptHost.cpp
inspector/InjectedScriptManager.cpp
Modified: trunk/Source/WebCore/ChangeLog (91249 => 91250)
--- trunk/Source/WebCore/ChangeLog 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/ChangeLog 2011-07-19 13:02:19 UTC (rev 91250)
@@ -1,3 +1,28 @@
+2011-07-19 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Rename agentIdentifierPrefix to processId, move out from page agent and make static.
+ https://bugs.webkit.org/show_bug.cgi?id=64729
+
+ Reviewed by Pavel Feldman.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/IdentifiersFactory.cpp: Added.
+ (WebCore::IdentifiersFactory::createIdentifier):
+ * inspector/IdentifiersFactory.h: Added.
+ (WebCore::IdentifiersFactory::setProcessId):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::setProcessId):
+ * inspector/InspectorController.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::frameId):
+ (WebCore::InspectorPageAgent::loaderId):
+ * inspector/InspectorPageAgent.h:
+
2011-07-19 Jeremy Moskovich <[email protected]>
Fix microphone icon placement in speech input control for dir=rtl.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (91249 => 91250)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-07-19 13:02:19 UTC (rev 91250)
@@ -1956,6 +1956,8 @@
Source/WebCore/inspector/DOMNodeHighlighter.h \
Source/WebCore/inspector/EventsCollector.cpp \
Source/WebCore/inspector/EventsCollector.h \
+ Source/WebCore/inspector/IdentifiersFactory.cpp \
+ Source/WebCore/inspector/IdentifiersFactory.h \
Source/WebCore/inspector/InjectedScript.cpp \
Source/WebCore/inspector/InjectedScript.h \
Source/WebCore/inspector/InjectedScriptHost.cpp \
Modified: trunk/Source/WebCore/WebCore.gypi (91249 => 91250)
--- trunk/Source/WebCore/WebCore.gypi 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/WebCore.gypi 2011-07-19 13:02:19 UTC (rev 91250)
@@ -3274,6 +3274,8 @@
'inspector/DOMNodeHighlighter.h',
'inspector/EventsCollector.cpp',
'inspector/EventsCollector.h',
+ 'inspector/IdentifiersFactory.cpp',
+ 'inspector/IdentifiersFactory.h',
'inspector/InjectedScript.cpp',
'inspector/InjectedScript.h',
'inspector/InjectedScriptHost.cpp',
Modified: trunk/Source/WebCore/WebCore.pro (91249 => 91250)
--- trunk/Source/WebCore/WebCore.pro 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/WebCore.pro 2011-07-19 13:02:19 UTC (rev 91250)
@@ -811,6 +811,7 @@
inspector/ConsoleMessage.cpp \
inspector/DOMNodeHighlighter.cpp \
inspector/EventsCollector.cpp \
+ inspector/IdentifiersFactory.cpp \
inspector/InjectedScript.cpp \
inspector/InjectedScriptHost.cpp \
inspector/InjectedScriptManager.cpp \
@@ -1772,6 +1773,7 @@
inspector/ConsoleMessage.h \
inspector/DOMNodeHighlighter.h \
inspector/EventsCollector.h \
+ inspector/IdentifiersFactory.h \
inspector/InjectedScript.h \
inspector/InjectedScriptHost.h \
inspector/InjectedScriptManager.h \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (91249 => 91250)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-19 13:02:19 UTC (rev 91250)
@@ -67982,6 +67982,14 @@
>
</File>
<File
+ RelativePath="..\inspector\IdentifiersFactory.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\inspector\IdentifiersFactory.h"
+ >
+ </File>
+ <File
RelativePath="..\inspector\InspectorResourceAgent.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (91249 => 91250)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-19 13:02:19 UTC (rev 91250)
@@ -1438,6 +1438,8 @@
5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; };
590E1B4911E4EF4B0069F784 /* DeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
590E1B4B11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */; };
+ 5913A24113D49EBA00F5B05C /* IdentifiersFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */; };
+ 5913A24213D49EBA00F5B05C /* IdentifiersFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */; };
59309A1111F4AE5800250603 /* DeviceOrientationClientMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */; };
59309A1311F4AE6A00250603 /* DeviceOrientationClientMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
593D3EAF1325328C0057E7EE /* JavaMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 593D3EAE1325328C0057E7EE /* JavaMethod.h */; };
@@ -7980,6 +7982,8 @@
5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; };
590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientation.h; sourceTree = "<group>"; };
590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeviceOrientationEventCustom.cpp; sourceTree = "<group>"; };
+ 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IdentifiersFactory.cpp; sourceTree = "<group>"; };
+ 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentifiersFactory.h; sourceTree = "<group>"; };
59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeviceOrientationClientMock.cpp; path = mock/DeviceOrientationClientMock.cpp; sourceTree = "<group>"; };
59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeviceOrientationClientMock.h; path = mock/DeviceOrientationClientMock.h; sourceTree = "<group>"; };
593AB6971355CD9200FC8211 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = "<group>"; };
@@ -13375,6 +13379,8 @@
4F1442271339FD6200E0D6F8 /* DOMNodeHighlighter.h */,
22777B48134A018C008EA455 /* EventsCollector.cpp */,
22777B49134A018C008EA455 /* EventsCollector.h */,
+ 5913A23F13D49EBA00F5B05C /* IdentifiersFactory.cpp */,
+ 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */,
F3644AFD1119805900E0D537 /* InjectedScript.cpp */,
F3644AFE1119805900E0D537 /* InjectedScript.h */,
7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,
@@ -23104,6 +23110,7 @@
FD537353137B651800008DCE /* ZeroPole.h in Headers */,
4945BFD413CF809000CC3B38 /* TransformState.h in Headers */,
4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */,
+ 5913A24213D49EBA00F5B05C /* IdentifiersFactory.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -25875,6 +25882,7 @@
FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
4945BFD313CF809000CC3B38 /* TransformState.cpp in Sources */,
4969B0F213D0B33F00DF3521 /* HitTestingTransformState.cpp in Sources */,
+ 5913A24113D49EBA00F5B05C /* IdentifiersFactory.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/Source/WebCore/inspector/IdentifiersFactory.cpp (0 => 91250)
--- trunk/Source/WebCore/inspector/IdentifiersFactory.cpp (rev 0)
+++ trunk/Source/WebCore/inspector/IdentifiersFactory.cpp 2011-07-19 13:02:19 UTC (rev 91250)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 Google 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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 "IdentifiersFactory.h"
+
+#if ENABLE(INSPECTOR)
+
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+namespace {
+static long s_lastUsedIdentifier = 0;
+}
+
+// static
+long IdentifiersFactory::s_processId;
+
+// static
+String IdentifiersFactory::createIdentifier()
+{
+ StringBuilder builder;
+ builder.append(String::number(s_processId));
+ builder.append(".");
+ builder.append(String::number(++s_lastUsedIdentifier));
+ return builder.toString();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
Property changes on: trunk/Source/WebCore/inspector/IdentifiersFactory.cpp
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebCore/inspector/IdentifiersFactory.h (0 => 91250)
--- trunk/Source/WebCore/inspector/IdentifiersFactory.h (rev 0)
+++ trunk/Source/WebCore/inspector/IdentifiersFactory.h 2011-07-19 13:02:19 UTC (rev 91250)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 Google 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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 IdentifiersFactory_h
+#define IdentifiersFactory_h
+
+#include <wtf/text/WTFString.h>
+
+#if ENABLE(INSPECTOR)
+
+namespace WebCore {
+
+class IdentifiersFactory {
+public:
+ static void setProcessId(long processId) { s_processId = processId; }
+ static String createIdentifier();
+private:
+ static long s_processId;
+};
+
+} // namespace WebCore
+
+#endif // !defined(IdentifiersFactory_h)
+
+#endif // ENABLE(INSPECTOR)
Property changes on: trunk/Source/WebCore/inspector/IdentifiersFactory.h
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (91249 => 91250)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2011-07-19 13:02:19 UTC (rev 91250)
@@ -35,6 +35,7 @@
#include "Frame.h"
#include "GraphicsContext.h"
+#include "IdentifiersFactory.h"
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
#include "InspectorAgent.h"
@@ -354,9 +355,9 @@
m_inspectorAgent->restore();
}
-void InspectorController::setAgentIdentifierPrefix(const String& prefix)
+void InspectorController::setProcessId(long processId)
{
- m_pageAgent->setAgentIdentifierPrefix(prefix);
+ IdentifiersFactory::setProcessId(processId);
}
void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
Modified: trunk/Source/WebCore/inspector/InspectorController.h (91249 => 91250)
--- trunk/Source/WebCore/inspector/InspectorController.h 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2011-07-19 13:02:19 UTC (rev 91250)
@@ -93,7 +93,7 @@
void connectFrontend();
void disconnectFrontend();
void restoreInspectorStateFromCookie(const String& inspectorCookie);
- void setAgentIdentifierPrefix(const String&);
+ void setProcessId(long);
void showConsole();
void inspect(Node*);
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (91249 => 91250)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-07-19 13:02:19 UTC (rev 91250)
@@ -47,6 +47,7 @@
#include "FrameLoadRequest.h"
#include "HTMLFrameOwnerElement.h"
#include "HTMLNames.h"
+#include "IdentifiersFactory.h"
#include "InjectedScriptManager.h"
#include "InspectorFrontend.h"
#include "InspectorValues.h"
@@ -69,7 +70,6 @@
namespace {
// This should be kept the same as the one in front-end/utilities.js
static const char regexSpecialCharacters[] = "[](){}+-*.,?\\^$|";
-static unsigned int s_lastUsedIdentifier = 0;
}
static bool decodeSharedBuffer(PassRefPtr<SharedBuffer> buffer, const String& textEncodingName, String* result)
@@ -282,11 +282,6 @@
m_frontend = 0;
}
-void InspectorPageAgent::setAgentIdentifierPrefix(const String& prefix)
-{
- m_agentIdentifierPrefix = prefix.isEmpty() ? String("") : prefix + ".";
-}
-
void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString*, const String& source)
{
m_scriptsToEvaluateOnLoad.append(source);
@@ -558,11 +553,6 @@
return m_page->mainFrame();
}
-String InspectorPageAgent::createIdentifier()
-{
- return m_agentIdentifierPrefix + String::number(++s_lastUsedIdentifier);
-}
-
Frame* InspectorPageAgent::frameForId(const String& frameId)
{
return frameId.isEmpty() ? 0 : m_identifierToFrame.get(frameId);
@@ -574,7 +564,7 @@
return "";
String identifier = m_frameToIdentifier.get(frame);
if (identifier.isNull()) {
- identifier = createIdentifier();
+ identifier = IdentifiersFactory::createIdentifier();
m_frameToIdentifier.set(frame, identifier);
m_identifierToFrame.set(identifier, frame);
}
@@ -587,7 +577,7 @@
return "";
String identifier = m_loaderToIdentifier.get(loader);
if (identifier.isNull()) {
- identifier = createIdentifier();
+ identifier = IdentifiersFactory::createIdentifier();
m_loaderToIdentifier.set(loader, identifier);
}
return identifier;
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (91249 => 91250)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2011-07-19 13:02:19 UTC (rev 91250)
@@ -108,7 +108,6 @@
// Inspector Controller API
void setFrontend(InspectorFrontend*);
void clearFrontend();
- void setAgentIdentifierPrefix(const String&);
// Cross-agents API
Frame* mainFrame();
@@ -119,8 +118,6 @@
private:
InspectorPageAgent(InstrumentingAgents*, Page*, InjectedScriptManager*);
- String createIdentifier();
-
PassRefPtr<InspectorObject> buildObjectForFrame(Frame*);
PassRefPtr<InspectorObject> buildObjectForFrameTree(Frame*);
@@ -128,7 +125,6 @@
Page* m_page;
InjectedScriptManager* m_injectedScriptManager;
InspectorFrontend::Page* m_frontend;
- String m_agentIdentifierPrefix;
Vector<String> m_scriptsToEvaluateOnLoad;
HashMap<Frame*, String> m_frameToIdentifier;
HashMap<String, Frame*> m_identifierToFrame;
Modified: trunk/Source/WebKit/chromium/ChangeLog (91249 => 91250)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-19 13:02:19 UTC (rev 91250)
@@ -1,3 +1,16 @@
+2011-07-19 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Rename agentIdentifierPrefix to processId, move out from page agent and make static.
+ https://bugs.webkit.org/show_bug.cgi?id=64729
+
+ Reviewed by Pavel Feldman.
+
+ * public/WebDevToolsAgent.h:
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::setAgentIdentifierPrefix):
+ (WebKit::WebDevToolsAgentImpl::setProcessId):
+ * src/WebDevToolsAgentImpl.h:
+
2011-07-18 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h (91249 => 91250)
--- trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h 2011-07-19 13:02:19 UTC (rev 91250)
@@ -59,7 +59,9 @@
virtual void inspectElementAt(const WebPoint&) = 0;
virtual void setRuntimeProperty(const WebString& name, const WebString& value) = 0;
+ // FIXME: remove once renamed to setProcessId downstream.
virtual void setAgentIdentifierPrefix(const WebString&) = 0;
+ virtual void setProcessId(long) = 0;
// Exposed for LayoutTestController.
virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (91249 => 91250)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-07-19 13:02:19 UTC (rev 91250)
@@ -316,11 +316,16 @@
m_client->clearBrowserCookies();
}
+// FIXME: remove once renamed to setProcessId downstream.
void WebDevToolsAgentImpl::setAgentIdentifierPrefix(const WebString& prefix)
{
- inspectorController()->setAgentIdentifierPrefix(prefix);
}
+void WebDevToolsAgentImpl::setProcessId(long processId)
+{
+ inspectorController()->setProcessId(processId);
+}
+
void WebDevToolsAgentImpl::evaluateInWebInspector(long callId, const WebString& script)
{
InspectorController* ic = inspectorController();
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h (91249 => 91250)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2011-07-19 12:22:20 UTC (rev 91249)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2011-07-19 13:02:19 UTC (rev 91250)
@@ -81,7 +81,9 @@
virtual void evaluateInWebInspector(long callId, const WebString& script);
virtual void setJavaScriptProfilingEnabled(bool);
virtual void setRuntimeProperty(const WebString& name, const WebString& value);
+ // FIXME: remove once renamed to setProcessId downstream.
virtual void setAgentIdentifierPrefix(const WebString&);
+ virtual void setProcessId(long);
// InspectorClient implementation.
virtual void inspectorDestroyed();
