[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 01:15:00 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1ec13575956092e859c11b1f74775224fe6e4c65
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 19 21:49:30 2010 +0000
2010-01-19 Jaime Yap <jaimeyap at google.com>
Reviewed by Pavel Feldman.
Test changes to accomodate refactor of TimelineRecordFactory and InspectorTimelineAgent to
support reporting data when closing a record.
https://bugs.webkit.org/show_bug.cgi?id=33853
* inspector/timeline-layout-expected.txt:
* inspector/timeline-parse-html-expected.txt:
* inspector/timeline-recalculate-styles-expected.txt:
2010-01-19 Jaime Yap <jaimeyap at google.com>
Reviewed by Pavel Feldman.
Refactors the TimelineRecordFactory and InspectorTimelineAgent to support reporting data
when closing a record. Also includes grabbing the start and end line number for parse HTML
records as a reference use case for the above refactor
Tests updated:
inspector/timeline-parse-html-expected.txt
inspector/timeline-layout-expected.txt
inspector/timeline-recalculate-styles-expected.txt
https://bugs.webkit.org/show_bug.cgi?id=33853
* html/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::write):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willDispatchEvent):
(WebCore::InspectorTimelineAgent::willLayout):
(WebCore::InspectorTimelineAgent::willRecalculateStyle):
(WebCore::InspectorTimelineAgent::willPaint):
(WebCore::InspectorTimelineAgent::willWriteHTML):
(WebCore::InspectorTimelineAgent::didWriteHTML):
(WebCore::InspectorTimelineAgent::didInstallTimer):
(WebCore::InspectorTimelineAgent::didRemoveTimer):
(WebCore::InspectorTimelineAgent::willFireTimer):
(WebCore::InspectorTimelineAgent::willChangeXHRReadyState):
(WebCore::InspectorTimelineAgent::willLoadXHR):
(WebCore::InspectorTimelineAgent::willEvaluateScript):
(WebCore::InspectorTimelineAgent::willSendResourceRequest):
(WebCore::InspectorTimelineAgent::didReceiveResourceResponse):
(WebCore::InspectorTimelineAgent::didFinishLoadingResource):
(WebCore::InspectorTimelineAgent::didMarkTimeline):
(WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
(WebCore::InspectorTimelineAgent::pushCurrentRecord):
* inspector/InspectorTimelineAgent.h:
(WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createEventDispatchData):
(WebCore::TimelineRecordFactory::createGenericTimerData):
(WebCore::TimelineRecordFactory::createTimerInstallData):
(WebCore::TimelineRecordFactory::createXHRReadyStateChangeData):
(WebCore::TimelineRecordFactory::createXHRLoadData):
(WebCore::TimelineRecordFactory::createEvaluateScriptData):
(WebCore::TimelineRecordFactory::createMarkTimelineData):
(WebCore::TimelineRecordFactory::createResourceSendRequestData):
(WebCore::TimelineRecordFactory::createResourceReceiveResponseData):
(WebCore::TimelineRecordFactory::createResourceFinishData):
(WebCore::TimelineRecordFactory::createPaintData):
(WebCore::TimelineRecordFactory::createParseHTMLData):
* inspector/TimelineRecordFactory.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53488 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b694cc5..9aee240 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-19 Jaime Yap <jaimeyap at google.com>
+
+ Reviewed by Pavel Feldman.
+
+ Test changes to accomodate refactor of TimelineRecordFactory and InspectorTimelineAgent to
+ support reporting data when closing a record.
+
+ https://bugs.webkit.org/show_bug.cgi?id=33853
+
+ * inspector/timeline-layout-expected.txt:
+ * inspector/timeline-parse-html-expected.txt:
+ * inspector/timeline-recalculate-styles-expected.txt:
+
2010-01-19 Eric Carlson <eric.carlson at apple.com>
Reviewed by Adam Roben.
diff --git a/LayoutTests/inspector/timeline-layout-expected.txt b/LayoutTests/inspector/timeline-layout-expected.txt
index 51c10d7..030ae59 100644
--- a/LayoutTests/inspector/timeline-layout-expected.txt
+++ b/LayoutTests/inspector/timeline-layout-expected.txt
@@ -2,6 +2,8 @@ Tests the Timeline API instrumentation of a Layout event
Layout Properties:
+ startTime : * DEFINED *
++ data : {
++ }
+ children : * DEFINED *
+ endTime : * DEFINED *
+ type : 1
diff --git a/LayoutTests/inspector/timeline-parse-html-expected.txt b/LayoutTests/inspector/timeline-parse-html-expected.txt
index 51700ac..579d3c1 100644
--- a/LayoutTests/inspector/timeline-parse-html-expected.txt
+++ b/LayoutTests/inspector/timeline-parse-html-expected.txt
@@ -4,6 +4,8 @@ ParseHTML Properties:
+ startTime : * DEFINED *
+ data : {
+- length : 9
++- startLine : 0
++- endLine : 0
+ }
+ children : * DEFINED *
+ endTime : * DEFINED *
diff --git a/LayoutTests/inspector/timeline-recalculate-styles-expected.txt b/LayoutTests/inspector/timeline-recalculate-styles-expected.txt
index e532a15..0304d36 100644
--- a/LayoutTests/inspector/timeline-recalculate-styles-expected.txt
+++ b/LayoutTests/inspector/timeline-recalculate-styles-expected.txt
@@ -2,6 +2,8 @@ Tests the Timeline API instrumentation of a style recalculation event
RecalculateStyles Properties:
+ startTime : * DEFINED *
++ data : {
++ }
+ children : * DEFINED *
+ endTime : * DEFINED *
+ type : 2
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4bf3fd0..73bb46f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,56 @@
+2010-01-19 Jaime Yap <jaimeyap at google.com>
+
+ Reviewed by Pavel Feldman.
+
+ Refactors the TimelineRecordFactory and InspectorTimelineAgent to support reporting data
+ when closing a record. Also includes grabbing the start and end line number for parse HTML
+ records as a reference use case for the above refactor
+
+ Tests updated:
+ inspector/timeline-parse-html-expected.txt
+ inspector/timeline-layout-expected.txt
+ inspector/timeline-recalculate-styles-expected.txt
+
+ https://bugs.webkit.org/show_bug.cgi?id=33853
+
+ * html/HTMLTokenizer.cpp:
+ (WebCore::HTMLTokenizer::write):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willDispatchEvent):
+ (WebCore::InspectorTimelineAgent::willLayout):
+ (WebCore::InspectorTimelineAgent::willRecalculateStyle):
+ (WebCore::InspectorTimelineAgent::willPaint):
+ (WebCore::InspectorTimelineAgent::willWriteHTML):
+ (WebCore::InspectorTimelineAgent::didWriteHTML):
+ (WebCore::InspectorTimelineAgent::didInstallTimer):
+ (WebCore::InspectorTimelineAgent::didRemoveTimer):
+ (WebCore::InspectorTimelineAgent::willFireTimer):
+ (WebCore::InspectorTimelineAgent::willChangeXHRReadyState):
+ (WebCore::InspectorTimelineAgent::willLoadXHR):
+ (WebCore::InspectorTimelineAgent::willEvaluateScript):
+ (WebCore::InspectorTimelineAgent::willSendResourceRequest):
+ (WebCore::InspectorTimelineAgent::didReceiveResourceResponse):
+ (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
+ (WebCore::InspectorTimelineAgent::didMarkTimeline):
+ (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+ (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+ * inspector/InspectorTimelineAgent.h:
+ (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createEventDispatchData):
+ (WebCore::TimelineRecordFactory::createGenericTimerData):
+ (WebCore::TimelineRecordFactory::createTimerInstallData):
+ (WebCore::TimelineRecordFactory::createXHRReadyStateChangeData):
+ (WebCore::TimelineRecordFactory::createXHRLoadData):
+ (WebCore::TimelineRecordFactory::createEvaluateScriptData):
+ (WebCore::TimelineRecordFactory::createMarkTimelineData):
+ (WebCore::TimelineRecordFactory::createResourceSendRequestData):
+ (WebCore::TimelineRecordFactory::createResourceReceiveResponseData):
+ (WebCore::TimelineRecordFactory::createResourceFinishData):
+ (WebCore::TimelineRecordFactory::createPaintData):
+ (WebCore::TimelineRecordFactory::createParseHTMLData):
+ * inspector/TimelineRecordFactory.h:
+
2010-01-19 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index 0aa3a35..a8388e8 100644
--- a/WebCore/html/HTMLTokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -1672,7 +1672,7 @@ void HTMLTokenizer::write(const SegmentedString& str, bool appendData)
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent* timelineAgent = m_doc->inspectorTimelineAgent())
- timelineAgent->willWriteHTML(source.length());
+ timelineAgent->willWriteHTML(source.length(), m_lineNumber);
#endif
Frame* frame = m_doc->frame();
@@ -1798,7 +1798,7 @@ void HTMLTokenizer::write(const SegmentedString& str, bool appendData)
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent* timelineAgent = m_doc->inspectorTimelineAgent())
- timelineAgent->didWriteHTML();
+ timelineAgent->didWriteHTML(m_lineNumber);
#endif
m_inWrite = wasInWrite;
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index 89a1349..cbf6ee1 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -56,7 +56,7 @@ InspectorTimelineAgent::~InspectorTimelineAgent()
void InspectorTimelineAgent::willDispatchEvent(const Event& event)
{
- pushCurrentRecord(TimelineRecordFactory::createEventDispatchRecord(m_frontend, currentTimeInMilliseconds(), event),
+ pushCurrentRecord(TimelineRecordFactory::createEventDispatchData(m_frontend, event),
EventDispatchTimelineRecordType);
}
@@ -67,7 +67,7 @@ void InspectorTimelineAgent::didDispatchEvent()
void InspectorTimelineAgent::willLayout()
{
- pushCurrentRecord(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), LayoutTimelineRecordType);
+ pushCurrentRecord(m_frontend->newScriptObject(), LayoutTimelineRecordType);
}
void InspectorTimelineAgent::didLayout()
@@ -77,7 +77,7 @@ void InspectorTimelineAgent::didLayout()
void InspectorTimelineAgent::willRecalculateStyle()
{
- pushCurrentRecord(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), RecalculateStylesTimelineRecordType);
+ pushCurrentRecord(m_frontend->newScriptObject(), RecalculateStylesTimelineRecordType);
}
void InspectorTimelineAgent::didRecalculateStyle()
@@ -87,8 +87,7 @@ void InspectorTimelineAgent::didRecalculateStyle()
void InspectorTimelineAgent::willPaint(const IntRect& rect)
{
- pushCurrentRecord(TimelineRecordFactory::createPaintRecord(m_frontend, currentTimeInMilliseconds(), rect),
- PaintTimelineRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createPaintData(m_frontend, rect), PaintTimelineRecordType);
}
void InspectorTimelineAgent::didPaint()
@@ -96,32 +95,37 @@ void InspectorTimelineAgent::didPaint()
didCompleteCurrentRecord(PaintTimelineRecordType);
}
-void InspectorTimelineAgent::willWriteHTML(unsigned length)
+void InspectorTimelineAgent::willWriteHTML(unsigned int length, unsigned int startLine)
{
- pushCurrentRecord(TimelineRecordFactory::createParseHTMLRecord(m_frontend, currentTimeInMilliseconds(), length), ParseHTMLTimelineRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createParseHTMLData(m_frontend, length, startLine), ParseHTMLTimelineRecordType);
}
-void InspectorTimelineAgent::didWriteHTML()
+void InspectorTimelineAgent::didWriteHTML(unsigned int endLine)
{
- didCompleteCurrentRecord(ParseHTMLTimelineRecordType);
+ if (!m_recordStack.isEmpty()) {
+ TimelineRecordEntry entry = m_recordStack.last();
+ entry.data.set("endLine", endLine);
+ didCompleteCurrentRecord(ParseHTMLTimelineRecordType);
+ }
}
void InspectorTimelineAgent::didInstallTimer(int timerId, int timeout, bool singleShot)
{
- addRecordToTimeline(TimelineRecordFactory::createTimerInstallRecord(m_frontend, currentTimeInMilliseconds(), timerId,
- timeout, singleShot), TimerInstallTimelineRecordType);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createTimerInstallData(m_frontend, timerId, timeout, singleShot));
+ addRecordToTimeline(record, TimerInstallTimelineRecordType);
}
void InspectorTimelineAgent::didRemoveTimer(int timerId)
{
- addRecordToTimeline(TimelineRecordFactory::createGenericTimerRecord(m_frontend, currentTimeInMilliseconds(), timerId),
- TimerRemoveTimelineRecordType);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createGenericTimerData(m_frontend, timerId));
+ addRecordToTimeline(record, TimerRemoveTimelineRecordType);
}
void InspectorTimelineAgent::willFireTimer(int timerId)
{
- pushCurrentRecord(TimelineRecordFactory::createGenericTimerRecord(m_frontend, currentTimeInMilliseconds(), timerId),
- TimerFireTimelineRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createGenericTimerData(m_frontend, timerId), TimerFireTimelineRecordType);
}
void InspectorTimelineAgent::didFireTimer()
@@ -131,8 +135,7 @@ void InspectorTimelineAgent::didFireTimer()
void InspectorTimelineAgent::willChangeXHRReadyState(const String& url, int readyState)
{
- pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeRecord(m_frontend, currentTimeInMilliseconds(), url, readyState),
- XHRReadyStateChangeRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeData(m_frontend, url, readyState), XHRReadyStateChangeRecordType);
}
void InspectorTimelineAgent::didChangeXHRReadyState()
@@ -142,7 +145,7 @@ void InspectorTimelineAgent::didChangeXHRReadyState()
void InspectorTimelineAgent::willLoadXHR(const String& url)
{
- pushCurrentRecord(TimelineRecordFactory::createXHRLoadRecord(m_frontend, currentTimeInMilliseconds(), url), XHRLoadRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createXHRLoadData(m_frontend, url), XHRLoadRecordType);
}
void InspectorTimelineAgent::didLoadXHR()
@@ -152,7 +155,7 @@ void InspectorTimelineAgent::didLoadXHR()
void InspectorTimelineAgent::willEvaluateScript(const String& url, int lineNumber)
{
- pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptRecord(m_frontend, currentTimeInMilliseconds(), url, lineNumber), EvaluateScriptTimelineRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptData(m_frontend, url, lineNumber), EvaluateScriptTimelineRecordType);
}
void InspectorTimelineAgent::didEvaluateScript()
@@ -163,31 +166,33 @@ void InspectorTimelineAgent::didEvaluateScript()
void InspectorTimelineAgent::willSendResourceRequest(unsigned long identifier, bool isMainResource,
const ResourceRequest& request)
{
- ScriptObject record = TimelineRecordFactory::createResourceSendRequestRecord(m_frontend, currentTimeInMilliseconds(),
- identifier, isMainResource, request);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createResourceSendRequestData(m_frontend, identifier, isMainResource, request));
record.set("type", ResourceSendRequestTimelineRecordType);
m_frontend->addRecordToTimeline(record);
}
void InspectorTimelineAgent::didReceiveResourceResponse(unsigned long identifier, const ResourceResponse& response)
{
- ScriptObject record = TimelineRecordFactory::createResourceReceiveResponseRecord(m_frontend, currentTimeInMilliseconds(),
- identifier, response);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createResourceReceiveResponseData(m_frontend, identifier, response));
record.set("type", ResourceReceiveResponseTimelineRecordType);
m_frontend->addRecordToTimeline(record);
}
void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail)
{
- ScriptObject record = TimelineRecordFactory::createResourceFinishRecord(m_frontend, currentTimeInMilliseconds(),
- identifier, didFail);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createResourceFinishData(m_frontend, identifier, didFail));
record.set("type", ResourceFinishTimelineRecordType);
m_frontend->addRecordToTimeline(record);
}
void InspectorTimelineAgent::didMarkTimeline(const String& message)
{
- addRecordToTimeline(TimelineRecordFactory::createMarkTimelineRecord(m_frontend, currentTimeInMilliseconds(), message), MarkTimelineRecordType);
+ ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
+ record.set("data", TimelineRecordFactory::createMarkTimelineData(m_frontend, message));
+ addRecordToTimeline(record, MarkTimelineRecordType);
}
void InspectorTimelineAgent::reset()
@@ -221,6 +226,7 @@ void InspectorTimelineAgent::didCompleteCurrentRecord(TimelineRecordType type)
TimelineRecordEntry entry = m_recordStack.last();
m_recordStack.removeLast();
ASSERT(entry.type == type);
+ entry.record.set("data", entry.data);
entry.record.set("children", entry.children);
entry.record.set("endTime", currentTimeInMilliseconds());
addRecordToTimeline(entry.record, type);
@@ -232,9 +238,9 @@ double InspectorTimelineAgent::currentTimeInMilliseconds()
return currentTime() * 1000.0;
}
-void InspectorTimelineAgent::pushCurrentRecord(ScriptObject record, TimelineRecordType type)
+void InspectorTimelineAgent::pushCurrentRecord(ScriptObject data, TimelineRecordType type)
{
- m_recordStack.append(TimelineRecordEntry(record, m_frontend->newScriptArray(), type));
+ m_recordStack.append(TimelineRecordEntry(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), data, m_frontend->newScriptArray(), type));
}
} // namespace WebCore
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 2fee128..a88bad3 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -86,8 +86,8 @@ namespace WebCore {
void willPaint(const IntRect&);
void didPaint();
- void willWriteHTML(unsigned length);
- void didWriteHTML();
+ void willWriteHTML(unsigned int length, unsigned int startLine);
+ void didWriteHTML(unsigned int endLine);
void didInstallTimer(int timerId, int timeout, bool singleShot);
void didRemoveTimer(int timerId);
@@ -111,8 +111,9 @@ namespace WebCore {
static InspectorTimelineAgent* retrieve(ScriptExecutionContext*);
private:
struct TimelineRecordEntry {
- TimelineRecordEntry(ScriptObject record, ScriptArray children, TimelineRecordType type) : record(record), children(children), type(type) { }
+ TimelineRecordEntry(ScriptObject record, ScriptObject data, ScriptArray children, TimelineRecordType type) : record(record), data(data), children(children), type(type) { }
ScriptObject record;
+ ScriptObject data;
ScriptArray children;
TimelineRecordType type;
};
@@ -122,7 +123,7 @@ namespace WebCore {
static double currentTimeInMilliseconds();
void didCompleteCurrentRecord(TimelineRecordType);
-
+
void addRecordToTimeline(ScriptObject, TimelineRecordType);
InspectorFrontend* m_frontend;
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index f09e227..525e61d 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -50,130 +50,104 @@ ScriptObject TimelineRecordFactory::createGenericRecord(InspectorFrontend* front
return record;
}
-ScriptObject TimelineRecordFactory::createEventDispatchRecord(InspectorFrontend* frontend, double startTime, const Event& event)
+ScriptObject TimelineRecordFactory::createEventDispatchData(InspectorFrontend* frontend, const Event& event)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("type", event.type().string());
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createGenericTimerRecord(InspectorFrontend* frontend, double startTime, int timerId)
+ScriptObject TimelineRecordFactory::createGenericTimerData(InspectorFrontend* frontend, int timerId)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("timerId", timerId);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createTimerInstallRecord(InspectorFrontend* frontend, double startTime, int timerId, int timeout, bool singleShot)
+ScriptObject TimelineRecordFactory::createTimerInstallData(InspectorFrontend* frontend, int timerId, int timeout, bool singleShot)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("timerId", timerId);
data.set("timeout", timeout);
data.set("singleShot", singleShot);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createXHRReadyStateChangeRecord(InspectorFrontend* frontend, double startTime, const String& url, int readyState)
+ScriptObject TimelineRecordFactory::createXHRReadyStateChangeData(InspectorFrontend* frontend, const String& url, int readyState)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("url", url);
data.set("readyState", readyState);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createXHRLoadRecord(InspectorFrontend* frontend, double startTime, const String& url)
+ScriptObject TimelineRecordFactory::createXHRLoadData(InspectorFrontend* frontend, const String& url)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("url", url);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createEvaluateScriptRecord(InspectorFrontend* frontend, double startTime, const String& url, double lineNumber)
+ScriptObject TimelineRecordFactory::createEvaluateScriptData(InspectorFrontend* frontend, const String& url, double lineNumber)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("url", url);
data.set("lineNumber", lineNumber);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createMarkTimelineRecord(InspectorFrontend* frontend, double startTime, const String& message)
+ScriptObject TimelineRecordFactory::createMarkTimelineData(InspectorFrontend* frontend, const String& message)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("message", message);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createResourceSendRequestRecord(InspectorFrontend* frontend, double startTime,
- unsigned long identifier, bool isMainResource, const ResourceRequest& request)
+ScriptObject TimelineRecordFactory::createResourceSendRequestData(InspectorFrontend* frontend, unsigned long identifier, bool isMainResource, const ResourceRequest& request)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("identifier", identifier);
data.set("url", request.url().string());
data.set("requestMethod", request.httpMethod());
data.set("isMainResource", isMainResource);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createResourceReceiveResponseRecord(InspectorFrontend* frontend, double startTime,
- unsigned long identifier, const ResourceResponse& response)
+ScriptObject TimelineRecordFactory::createResourceReceiveResponseData(InspectorFrontend* frontend, unsigned long identifier, const ResourceResponse& response)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("identifier", identifier);
data.set("statusCode", response.httpStatusCode());
data.set("mimeType", response.mimeType());
data.set("expectedContentLength", response.expectedContentLength());
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createResourceFinishRecord(InspectorFrontend* frontend, double startTime,
- unsigned long identifier, bool didFail)
+ScriptObject TimelineRecordFactory::createResourceFinishData(InspectorFrontend* frontend, unsigned long identifier, bool didFail)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("identifier", identifier);
data.set("didFail", didFail);
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createPaintRecord(InspectorFrontend* frontend, double startTime, const IntRect& rect)
+ScriptObject TimelineRecordFactory::createPaintData(InspectorFrontend* frontend, const IntRect& rect)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("x", rect.x());
data.set("y", rect.y());
data.set("width", rect.width());
data.set("height", rect.height());
- record.set("data", data);
- return record;
+ return data;
}
-ScriptObject TimelineRecordFactory::createParseHTMLRecord(InspectorFrontend* frontend, double startTime, unsigned length)
+ScriptObject TimelineRecordFactory::createParseHTMLData(InspectorFrontend* frontend, unsigned int length, unsigned int startLine)
{
- ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("length", length);
- record.set("data", data);
- return record;
+ data.set("startLine", startLine);
+ return data;
}
} // namespace WebCore
diff --git a/WebCore/inspector/TimelineRecordFactory.h b/WebCore/inspector/TimelineRecordFactory.h
index c12c754..b7437f5 100644
--- a/WebCore/inspector/TimelineRecordFactory.h
+++ b/WebCore/inspector/TimelineRecordFactory.h
@@ -46,29 +46,30 @@ namespace WebCore {
public:
static ScriptObject createGenericRecord(InspectorFrontend*, double startTime);
- static ScriptObject createEventDispatchRecord(InspectorFrontend*, double startTime, const Event&);
+ static ScriptObject createEventDispatchData(InspectorFrontend*, const Event&);
- static ScriptObject createGenericTimerRecord(InspectorFrontend*, double startTime, int timerId);
+ static ScriptObject createGenericTimerData(InspectorFrontend*, int timerId);
- static ScriptObject createTimerInstallRecord(InspectorFrontend*, double startTime, int timerId, int timeout, bool singleShot);
+ static ScriptObject createTimerInstallData(InspectorFrontend*, int timerId, int timeout, bool singleShot);
- static ScriptObject createXHRReadyStateChangeRecord(InspectorFrontend*, double startTime, const String& url, int readyState);
- static ScriptObject createXHRLoadRecord(InspectorFrontend*, double startTime, const String& url);
+ static ScriptObject createXHRReadyStateChangeData(InspectorFrontend*, const String& url, int readyState);
+
+ static ScriptObject createXHRLoadData(InspectorFrontend*, const String& url);
- static ScriptObject createEvaluateScriptRecord(InspectorFrontend*, double startTime, const String&, double lineNumber);
+ static ScriptObject createEvaluateScriptData(InspectorFrontend*, const String&, double lineNumber);
- static ScriptObject createMarkTimelineRecord(InspectorFrontend*, double startTime, const String&);
+ static ScriptObject createMarkTimelineData(InspectorFrontend*, const String&);
+
+ static ScriptObject createResourceSendRequestData(InspectorFrontend*, unsigned long identifier,
+ bool isMainResource, const ResourceRequest&);
+
+ static ScriptObject createResourceReceiveResponseData(InspectorFrontend*, unsigned long identifier, const ResourceResponse&);
- static ScriptObject createResourceSendRequestRecord(InspectorFrontend*, double startTime,
- unsigned long identifier, bool isMainResource, const ResourceRequest&);
- static ScriptObject createResourceReceiveResponseRecord(InspectorFrontend*, double startTime,
- unsigned long identifier, const ResourceResponse&);
- static ScriptObject createResourceFinishRecord(InspectorFrontend*, double startTime,
- unsigned long identifier, bool didFail);
+ static ScriptObject createResourceFinishData(InspectorFrontend*, unsigned long identifier, bool didFail);
- static ScriptObject createPaintRecord(InspectorFrontend*, double startTime, const IntRect&);
+ static ScriptObject createPaintData(InspectorFrontend*, const IntRect&);
- static ScriptObject createParseHTMLRecord(InspectorFrontend*, double startTime, unsigned length);
+ static ScriptObject createParseHTMLData(InspectorFrontend*, unsigned int length, unsigned int startLine);
private:
TimelineRecordFactory() { }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list