[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
podivilov at chromium.org
podivilov at chromium.org
Wed Dec 22 14:26:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c5dc5a724c72b7560618e03301b61696c593ea72
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 16:39:57 2010 +0000
2010-10-08 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: save InspectorController in instrumentation cookie
https://bugs.webkit.org/show_bug.cgi?id=47406
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::evaluate):
(WebCore::V8Proxy::callFunction):
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* dom/Node.cpp:
(WebCore::Node::dispatchGenericEvent):
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::pumpTokenizer):
* inspector/InspectorInstrumentation.cpp:
* inspector/InspectorInstrumentation.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::didReceiveResponse):
(WebCore::ResourceLoader::didReceiveData):
* page/DOMTimer.cpp:
(WebCore::DOMTimer::fired):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::dispatchEvent):
* page/FrameView.cpp:
(WebCore::FrameView::layout):
(WebCore::FrameView::paintContents):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintContents):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::callReadyStateChangeListener):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69406 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1ea8860..4a6ee88 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2010-10-08 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: save InspectorController in instrumentation cookie
+ https://bugs.webkit.org/show_bug.cgi?id=47406
+
+ * bindings/v8/V8Proxy.cpp:
+ (WebCore::V8Proxy::evaluate):
+ (WebCore::V8Proxy::callFunction):
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ * dom/Node.cpp:
+ (WebCore::Node::dispatchGenericEvent):
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::pumpTokenizer):
+ * inspector/InspectorInstrumentation.cpp:
+ * inspector/InspectorInstrumentation.h:
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::didReceiveResponse):
+ (WebCore::ResourceLoader::didReceiveData):
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::fired):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::dispatchEvent):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::paintContents):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintContents):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::callReadyStateChangeListener):
+
2010-10-08 Adam Roben <aroben at apple.com>
Windows Release build fix for 32-bit systems
diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp
index 12c0c07..97f2310 100644
--- a/WebCore/bindings/js/ScriptController.cpp
+++ b/WebCore/bindings/js/ScriptController.cpp
@@ -148,7 +148,7 @@ ScriptValue ScriptController::evaluateInWorld(const ScriptSourceCode& sourceCode
Completion comp = JSMainThreadExecState::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), jsSourceCode, shell);
exec->globalData().timeoutChecker.stop();
- InspectorInstrumentation::didEvaluateScript(m_frame, cookie);
+ InspectorInstrumentation::didEvaluateScript(cookie);
// Evaluating the JavaScript could cause the frame to be deallocated
// so we start the keep alive timer here.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index ef72b77..67218c6 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -411,7 +411,7 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
PlatformBridge::traceEventEnd("v8.run", node, "");
#endif
- InspectorInstrumentation::didEvaluateScript(m_frame, cookie);
+ InspectorInstrumentation::didEvaluateScript(cookie);
return result;
}
@@ -499,7 +499,7 @@ v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8
// execution finishs before firing the timer.
m_frame->keepAlive();
- InspectorInstrumentationCookie cookie = 0;
+ InspectorInstrumentationCookie cookie;
if (InspectorInstrumentation::hasFrontends()) {
v8::ScriptOrigin origin = function->GetScriptOrigin();
String resourceName("undefined");
@@ -515,7 +515,7 @@ v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8
result = function->Call(receiver, argc, args);
m_recursion--;
- InspectorInstrumentation::didCallFunction(m_frame, cookie);
+ InspectorInstrumentation::didCallFunction(cookie);
}
// Release the storage mutex if applicable.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index c311ca2..91be282 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -1515,7 +1515,7 @@ bail_out:
implicitClose();
}
- InspectorInstrumentation::didRecalculateStyle(this, cookie);
+ InspectorInstrumentation::didRecalculateStyle(cookie);
}
void Document::updateStyleIfNeeded()
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index e95f620..f54fec7 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -2685,7 +2685,7 @@ doneDispatching:
doneWithDefault:
- InspectorInstrumentation::didDispatchEvent(document(), cookie);
+ InspectorInstrumentation::didDispatchEvent(cookie);
return !event->defaultPrevented();
}
diff --git a/WebCore/html/parser/HTMLDocumentParser.cpp b/WebCore/html/parser/HTMLDocumentParser.cpp
index d668d5e..94cc2aa 100644
--- a/WebCore/html/parser/HTMLDocumentParser.cpp
+++ b/WebCore/html/parser/HTMLDocumentParser.cpp
@@ -256,7 +256,7 @@ void HTMLDocumentParser::pumpTokenizer(SynchronousMode mode)
m_preloadScanner->scan();
}
- InspectorInstrumentation::didWriteHTML(document(), m_tokenizer->lineNumber(), cookie);
+ InspectorInstrumentation::didWriteHTML(cookie, m_tokenizer->lineNumber());
}
bool HTMLDocumentParser::hasInsertionPoint()
diff --git a/WebCore/inspector/InspectorInstrumentation.cpp b/WebCore/inspector/InspectorInstrumentation.cpp
index 752f1ed..4efceee 100644
--- a/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/WebCore/inspector/InspectorInstrumentation.cpp
@@ -172,32 +172,35 @@ void InspectorInstrumentation::didRemoveTimerImpl(InspectorController* inspector
InspectorInstrumentationCookie InspectorInstrumentation::willCallFunctionImpl(InspectorController* inspectorController, const String& scriptName, int scriptLine)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willCallFunction(scriptName, scriptLine);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didCallFunctionImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didCallFunctionImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didCallFunction();
}
InspectorInstrumentationCookie InspectorInstrumentation::willChangeXHRReadyStateImpl(InspectorController* inspectorController, XMLHttpRequest* request)
{
+ int timelineAgentId = 0;
InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
if (timelineAgent && request->hasEventListeners(eventNames().readystatechangeEvent)) {
timelineAgent->willChangeXHRReadyState(request->url().string(), request->readyState());
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didChangeXHRReadyStateImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didChangeXHRReadyStateImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didChangeXHRReadyState();
}
@@ -216,178 +219,196 @@ InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventImpl(I
}
#endif
+ int timelineAgentId = 0;
InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
if (timelineAgent && eventHasListeners(event.type(), window, node, ancestors)) {
timelineAgent->willDispatchEvent(event);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didDispatchEventImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didDispatchEventImpl(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (InspectorDebuggerAgent* debuggerAgent = inspectorController->m_debuggerAgent.get())
+ if (InspectorDebuggerAgent* debuggerAgent = cookie.first->m_debuggerAgent.get())
debuggerAgent->cancelPauseOnNextStatement();
#endif
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didDispatchEvent();
}
InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventOnWindowImpl(InspectorController* inspectorController, const Event& event, DOMWindow* window)
{
+ int timelineAgentId = 0;
InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
if (timelineAgent && window->hasEventListeners(event.type())) {
timelineAgent->willDispatchEvent(event);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didDispatchEventOnWindowImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didDispatchEvent();
}
InspectorInstrumentationCookie InspectorInstrumentation::willEvaluateScriptImpl(InspectorController* inspectorController, const String& url, int lineNumber)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willEvaluateScript(url, lineNumber);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didEvaluateScriptImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didEvaluateScriptImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didEvaluateScript();
}
InspectorInstrumentationCookie InspectorInstrumentation::willFireTimerImpl(InspectorController* inspectorController, int timerId)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willFireTimer(timerId);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didFireTimerImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didFireTimerImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didFireTimer();
}
InspectorInstrumentationCookie InspectorInstrumentation::willLayoutImpl(InspectorController* inspectorController)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willLayout();
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didLayoutImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didLayoutImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didLayout();
}
InspectorInstrumentationCookie InspectorInstrumentation::willLoadXHRImpl(InspectorController* inspectorController, XMLHttpRequest* request)
{
+ int timelineAgentId = 0;
InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
if (timelineAgent && request->hasEventListeners(eventNames().loadEvent)) {
- timelineAgent->willLoadXHR(request->url().string());
- return timelineAgent->id();
+ timelineAgent->willLoadXHR(request->url());
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didLoadXHRImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didLoadXHRImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didLoadXHR();
}
InspectorInstrumentationCookie InspectorInstrumentation::willPaintImpl(InspectorController* inspectorController, const IntRect& rect)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willPaint(rect);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didPaintImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didPaintImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didPaint();
}
InspectorInstrumentationCookie InspectorInstrumentation::willRecalculateStyleImpl(InspectorController* inspectorController)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willRecalculateStyle();
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didRecalculateStyleImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didRecalculateStyleImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didRecalculateStyle();
}
InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceDataImpl(InspectorController* inspectorController, unsigned long identifier)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willReceiveResourceData(identifier);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didReceiveResourceDataImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didReceiveResourceDataImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didReceiveResourceData();
}
InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponseImpl(InspectorController* inspectorController, unsigned long identifier, const ResourceResponse& response)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willReceiveResourceResponse(identifier, response);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didReceiveResourceResponseImpl(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didReceiveResourceResponseImpl(const InspectorInstrumentationCookie& cookie)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didReceiveResourceResponse();
}
InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(InspectorController* inspectorController, unsigned int length, unsigned int startLine)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController)) {
+ int timelineAgentId = 0;
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
+ if (timelineAgent) {
timelineAgent->willWriteHTML(length, startLine);
- return timelineAgent->id();
+ timelineAgentId = timelineAgent->id();
}
- return 0;
+ return InspectorInstrumentationCookie(inspectorController, timelineAgentId);
}
-void InspectorInstrumentation::didWriteHTMLImpl(InspectorController* inspectorController, unsigned int endLine, InspectorInstrumentationCookie cookie)
+void InspectorInstrumentation::didWriteHTMLImpl(const InspectorInstrumentationCookie& cookie, unsigned int endLine)
{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController, cookie))
+ if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
timelineAgent->didWriteHTML(endLine);
}
-
bool InspectorInstrumentation::hasFrontend(InspectorController* inspectorController)
{
return inspectorController->hasFrontend();
@@ -398,10 +419,10 @@ InspectorTimelineAgent* InspectorInstrumentation::retrieveTimelineAgent(Inspecto
return inspectorController->m_timelineAgent.get();
}
-InspectorTimelineAgent* InspectorInstrumentation::retrieveTimelineAgent(InspectorController* inspectorController, InspectorInstrumentationCookie cookie)
+InspectorTimelineAgent* InspectorInstrumentation::retrieveTimelineAgent(const InspectorInstrumentationCookie& cookie)
{
- InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorController);
- if (timelineAgent && timelineAgent->id() == cookie)
+ InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie.first);
+ if (timelineAgent && timelineAgent->id() == cookie.second)
return timelineAgent;
return 0;
}
diff --git a/WebCore/inspector/InspectorInstrumentation.h b/WebCore/inspector/InspectorInstrumentation.h
index 072101f..7d5a527 100644
--- a/WebCore/inspector/InspectorInstrumentation.h
+++ b/WebCore/inspector/InspectorInstrumentation.h
@@ -47,7 +47,7 @@ class ResourceRequest;
class ResourceResponse;
class XMLHttpRequest;
-typedef int InspectorInstrumentationCookie;
+typedef pair<InspectorController*, int> InspectorInstrumentationCookie;
class InspectorInstrumentation {
public:
@@ -64,31 +64,31 @@ public:
static void didRemoveTimer(ScriptExecutionContext*, int timerId);
static InspectorInstrumentationCookie willCallFunction(Frame*, const String& scriptName, int scriptLine);
- static void didCallFunction(Frame*, InspectorInstrumentationCookie cookie);
+ static void didCallFunction(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willChangeXHRReadyState(ScriptExecutionContext*, XMLHttpRequest* request);
- static void didChangeXHRReadyState(ScriptExecutionContext*, InspectorInstrumentationCookie cookie);
+ static void didChangeXHRReadyState(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willDispatchEvent(Document*, const Event& event, DOMWindow* window, Node* node, const Vector<RefPtr<ContainerNode> >& ancestors);
- static void didDispatchEvent(Document*, InspectorInstrumentationCookie cookie);
+ static void didDispatchEvent(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willDispatchEventOnWindow(Frame*, const Event& event, DOMWindow* window);
- static void didDispatchEventOnWindow(Frame*, InspectorInstrumentationCookie cookie);
+ static void didDispatchEventOnWindow(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willEvaluateScript(Frame*, const String& url, int lineNumber);
- static void didEvaluateScript(Frame*, InspectorInstrumentationCookie cookie);
+ static void didEvaluateScript(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext*, int timerId);
- static void didFireTimer(ScriptExecutionContext*, InspectorInstrumentationCookie cookie);
+ static void didFireTimer(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLayout(Frame*);
- static void didLayout(Frame*, InspectorInstrumentationCookie cookie);
- static InspectorInstrumentationCookie willLoadXHR(ScriptExecutionContext*, XMLHttpRequest* request);
- static void didLoadXHR(ScriptExecutionContext*, InspectorInstrumentationCookie cookie);
+ static void didLayout(const InspectorInstrumentationCookie&);
+ static InspectorInstrumentationCookie willLoadXHR(ScriptExecutionContext*, XMLHttpRequest*);
+ static void didLoadXHR(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willPaint(Frame*, const IntRect& rect);
- static void didPaint(Frame*, InspectorInstrumentationCookie cookie);
+ static void didPaint(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willRecalculateStyle(Document*);
- static void didRecalculateStyle(Document*, InspectorInstrumentationCookie cookie);
+ static void didRecalculateStyle(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willReceiveResourceData(Frame*, unsigned long identifier);
- static void didReceiveResourceData(Frame*, InspectorInstrumentationCookie cookie);
+ static void didReceiveResourceData(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willReceiveResourceResponse(Frame*, unsigned long identifier, const ResourceResponse& response);
- static void didReceiveResourceResponse(Frame*, InspectorInstrumentationCookie cookie);
+ static void didReceiveResourceResponse(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine);
- static void didWriteHTML(Document*, unsigned int endLine, InspectorInstrumentationCookie cookie);
+ static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned int endLine);
#if ENABLE(INSPECTOR)
static void frontendCreated() { s_frontendCounter += 1; }
@@ -114,31 +114,31 @@ private:
static void didRemoveTimerImpl(InspectorController*, int timerId);
static InspectorInstrumentationCookie willCallFunctionImpl(InspectorController*, const String& scriptName, int scriptLine);
- static void didCallFunctionImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didCallFunctionImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willChangeXHRReadyStateImpl(InspectorController*, XMLHttpRequest* request);
- static void didChangeXHRReadyStateImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didChangeXHRReadyStateImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willDispatchEventImpl(InspectorController*, const Event& event, DOMWindow* window, Node* node, const Vector<RefPtr<ContainerNode> >& ancestors);
- static void didDispatchEventImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didDispatchEventImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willDispatchEventOnWindowImpl(InspectorController*, const Event& event, DOMWindow* window);
- static void didDispatchEventOnWindowImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willEvaluateScriptImpl(InspectorController*, const String& url, int lineNumber);
- static void didEvaluateScriptImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didEvaluateScriptImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willFireTimerImpl(InspectorController*, int timerId);
- static void didFireTimerImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didFireTimerImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLayoutImpl(InspectorController*);
- static void didLayoutImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didLayoutImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLoadXHRImpl(InspectorController*, XMLHttpRequest* request);
- static void didLoadXHRImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didLoadXHRImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willPaintImpl(InspectorController*, const IntRect& rect);
- static void didPaintImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didPaintImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willRecalculateStyleImpl(InspectorController*);
- static void didRecalculateStyleImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didRecalculateStyleImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willReceiveResourceDataImpl(InspectorController*, unsigned long identifier);
- static void didReceiveResourceDataImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didReceiveResourceDataImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willReceiveResourceResponseImpl(InspectorController*, unsigned long identifier, const ResourceResponse& response);
- static void didReceiveResourceResponseImpl(InspectorController*, InspectorInstrumentationCookie);
+ static void didReceiveResourceResponseImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willWriteHTMLImpl(InspectorController*, unsigned int length, unsigned int startLine);
- static void didWriteHTMLImpl(InspectorController*, unsigned int endLine, InspectorInstrumentationCookie);
+ static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned int endLine);
static InspectorController* inspectorControllerForContext(ScriptExecutionContext*);
static InspectorController* inspectorControllerForDocument(Document*);
@@ -147,7 +147,7 @@ private:
static bool hasFrontend(InspectorController*);
static InspectorTimelineAgent* retrieveTimelineAgent(InspectorController*);
- static InspectorTimelineAgent* retrieveTimelineAgent(InspectorController*, InspectorInstrumentationCookie);
+ static InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
static int s_frontendCounter;
#endif
@@ -243,14 +243,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willCallFunction
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willCallFunctionImpl(inspectorController, scriptName, scriptLine);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didCallFunction(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didCallFunction(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didCallFunctionImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didCallFunctionImpl(cookie);
#endif
}
@@ -260,14 +260,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willChangeXHRRea
if (InspectorController* inspectorController = inspectorControllerForContext(context))
return willChangeXHRReadyStateImpl(inspectorController, request);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didChangeXHRReadyState(ScriptExecutionContext* context, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didChangeXHRReadyState(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForContext(context))
- didChangeXHRReadyStateImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didChangeXHRReadyStateImpl(cookie);
#endif
}
@@ -277,14 +277,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEven
if (InspectorController* inspectorController = inspectorControllerForDocument(document))
return willDispatchEventImpl(inspectorController, event, window, node, ancestors);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didDispatchEvent(Document* document, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didDispatchEvent(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForDocument(document))
- didDispatchEventImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didDispatchEventImpl(cookie);
#endif
}
@@ -294,14 +294,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEven
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willDispatchEventOnWindowImpl(inspectorController, event, window);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didDispatchEventOnWindow(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didDispatchEventOnWindow(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didDispatchEventOnWindowImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didDispatchEventOnWindowImpl(cookie);
#endif
}
@@ -311,14 +311,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willEvaluateScri
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willEvaluateScriptImpl(inspectorController, url, lineNumber);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didEvaluateScript(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didEvaluateScript(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didEvaluateScriptImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didEvaluateScriptImpl(cookie);
#endif
}
@@ -328,14 +328,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willFireTimer(Sc
if (InspectorController* inspectorController = inspectorControllerForContext(context))
return willFireTimerImpl(inspectorController, timerId);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didFireTimer(ScriptExecutionContext* context, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didFireTimer(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForContext(context))
- didFireTimerImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didFireTimerImpl(cookie);
#endif
}
@@ -345,14 +345,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willLayout(Frame
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willLayoutImpl(inspectorController);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didLayout(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didLayout(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didLayoutImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didLayoutImpl(cookie);
#endif
}
@@ -362,14 +362,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willLoadXHR(Scri
if (InspectorController* inspectorController = inspectorControllerForContext(context))
return willLoadXHRImpl(inspectorController, request);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didLoadXHR(ScriptExecutionContext* context, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didLoadXHR(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForContext(context))
- didLoadXHRImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didLoadXHRImpl(cookie);
#endif
}
@@ -379,14 +379,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willPaint(Frame*
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willPaintImpl(inspectorController, rect);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didPaint(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didPaint(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didPaintImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didPaintImpl(cookie);
#endif
}
@@ -396,14 +396,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willRecalculateS
if (InspectorController* inspectorController = inspectorControllerForDocument(document))
return willRecalculateStyleImpl(inspectorController);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didRecalculateStyle(Document* document, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didRecalculateStyle(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForDocument(document))
- didRecalculateStyleImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didRecalculateStyleImpl(cookie);
#endif
}
@@ -413,14 +413,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResou
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willReceiveResourceDataImpl(inspectorController, identifier);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didReceiveResourceData(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didReceiveResourceData(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didReceiveResourceDataImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didReceiveResourceDataImpl(cookie);
#endif
}
@@ -430,14 +430,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResou
if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
return willReceiveResourceResponseImpl(inspectorController, identifier, response);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didReceiveResourceResponse(Frame* frame, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didReceiveResourceResponse(const InspectorInstrumentationCookie& cookie)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
- didReceiveResourceResponseImpl(inspectorController, cookie);
+ if (hasFrontends() && cookie.first)
+ didReceiveResourceResponseImpl(cookie);
#endif
}
@@ -447,14 +447,14 @@ inline InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTML(Do
if (InspectorController* inspectorController = inspectorControllerForDocument(document))
return willWriteHTMLImpl(inspectorController, length, startLine);
#endif
- return 0;
+ return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didWriteHTML(Document* document, unsigned int endLine, InspectorInstrumentationCookie cookie)
+inline void InspectorInstrumentation::didWriteHTML(const InspectorInstrumentationCookie& cookie, unsigned int endLine)
{
#if ENABLE(INSPECTOR)
- if (InspectorController* inspectorController = inspectorControllerForDocument(document))
- didWriteHTMLImpl(inspectorController, endLine, cookie);
+ if (hasFrontends() && cookie.first)
+ didWriteHTMLImpl(cookie, endLine);
#endif
}
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index 5496d9e..3764798 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -400,20 +400,20 @@ void ResourceLoader::didSendData(ResourceHandle*, unsigned long long bytesSent,
void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
{
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_frame.get(), identifier(), response);
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(this, response))
return;
#endif
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_frame.get(), identifier(), response);
didReceiveResponse(response);
- InspectorInstrumentation::didReceiveResourceResponse(m_frame.get(), cookie);
+ InspectorInstrumentation::didReceiveResourceResponse(cookie);
}
void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int lengthReceived)
{
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier());
didReceiveData(data, length, lengthReceived, false);
- InspectorInstrumentation::didReceiveResourceData(m_frame.get(), cookie);
+ InspectorInstrumentation::didReceiveResourceData(cookie);
}
void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
diff --git a/WebCore/page/DOMTimer.cpp b/WebCore/page/DOMTimer.cpp
index 1402dda..57e6512 100644
--- a/WebCore/page/DOMTimer.cpp
+++ b/WebCore/page/DOMTimer.cpp
@@ -117,7 +117,7 @@ void DOMTimer::fired()
// No access to member variables after this point, it can delete the timer.
m_action->execute(context);
- InspectorInstrumentation::didFireTimer(context, cookie);
+ InspectorInstrumentation::didFireTimer(cookie);
return;
}
@@ -130,7 +130,7 @@ void DOMTimer::fired()
action->execute(context);
- InspectorInstrumentation::didFireTimer(context, cookie);
+ InspectorInstrumentation::didFireTimer(cookie);
timerNestingLevel = 0;
}
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index a5dfb4d..408ba6a 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1535,7 +1535,7 @@ bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget
bool result = fireEventListeners(event.get());
- InspectorInstrumentation::didDispatchEventOnWindow(frame(), cookie);
+ InspectorInstrumentation::didDispatchEventOnWindow(cookie);
return result;
}
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 2941f23..09255f1 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -837,7 +837,7 @@ void FrameView::layout(bool allowSubtree)
ASSERT(m_enqueueEvents);
}
- InspectorInstrumentation::didLayout(m_frame.get(), cookie);
+ InspectorInstrumentation::didLayout(cookie);
m_nestedLayoutCount--;
}
@@ -2000,7 +2000,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
if (isTopLevelPainter)
sCurrentPaintTimeStamp = 0;
- InspectorInstrumentation::didPaint(m_frame.get(), cookie);
+ InspectorInstrumentation::didPaint(cookie);
}
void FrameView::setPaintBehavior(PaintBehavior behavior)
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index f21b670..d37c080 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -1082,7 +1082,7 @@ void RenderLayerBacking::paintContents(const GraphicsLayer*, GraphicsContext& co
paintIntoLayer(m_owningLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase, renderer());
- InspectorInstrumentation::didPaint(m_owningLayer->renderer()->frame(), cookie);
+ InspectorInstrumentation::didPaint(cookie);
}
bool RenderLayerBacking::showDebugBorders() const
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index efbe07a..8c82f10 100644
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -308,12 +308,12 @@ void XMLHttpRequest::callReadyStateChangeListener()
if (m_async || (m_state <= OPENED || m_state == DONE))
m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().readystatechangeEvent), m_state == DONE ? FlushProgressEvent : DoNotFlushProgressEvent);
- InspectorInstrumentation::didChangeXHRReadyState(scriptExecutionContext(), cookie);
+ InspectorInstrumentation::didChangeXHRReadyState(cookie);
if (m_state == DONE && !m_error) {
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this);
m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().loadEvent));
- InspectorInstrumentation::didLoadXHR(scriptExecutionContext(), cookie);
+ InspectorInstrumentation::didLoadXHR(cookie);
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list