[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:22:43 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f1ff64ac0329c2ada6003301eb085a3ca4bac35d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 4 20:12:12 2009 +0000
2009-11-04 Kelly Norton <knorton at google.com>
Reviewed by Pavel Feldman.
Fixes naming inconsistencies in TimelineRecordFactory.
https://bugs.webkit.org/show_bug.cgi?id=31132
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willPaint):
(WebCore::InspectorTimelineAgent::willChangeXHRReadyState):
(WebCore::InspectorTimelineAgent::willLoadXHR):
(WebCore::InspectorTimelineAgent::willEvaluateScript):
(WebCore::InspectorTimelineAgent::willSendResourceRequest):
(WebCore::InspectorTimelineAgent::didReceiveResourceResponse):
(WebCore::InspectorTimelineAgent::didFinishLoadingResource):
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createXHRReadyStateChangeRecord):
(WebCore::TimelineRecordFactory::createXHRLoadRecord):
(WebCore::TimelineRecordFactory::createEvaluateScriptRecord):
(WebCore::TimelineRecordFactory::createMarkTimelineRecord):
(WebCore::TimelineRecordFactory::createResourceSendRequestRecord):
(WebCore::TimelineRecordFactory::createResourceReceiveResponseRecord):
(WebCore::TimelineRecordFactory::createResourceFinishRecord):
(WebCore::TimelineRecordFactory::createPaintRecord):
* inspector/TimelineRecordFactory.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 096f0de..1aae6d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2009-11-04 Kelly Norton <knorton at google.com>
+
+ Reviewed by Pavel Feldman.
+
+ Fixes naming inconsistencies in TimelineRecordFactory.
+ https://bugs.webkit.org/show_bug.cgi?id=31132
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willPaint):
+ (WebCore::InspectorTimelineAgent::willChangeXHRReadyState):
+ (WebCore::InspectorTimelineAgent::willLoadXHR):
+ (WebCore::InspectorTimelineAgent::willEvaluateScript):
+ (WebCore::InspectorTimelineAgent::willSendResourceRequest):
+ (WebCore::InspectorTimelineAgent::didReceiveResourceResponse):
+ (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createXHRReadyStateChangeRecord):
+ (WebCore::TimelineRecordFactory::createXHRLoadRecord):
+ (WebCore::TimelineRecordFactory::createEvaluateScriptRecord):
+ (WebCore::TimelineRecordFactory::createMarkTimelineRecord):
+ (WebCore::TimelineRecordFactory::createResourceSendRequestRecord):
+ (WebCore::TimelineRecordFactory::createResourceReceiveResponseRecord):
+ (WebCore::TimelineRecordFactory::createResourceFinishRecord):
+ (WebCore::TimelineRecordFactory::createPaintRecord):
+ * inspector/TimelineRecordFactory.h:
+
2009-11-04 Eric Z. Ayers <zundel at google.com>
Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index bfbd8aa..b28aa97 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -87,7 +87,7 @@ void InspectorTimelineAgent::didRecalculateStyle()
void InspectorTimelineAgent::willPaint(const IntRect& rect)
{
- pushCurrentRecord(TimelineRecordFactory::createPaintTimelineRecord(m_frontend, currentTimeInMilliseconds(), rect),
+ pushCurrentRecord(TimelineRecordFactory::createPaintRecord(m_frontend, currentTimeInMilliseconds(), rect),
PaintTimelineRecordType);
}
@@ -131,7 +131,7 @@ void InspectorTimelineAgent::didFireTimer()
void InspectorTimelineAgent::willChangeXHRReadyState(const String& url, int readyState)
{
- pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeTimelineRecord(m_frontend, currentTimeInMilliseconds(), url, readyState),
+ pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeRecord(m_frontend, currentTimeInMilliseconds(), url, readyState),
XHRReadyStateChangeRecordType);
}
@@ -142,7 +142,7 @@ void InspectorTimelineAgent::didChangeXHRReadyState()
void InspectorTimelineAgent::willLoadXHR(const String& url)
{
- pushCurrentRecord(TimelineRecordFactory::createXHRLoadTimelineRecord(m_frontend, currentTimeInMilliseconds(), url), XHRLoadRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createXHRLoadRecord(m_frontend, currentTimeInMilliseconds(), url), XHRLoadRecordType);
}
void InspectorTimelineAgent::didLoadXHR()
@@ -152,7 +152,7 @@ void InspectorTimelineAgent::didLoadXHR()
void InspectorTimelineAgent::willEvaluateScript(const String& url, int lineNumber)
{
- pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptTimelineRecord(m_frontend, currentTimeInMilliseconds(), url, lineNumber), EvaluateScriptTimelineRecordType);
+ pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptRecord(m_frontend, currentTimeInMilliseconds(), url, lineNumber), EvaluateScriptTimelineRecordType);
}
void InspectorTimelineAgent::didEvaluateScript()
@@ -163,7 +163,7 @@ void InspectorTimelineAgent::didEvaluateScript()
void InspectorTimelineAgent::willSendResourceRequest(unsigned long identifier, bool isMainResource,
const ResourceRequest& request)
{
- ScriptObject record = TimelineRecordFactory::createResourceSendRequestTimelineRecord(m_frontend, currentTimeInMilliseconds(),
+ ScriptObject record = TimelineRecordFactory::createResourceSendRequestRecord(m_frontend, currentTimeInMilliseconds(),
identifier, isMainResource, request);
record.set("type", ResourceSendRequestTimelineRecordType);
m_frontend->addRecordToTimeline(record);
@@ -171,7 +171,7 @@ void InspectorTimelineAgent::willSendResourceRequest(unsigned long identifier, b
void InspectorTimelineAgent::didReceiveResourceResponse(unsigned long identifier, const ResourceResponse& response)
{
- ScriptObject record = TimelineRecordFactory::createResourceReceiveResponseTimelineRecord(m_frontend, currentTimeInMilliseconds(),
+ ScriptObject record = TimelineRecordFactory::createResourceReceiveResponseRecord(m_frontend, currentTimeInMilliseconds(),
identifier, response);
record.set("type", ResourceReceiveResponseTimelineRecordType);
m_frontend->addRecordToTimeline(record);
@@ -179,7 +179,7 @@ void InspectorTimelineAgent::didReceiveResourceResponse(unsigned long identifier
void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail)
{
- ScriptObject record = TimelineRecordFactory::createResourceFinishTimelineRecord(m_frontend, currentTimeInMilliseconds(),
+ ScriptObject record = TimelineRecordFactory::createResourceFinishRecord(m_frontend, currentTimeInMilliseconds(),
identifier, didFail);
record.set("type", ResourceFinishTimelineRecordType);
m_frontend->addRecordToTimeline(record);
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index 08fb738..e180399 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -79,7 +79,7 @@ ScriptObject TimelineRecordFactory::createTimerInstallRecord(InspectorFrontend*
return record;
}
-ScriptObject TimelineRecordFactory::createXHRReadyStateChangeTimelineRecord(InspectorFrontend* frontend, double startTime, const String& url, int readyState)
+ScriptObject TimelineRecordFactory::createXHRReadyStateChangeRecord(InspectorFrontend* frontend, double startTime, const String& url, int readyState)
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
@@ -89,7 +89,7 @@ ScriptObject TimelineRecordFactory::createXHRReadyStateChangeTimelineRecord(Insp
return record;
}
-ScriptObject TimelineRecordFactory::createXHRLoadTimelineRecord(InspectorFrontend* frontend, double startTime, const String& url)
+ScriptObject TimelineRecordFactory::createXHRLoadRecord(InspectorFrontend* frontend, double startTime, const String& url)
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
@@ -98,27 +98,27 @@ ScriptObject TimelineRecordFactory::createXHRLoadTimelineRecord(InspectorFronten
return record;
}
-ScriptObject TimelineRecordFactory::createEvaluateScriptTimelineRecord(InspectorFrontend* frontend, double startTime, const String& url, double lineNumber)
+ScriptObject TimelineRecordFactory::createEvaluateScriptRecord(InspectorFrontend* frontend, double startTime, const String& url, double lineNumber)
{
- ScriptObject item = createGenericRecord(frontend, startTime);
+ ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("url", url);
data.set("lineNumber", lineNumber);
- item.set("data", data);
- return item;
+ record.set("data", data);
+ return record;
}
ScriptObject TimelineRecordFactory::createMarkTimelineRecord(InspectorFrontend* frontend, double startTime, const String& message)
{
- ScriptObject item = createGenericRecord(frontend, startTime);
+ ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
data.set("message", message);
- item.set("data", data);
- return item;
+ record.set("data", data);
+ return record;
}
-ScriptObject TimelineRecordFactory::createResourceSendRequestTimelineRecord(InspectorFrontend* frontend, double startTime,
+ScriptObject TimelineRecordFactory::createResourceSendRequestRecord(InspectorFrontend* frontend, double startTime,
unsigned long identifier, bool isMainResource, const ResourceRequest& request)
{
ScriptObject record = createGenericRecord(frontend, startTime);
@@ -131,7 +131,7 @@ ScriptObject TimelineRecordFactory::createResourceSendRequestTimelineRecord(Insp
return record;
}
-ScriptObject TimelineRecordFactory::createResourceReceiveResponseTimelineRecord(InspectorFrontend* frontend, double startTime,
+ScriptObject TimelineRecordFactory::createResourceReceiveResponseRecord(InspectorFrontend* frontend, double startTime,
unsigned long identifier, const ResourceResponse& response)
{
ScriptObject record = createGenericRecord(frontend, startTime);
@@ -144,7 +144,7 @@ ScriptObject TimelineRecordFactory::createResourceReceiveResponseTimelineRecord(
return record;
}
-ScriptObject TimelineRecordFactory::createResourceFinishTimelineRecord(InspectorFrontend* frontend, double startTime,
+ScriptObject TimelineRecordFactory::createResourceFinishRecord(InspectorFrontend* frontend, double startTime,
unsigned long identifier, bool didFail)
{
ScriptObject record = createGenericRecord(frontend, startTime);
@@ -155,7 +155,7 @@ ScriptObject TimelineRecordFactory::createResourceFinishTimelineRecord(Inspector
return record;
}
-ScriptObject TimelineRecordFactory::createPaintTimelineRecord(InspectorFrontend* frontend, double startTime, const IntRect& rect)
+ScriptObject TimelineRecordFactory::createPaintRecord(InspectorFrontend* frontend, double startTime, const IntRect& rect)
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
diff --git a/WebCore/inspector/TimelineRecordFactory.h b/WebCore/inspector/TimelineRecordFactory.h
index d52e92d..e0ccc95 100644
--- a/WebCore/inspector/TimelineRecordFactory.h
+++ b/WebCore/inspector/TimelineRecordFactory.h
@@ -52,21 +52,21 @@ namespace WebCore {
static ScriptObject createTimerInstallRecord(InspectorFrontend*, double startTime, int timerId, int timeout, bool singleShot);
- static ScriptObject createXHRReadyStateChangeTimelineRecord(InspectorFrontend*, double startTime, const String& url, int readyState);
- static ScriptObject createXHRLoadTimelineRecord(InspectorFrontend*, double startTime, const String& url);
+ static ScriptObject createXHRReadyStateChangeRecord(InspectorFrontend*, double startTime, const String& url, int readyState);
+ static ScriptObject createXHRLoadRecord(InspectorFrontend*, double startTime, const String& url);
- static ScriptObject createEvaluateScriptTimelineRecord(InspectorFrontend*, double startTime, const String&, double lineNumber);
+ static ScriptObject createEvaluateScriptRecord(InspectorFrontend*, double startTime, const String&, double lineNumber);
static ScriptObject createMarkTimelineRecord(InspectorFrontend*, double startTime, const String&);
- static ScriptObject createResourceSendRequestTimelineRecord(InspectorFrontend*, double startTime,
+ static ScriptObject createResourceSendRequestRecord(InspectorFrontend*, double startTime,
unsigned long identifier, bool isMainResource, const ResourceRequest&);
- static ScriptObject createResourceReceiveResponseTimelineRecord(InspectorFrontend*, double startTime,
+ static ScriptObject createResourceReceiveResponseRecord(InspectorFrontend*, double startTime,
unsigned long identifier, const ResourceResponse&);
- static ScriptObject createResourceFinishTimelineRecord(InspectorFrontend*, double startTime,
+ static ScriptObject createResourceFinishRecord(InspectorFrontend*, double startTime,
unsigned long identifier, bool didFail);
- static ScriptObject createPaintTimelineRecord(InspectorFrontend*, double startTime, const IntRect&);
+ static ScriptObject createPaintRecord(InspectorFrontend*, double startTime, const IntRect&);
private:
TimelineRecordFactory() { }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list