Diff
Modified: trunk/LayoutTests/ChangeLog (95301 => 95302)
--- trunk/LayoutTests/ChangeLog 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/ChangeLog 2011-09-16 17:28:00 UTC (rev 95302)
@@ -1,3 +1,18 @@
+2011-09-16 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt] REGRESSION(r95091) It made many tests flakey
+ https://bugs.webkit.org/show_bug.cgi?id=68232
+
+ Unreviewed rolling out r95091 and followup patches.
+
+ * inspector/timeline/timeline-animation-frame-expected.txt: Removed.
+ * inspector/timeline/timeline-animation-frame.html: Removed.
+ * inspector/timeline/timeline-enum-stability-expected.txt:
+ * inspector/timeline/timeline-test.js:
+ * platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt: Removed.
+ * platform/qt/Skipped:
+ * platform/qt/test_expectations.txt:
+
2011-09-16 Abhishek Arya <infe...@chromium.org>
cachedFont not getting updated for inline SVG text.
Deleted: trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt (95301 => 95302)
--- trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt 2011-09-16 17:28:00 UTC (rev 95302)
@@ -1,35 +0,0 @@
-Tests the Timeline events for Animation Frame feature
-
-RegisterAnimationFrameCallback Properties:
-{
- startTime : <number>
- data : {
- id : <number>
- }
- type : "RegisterAnimationFrameCallback"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-FireAnimationFrameEvent Properties:
-{
- startTime : <number>
- data : {
- id : <number>
- }
- children : <object>
- endTime : <number>
- type : "FireAnimationFrameEvent"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-CancelAnimationFrameCallback Properties:
-{
- startTime : <number>
- data : {
- id : <number>
- }
- type : "CancelAnimationFrameCallback"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html (95301 => 95302)
--- trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-16 17:28:00 UTC (rev 95302)
@@ -1,60 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-
-function performActions()
-{
- var element = document.getElementById("animation");
- var requestId = window.webkitRequestAnimationFrame(animationFrameCallback, element);
- function animationFrameCallback()
- {
- window.webkitCancelRequestAnimationFrame(requestId);
- }
-
- if (window.layoutTestController)
- layoutTestController.display();
-}
-
-function test()
-{
- InspectorTest.startTimeline(function() {
- InspectorTest.evaluateInPage("performActions()");
- });
-
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, function(event) {
- addRecord(event.data);
- });
-
- function addRecord(record)
- {
- if (record.type !== WebInspector.TimelineAgent.RecordType["CancelAnimationFrameCallback"]) {
- for (var i = 0; record.children && i < record.children.length; ++i)
- addRecord(record.children[i]);
- return ;
- }
-
- InspectorTest.printTimelineRecords("RegisterAnimationFrameCallback");
- InspectorTest.printTimelineRecords("FireAnimationFrameEvent");
- InspectorTest.printTimelineRecords("CancelAnimationFrameCallback");
- InspectorTest.completeTest();
- }
-}
-
-if (!window.layoutTestController)
- setTimeout(performActions, 2000);
-
-</script>
-</head>
-
-<body _onload_="runTest()">
-<p>
-Tests the Timeline events for Animation Frame feature
-</p>
-<div id="animation">
-
-</div>
-
-</body>
-</html>
Modified: trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt (95301 => 95302)
--- trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt 2011-09-16 17:28:00 UTC (rev 95302)
@@ -24,8 +24,5 @@
ResourceFinish : "ResourceFinish"
FunctionCall : "FunctionCall"
GCEvent : "GCEvent"
- RegisterAnimationFrameCallback : "RegisterAnimationFrameCallback"
- CancelAnimationFrameCallback : "CancelAnimationFrameCallback"
- FireAnimationFrameEvent : "FireAnimationFrameEvent"
}
Modified: trunk/LayoutTests/inspector/timeline/timeline-test.js (95301 => 95302)
--- trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-09-16 17:28:00 UTC (rev 95302)
@@ -2,18 +2,17 @@
// Scrub values when printing out these properties in the record or data field.
InspectorTest.timelineNonDeterministicProps = {
- children: 1,
- endTime: 1,
- height: 1,
- requestId: 1,
- startTime: 1,
- width: 1,
+ children : 1,
+ endTime : 1,
+ height : 1,
+ requestId : 1,
+ startTime : 1,
+ width : 1,
stackTrace: 1,
- url: 1,
+ url : 1,
usedHeapSize: 1,
totalHeapSize: 1,
- mimeType: 1,
- id: 1
+ mimeType : 1
};
InspectorTest.startTimeline = function(callback)
Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt (95301 => 95302)
--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt 2011-09-16 17:28:00 UTC (rev 95302)
@@ -1,38 +0,0 @@
-Tests the Timeline events for Animation Frame feature
-
-RegisterAnimationFrameCallback Properties:
-{
- startTime : <number>
- stackTrace : <object>
- data : {
- id : <number>
- }
- type : "RegisterAnimationFrameCallback"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-FireAnimationFrameEvent Properties:
-{
- startTime : <number>
- stackTrace : <object>
- data : {
- id : <number>
- }
- children : <object>
- endTime : <number>
- type : "FireAnimationFrameEvent"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-CancelAnimationFrameCallback Properties:
-{
- startTime : <number>
- stackTrace : <object>
- data : {
- id : <number>
- }
- type : "CancelAnimationFrameCallback"
- usedHeapSize : <number>
- totalHeapSize : <number>
-}
-
Modified: trunk/LayoutTests/platform/qt/Skipped (95301 => 95302)
--- trunk/LayoutTests/platform/qt/Skipped 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-09-16 17:28:00 UTC (rev 95302)
@@ -2425,14 +2425,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=66588
http/tests/security/xssAuditor/script-tag-with-16bit-unicode4.html
-# [Qt] One test failed after r95091
-# https://bugs.webkit.org/show_bug.cgi?id=68232
-inspector/timeline/timeline-enum-stability.html
-
# [Qt] One test failed after r95203
# https://bugs.webkit.org/show_bug.cgi?id=68233
editing/pasteboard/paste-noscript.html
-
-# [Qt] inspector/timeline/timeline-event-dispatch.html is flakey
-# https://bugs.webkit.org/show_bug.cgi?id=68248
-inspector/timeline/timeline-event-dispatch.html
Modified: trunk/LayoutTests/platform/qt/test_expectations.txt (95301 => 95302)
--- trunk/LayoutTests/platform/qt/test_expectations.txt 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/LayoutTests/platform/qt/test_expectations.txt 2011-09-16 17:28:00 UTC (rev 95302)
@@ -26,5 +26,3 @@
BUGWK67007 DEBUG : fast/ruby/after-table-doesnt-crash.html = CRASH
BUGWK67007 DEBUG : fast/ruby/generated-after-counter-doesnt-crash.html = CRASH
BUGWK67007 DEBUG : fast/ruby/generated-before-and-after-counter-doesnt-crash.html = CRASH
-
-BUG_LOISLO : inspector/timeline/timeline-animation-frame.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (95301 => 95302)
--- trunk/Source/WebCore/ChangeLog 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/ChangeLog 2011-09-16 17:28:00 UTC (rev 95302)
@@ -1,3 +1,37 @@
+2011-09-16 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt] REGRESSION(r95091) It made many tests flakey
+ https://bugs.webkit.org/show_bug.cgi?id=68232
+
+ Unreviewed rolling out r95091 and followup patches.
+
+ * English.lproj/localizedStrings.js:
+ * bindings/v8/V8Proxy.cpp:
+ (WebCore::V8Proxy::callFunction):
+ * bindings/v8/V8Proxy.h:
+ * bindings/v8/custom/V8CustomVoidCallback.cpp:
+ (WebCore::invokeCallback):
+ * dom/ScriptedAnimationController.cpp:
+ (WebCore::ScriptedAnimationController::registerCallback):
+ (WebCore::ScriptedAnimationController::cancelCallback):
+ (WebCore::ScriptedAnimationController::serviceScriptedAnimations):
+ * inspector/InspectorInstrumentation.cpp:
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::willCallFunction):
+ * inspector/InspectorTimelineAgent.cpp:
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ * inspector/TimelineRecordFactory.h:
+ * inspector/front-end/TimelineAgent.js:
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel):
+ (WebInspector.TimelinePanel.prototype.get _recordStyles):
+ (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
+ (WebInspector.TimelinePanel.prototype._clearPanel):
+ (WebInspector.TimelinePanel.FormattedRecord):
+ (WebInspector.TimelinePanel.FormattedRecord.prototype._generatePopupContent):
+ (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
+
2011-09-16 Abhishek Arya <infe...@chromium.org>
cachedFont not getting updated for inline SVG text.
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.cpp (95301 => 95302)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -477,9 +477,23 @@
return result;
}
+ InspectorInstrumentationCookie cookie;
+ if (InspectorInstrumentation::hasFrontends()) {
+ v8::ScriptOrigin origin = function->GetScriptOrigin();
+ String resourceName("undefined");
+ int lineNumber = 1;
+ if (!origin.ResourceName().IsEmpty()) {
+ resourceName = toWebCoreString(origin.ResourceName());
+ lineNumber = function->GetScriptLineNumber() + 1;
+ }
+ cookie = InspectorInstrumentation::willCallFunction(m_frame, resourceName, lineNumber);
+ }
+
m_recursion++;
- result = V8Proxy::instrumentedCallFunction(m_frame->page(), function, receiver, argc, args);
+ result = function->Call(receiver, argc, args);
m_recursion--;
+
+ InspectorInstrumentation::didCallFunction(cookie);
}
// Release the storage mutex if applicable.
@@ -502,24 +516,6 @@
return result;
}
-v8::Local<v8::Value> V8Proxy::instrumentedCallFunction(Page* page, v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
-{
- InspectorInstrumentationCookie cookie;
- if (InspectorInstrumentation::hasFrontends()) {
- String resourceName("undefined");
- int lineNumber = 1;
- v8::ScriptOrigin origin = function->GetScriptOrigin();
- if (!origin.ResourceName().IsEmpty()) {
- resourceName = toWebCoreString(origin.ResourceName());
- lineNumber = function->GetScriptLineNumber() + 1;
- }
- cookie = InspectorInstrumentation::willCallFunction(page, resourceName, lineNumber);
- }
- v8::Local<v8::Value> result = function->Call(receiver, argc, args);
- InspectorInstrumentation::didCallFunction(cookie);
- return result;
-}
-
v8::Local<v8::Value> V8Proxy::newInstance(v8::Handle<v8::Function> constructor, int argc, v8::Handle<v8::Value> args[])
{
// No artificial limitations on the depth of recursion, see comment in
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.h (95301 => 95302)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.h 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.h 2011-09-16 17:28:00 UTC (rev 95302)
@@ -57,7 +57,6 @@
class DOMWindow;
class Frame;
class Node;
- class Page;
class ScriptExecutionContext;
class ScriptSourceCode;
class SecurityOrigin;
@@ -174,9 +173,6 @@
// Call the function with the given receiver and arguments.
static v8::Local<v8::Value> callFunctionWithoutFrame(v8::Handle<v8::Function>, v8::Handle<v8::Object>, int argc, v8::Handle<v8::Value> argv[]);
- // Call the function with the given receiver and arguments and report times to the "InspectorInstrumentation".
- static v8::Local<v8::Value> instrumentedCallFunction(Page*, v8::Handle<v8::Function>, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[]);
-
// Call the function as constructor with the given arguments.
v8::Local<v8::Value> newInstance(v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[]);
Modified: trunk/Source/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp (95301 => 95302)
--- trunk/Source/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -83,9 +83,7 @@
v8::Handle<v8::Object> thisObject = v8::Context::GetCurrent()->Global();
- Page* page = scriptExecutionContext && scriptExecutionContext->isDocument() ? static_cast<Document*>(scriptExecutionContext)->page() : 0;
- v8::Handle<v8::Value> result = V8Proxy::instrumentedCallFunction(page, callbackFunction, thisObject, argc, argv);
-
+ v8::Handle<v8::Value> result = callbackFunction->Call(thisObject, argc, argv);
callbackReturnValue = !result.IsEmpty() && result->BooleanValue();
return exceptionCatcher.HasCaught();
}
Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.cpp (95301 => 95302)
--- trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -31,7 +31,6 @@
#include "Document.h"
#include "Element.h"
#include "FrameView.h"
-#include "InspectorInstrumentation.h"
#include "RequestAnimationFrameCallback.h"
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
@@ -76,9 +75,6 @@
callback->m_id = id;
callback->m_element = animationElement;
m_callbacks.append(callback);
-
- InspectorInstrumentation::didRegisterAnimationFrameCallback(m_document, id);
-
if (!m_suspendCount)
scheduleAnimation();
return id;
@@ -89,7 +85,6 @@
for (size_t i = 0; i < m_callbacks.size(); ++i) {
if (m_callbacks[i]->m_id == id) {
m_callbacks[i]->m_firedOrCancelled = true;
- InspectorInstrumentation::didCancelAnimationFrameCallback(m_document, id);
m_callbacks.remove(i);
return;
}
@@ -124,9 +119,7 @@
RequestAnimationFrameCallback* callback = callbacks[i].get();
if (!callback->m_firedOrCancelled && (!callback->m_element || callback->m_element->renderer())) {
callback->m_firedOrCancelled = true;
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireAnimationFrameEvent(m_document, callback->m_id);
callback->handleEvent(time);
- InspectorInstrumentation::didFireAnimationFrameEvent(cookie);
firedCallback = true;
callbacks.remove(i);
break;
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (95301 => 95302)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -865,34 +865,6 @@
#endif
}
-void InspectorInstrumentation::didRegisterAnimationFrameCallbackImpl(InstrumentingAgents* instrumentingAgents, int callbackId)
-{
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didRegisterAnimationFrameCallback(callbackId);
-}
-
-void InspectorInstrumentation::didCancelAnimationFrameCallbackImpl(InstrumentingAgents* instrumentingAgents, int callbackId)
-{
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didCancelAnimationFrameCallback(callbackId);
-}
-
-InspectorInstrumentationCookie InspectorInstrumentation::willFireAnimationFrameEventImpl(InstrumentingAgents* instrumentingAgents, int callbackId)
-{
- int timelineAgentId = 0;
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent()) {
- timelineAgent->willFireAnimationFrameEvent(callbackId);
- timelineAgentId = timelineAgent->id();
- }
- return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
-}
-
-void InspectorInstrumentation::didFireAnimationFrameEventImpl(const InspectorInstrumentationCookie& cookie)
-{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didFireAnimationFrameEvent();
-}
-
InspectorTimelineAgent* InspectorInstrumentation::retrieveTimelineAgent(const InspectorInstrumentationCookie& cookie)
{
if (!cookie.first)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (95301 => 95302)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-16 17:28:00 UTC (rev 95302)
@@ -95,7 +95,7 @@
static void didInstallTimer(ScriptExecutionContext*, int timerId, int timeout, bool singleShot);
static void didRemoveTimer(ScriptExecutionContext*, int timerId);
- static InspectorInstrumentationCookie willCallFunction(Page*, const String& scriptName, int scriptLine);
+ static InspectorInstrumentationCookie willCallFunction(Frame*, const String& scriptName, int scriptLine);
static void didCallFunction(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willChangeXHRReadyState(ScriptExecutionContext*, XMLHttpRequest* request);
static void didChangeXHRReadyState(const InspectorInstrumentationCookie&);
@@ -154,11 +154,6 @@
static void stopConsoleTiming(Page*, const String& title, PassRefPtr<ScriptCallStack>);
static void consoleTimeStamp(Page*, PassRefPtr<ScriptArguments>);
- static void didRegisterAnimationFrameCallback(Document*, int callbackId);
- static void didCancelAnimationFrameCallback(Document*, int callbackId);
- static InspectorInstrumentationCookie willFireAnimationFrameEvent(Document*, int callbackId);
- static void didFireAnimationFrameEvent(const InspectorInstrumentationCookie&);
-
#if ENABLE(_javascript__DEBUGGER)
static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, const String& sourceURL);
static void addProfile(Page*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
@@ -288,11 +283,6 @@
static void stopConsoleTimingImpl(InstrumentingAgents*, const String& title, PassRefPtr<ScriptCallStack>);
static void consoleTimeStampImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>);
- static void didRegisterAnimationFrameCallbackImpl(InstrumentingAgents*, int callbackId);
- static void didCancelAnimationFrameCallbackImpl(InstrumentingAgents*, int callbackId);
- static InspectorInstrumentationCookie willFireAnimationFrameEventImpl(InstrumentingAgents*, int callbackId);
- static void didFireAnimationFrameEventImpl(const InspectorInstrumentationCookie&);
-
#if ENABLE(_javascript__DEBUGGER)
static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, const String& sourceURL);
static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
@@ -495,14 +485,12 @@
#endif
}
-inline InspectorInstrumentationCookie InspectorInstrumentation::willCallFunction(Page* page, const String& scriptName, int scriptLine)
+
+inline InspectorInstrumentationCookie InspectorInstrumentation::willCallFunction(Frame* frame, const String& scriptName, int scriptLine)
{
#if ENABLE(INSPECTOR)
FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
- if (!page)
- return InspectorInstrumentationCookie();
-
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
return willCallFunctionImpl(instrumentingAgents, scriptName, scriptLine);
#endif
return InspectorInstrumentationCookie();
@@ -1037,41 +1025,7 @@
}
#endif
-inline void InspectorInstrumentation::didRegisterAnimationFrameCallback(Document* document, int callbackId)
-{
#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
- didRegisterAnimationFrameCallbackImpl(instrumentingAgents, callbackId);
-#endif
-}
-
-inline void InspectorInstrumentation::didCancelAnimationFrameCallback(Document* document, int callbackId)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
- didCancelAnimationFrameCallbackImpl(instrumentingAgents, callbackId);
-#endif
-}
-
-inline InspectorInstrumentationCookie InspectorInstrumentation::willFireAnimationFrameEvent(Document* document, int callbackId)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
- return willFireAnimationFrameEventImpl(instrumentingAgents, callbackId);
-#endif
- return InspectorInstrumentationCookie();
-}
-
-inline void InspectorInstrumentation::didFireAnimationFrameEvent(const InspectorInstrumentationCookie& cookie)
-{
-#if ENABLE(INSPECTOR)
- FAST_RETURN_IF_NO_FRONTENDS(void());
- if (cookie.first)
- didFireAnimationFrameEventImpl(cookie);
-#endif
-}
-
-#if ENABLE(INSPECTOR)
inline bool InspectorInstrumentation::collectingHTMLParseErrors(Page* page)
{
FAST_RETURN_IF_NO_FRONTENDS(false);
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (95301 => 95302)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -52,7 +52,6 @@
static const char timelineMaxCallStackDepth[] = "timelineMaxCallStackDepth";
}
-// Must be kept in sync with TimelineAgent.js
namespace TimelineRecordType {
static const char EventDispatch[] = "EventDispatch";
static const char Layout[] = "Layout";
@@ -82,10 +81,6 @@
static const char FunctionCall[] = "FunctionCall";
static const char GCEvent[] = "GCEvent";
-
-static const char RegisterAnimationFrameCallback[] = "RegisterAnimationFrameCallback";
-static const char CancelAnimationFrameCallback[] = "CancelAnimationFrameCallback";
-static const char FireAnimationFrameEvent[] = "FireAnimationFrameEvent";
}
void InspectorTimelineAgent::pushGCEventRecords()
@@ -349,26 +344,6 @@
clearRecordStack();
}
-void InspectorTimelineAgent::didRegisterAnimationFrameCallback(int callbackId)
-{
- appendRecord(TimelineRecordFactory::createAnimationFrameCallbackData(callbackId), TimelineRecordType::RegisterAnimationFrameCallback);
-}
-
-void InspectorTimelineAgent::didCancelAnimationFrameCallback(int callbackId)
-{
- appendRecord(TimelineRecordFactory::createAnimationFrameCallbackData(callbackId), TimelineRecordType::CancelAnimationFrameCallback);
-}
-
-void InspectorTimelineAgent::willFireAnimationFrameEvent(int callbackId)
-{
- pushCurrentRecord(TimelineRecordFactory::createAnimationFrameCallbackData(callbackId), TimelineRecordType::FireAnimationFrameEvent);
-}
-
-void InspectorTimelineAgent::didFireAnimationFrameEvent()
-{
- didCompleteCurrentRecord(TimelineRecordType::FireAnimationFrameEvent);
-}
-
void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, const String& type)
{
RefPtr<InspectorObject> record(prpRecord);
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (95301 => 95302)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2011-09-16 17:28:00 UTC (rev 95302)
@@ -119,12 +119,7 @@
void didFinishLoadingResource(unsigned long, bool didFail, double finishTime);
void willReceiveResourceData(unsigned long identifier);
void didReceiveResourceData();
-
- void didRegisterAnimationFrameCallback(int callbackId);
- void didCancelAnimationFrameCallback(int callbackId);
- void willFireAnimationFrameEvent(int callbackId);
- void didFireAnimationFrameEvent();
-
+
virtual void didGC(double, double, size_t);
private:
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (95301 => 95302)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2011-09-16 17:28:00 UTC (rev 95302)
@@ -182,13 +182,6 @@
return data.release();
}
-PassRefPtr<InspectorObject> TimelineRecordFactory::createAnimationFrameCallbackData(int callbackId)
-{
- RefPtr<InspectorObject> data = ""
- data->setNumber("id", callbackId);
- return data.release();
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (95301 => 95302)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2011-09-16 17:28:00 UTC (rev 95302)
@@ -79,8 +79,6 @@
static PassRefPtr<InspectorObject> createParseHTMLData(unsigned int length, unsigned int startLine);
- static PassRefPtr<InspectorObject> createAnimationFrameCallbackData(int callbackId);
-
private:
TimelineRecordFactory() { }
};
Modified: trunk/Source/WebCore/inspector/front-end/TimelineAgent.js (95301 => 95302)
--- trunk/Source/WebCore/inspector/front-end/TimelineAgent.js 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/front-end/TimelineAgent.js 2011-09-16 17:28:00 UTC (rev 95302)
@@ -61,9 +61,5 @@
ResourceFinish: "ResourceFinish",
FunctionCall: "FunctionCall",
- GCEvent: "GCEvent",
-
- RegisterAnimationFrameCallback: "RegisterAnimationFrameCallback",
- CancelAnimationFrameCallback: "CancelAnimationFrameCallback",
- FireAnimationFrameEvent: "FireAnimationFrameEvent"
+ GCEvent: "GCEvent"
};
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (95301 => 95302)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2011-09-16 17:23:52 UTC (rev 95301)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2011-09-16 17:28:00 UTC (rev 95302)
@@ -82,7 +82,6 @@
this._sendRequestRecords = {};
this._scheduledResourceRequests = {};
this._timerRecords = {};
- this._registeredAnimationCallbackRecords = {};
this._calculator = new WebInspector.TimelineCalculator();
this._calculator._showShortEvents = false;
@@ -202,9 +201,6 @@
recordStyles[recordTypes.MarkDOMContent] = { title: WebInspector.UIString("DOMContent event"), category: this.categories.scripting };
recordStyles[recordTypes.MarkLoad] = { title: WebInspector.UIString("Load event"), category: this.categories.scripting };
recordStyles[recordTypes.ScheduleResourceRequest] = { title: WebInspector.UIString("Schedule Request"), category: this.categories.loading };
- recordStyles[recordTypes.RegisterAnimationFrameCallback] = { title: WebInspector.UIString("Register Animation Callback"), category: this.categories.scripting };
- recordStyles[recordTypes.CancelAnimationFrameCallback] = { title: WebInspector.UIString("Cancel Animation Callback"), category: this.categories.scripting };
- recordStyles[recordTypes.FireAnimationFrameEvent] = { title: WebInspector.UIString("Animation Frame Event"), category: this.categories.scripting };
this._recordStylesArray = recordStyles;
}
return this._recordStylesArray;
@@ -408,12 +404,6 @@
{
var connectedToOldRecord = false;
var recordTypes = WebInspector.TimelineAgent.RecordType;
-
- if (record.type === recordTypes.RegisterAnimationFrameCallback) {
- this._registeredAnimationCallbackRecords[record.data.id] = record;
- return;
- }
-
if (record.type === recordTypes.MarkDOMContent || record.type === recordTypes.MarkLoad)
parentRecord = null; // No bar entry for load events.
else if (parentRecord === this._rootRecord ||
@@ -435,8 +425,7 @@
scriptLine: record.data.scriptLine
}
};
-
- if ((record.type === recordTypes.TimerFire || record.type === recordTypes.FireAnimationFrameEvent) && children && children.length) {
+ if (record.type === recordTypes.TimerFire && children && children.length) {
var childRecord = children[0];
if (childRecord.type === recordTypes.FunctionCall) {
scriptDetails = {
@@ -519,7 +508,6 @@
this._sendRequestRecords = {};
this._scheduledResourceRequests = {};
this._timerRecords = {};
- this._registeredAnimationCallbackRecords = {};
this._rootRecord = this._createRootRecord();
this._boundariesAreValid = false;
this._overviewPane.reset();
@@ -1012,10 +1000,6 @@
this.timeout = timerInstalledRecord.timeout;
this.singleShot = timerInstalledRecord.singleShot;
}
- } else if (record.type === recordTypes.FireAnimationFrameEvent) {
- var registerCallbackRecord = panel._registeredAnimationCallbackRecords[record.data.id];
- if (registerCallbackRecord)
- this.callSiteStackTrace = registerCallbackRecord.stackTrace;
}
this._refreshDetails();
}
@@ -1075,9 +1059,6 @@
contentHelper._appendTextRow(WebInspector.UIString("Repeats"), !this.singleShot);
}
break;
- case recordTypes.FireAnimationFrameEvent:
- contentHelper._appendTextRow(WebInspector.UIString("Callback ID"), this.data.id);
- break;
case recordTypes.FunctionCall:
contentHelper._appendLinkRow(WebInspector.UIString("Location"), this.scriptName, this.scriptLine);
break;
@@ -1138,8 +1119,6 @@
return this.scriptName ? this._linkifyLocation(this.scriptName, this.scriptLine, 0) : this.data.timerId;
case WebInspector.TimelineAgent.RecordType.FunctionCall:
return this.scriptName ? this._linkifyLocation(this.scriptName, this.scriptLine, 0) : null;
- case WebInspector.TimelineAgent.RecordType.FireAnimationFrameEvent:
- return this.scriptName ? this._linkifyLocation(this.scriptName, this.scriptLine, 0) : this.data.id;
case WebInspector.TimelineAgent.RecordType.EventDispatch:
return this.data ? this.data.type : null;
case WebInspector.TimelineAgent.RecordType.Paint:
@@ -1147,9 +1126,6 @@
case WebInspector.TimelineAgent.RecordType.TimerInstall:
case WebInspector.TimelineAgent.RecordType.TimerRemove:
return this.stackTrace ? this._linkifyCallFrame(this.stackTrace[0]) : this.data.timerId;
- case WebInspector.TimelineAgent.RecordType.RegisterAnimationFrameCallback:
- case WebInspector.TimelineAgent.RecordType.CancelAnimationFrameCallback:
- return this.stackTrace ? this._linkifyCallFrame(this.stackTrace[0]) : this.data.id;
case WebInspector.TimelineAgent.RecordType.ParseHTML:
case WebInspector.TimelineAgent.RecordType.RecalculateStyles:
return this.stackTrace ? this._linkifyCallFrame(this.stackTrace[0]) : null;
