Title: [122105] trunk
- Revision
- 122105
- Author
- [email protected]
- Date
- 2012-07-09 06:36:07 -0700 (Mon, 09 Jul 2012)
Log Message
REGRESSION(r121980) Layout Test inspector/timeline/timeline-frames.html started to crash.
https://bugs.webkit.org/show_bug.cgi?id=90747
Reviewed by Pavel Feldman.
Source/WebCore:
- consider didCancelFrame() call normal if there is no pending frame, remove assertion;
- always set empty data object for frame records;
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCancelFrame):
(WebCore::InspectorTimelineAgent::commitFrameRecord):
LayoutTests:
- remove CRASH expectations for timeline-frames.html
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (122104 => 122105)
--- trunk/LayoutTests/ChangeLog 2012-07-09 12:33:48 UTC (rev 122104)
+++ trunk/LayoutTests/ChangeLog 2012-07-09 13:36:07 UTC (rev 122105)
@@ -1,3 +1,14 @@
+2012-07-09 Andrey Kosyakov <[email protected]>
+
+ REGRESSION(r121980) Layout Test inspector/timeline/timeline-frames.html started to crash.
+ https://bugs.webkit.org/show_bug.cgi?id=90747
+
+ Reviewed by Pavel Feldman.
+
+ - remove CRASH expectations for timeline-frames.html
+
+ * platform/chromium/TestExpectations:
+
2012-07-09 Taiju Tsuiki <[email protected]>
Web Inspector: Add text file support for FileSystemAgent::requestFileContent
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (122104 => 122105)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-09 12:33:48 UTC (rev 122104)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-09 13:36:07 UTC (rev 122105)
@@ -982,8 +982,6 @@
BUGWK78810 LINUX WIN DEBUG SLOW : inspector/debugger/script-formatter-console.html = PASS
-BUGWK90747 LINUX DEBUG : inspector/timeline/timeline-frames.html = CRASH
-
// -----------------------------------------------------------------
// Editing tests
// -----------------------------------------------------------------
Modified: trunk/Source/WebCore/ChangeLog (122104 => 122105)
--- trunk/Source/WebCore/ChangeLog 2012-07-09 12:33:48 UTC (rev 122104)
+++ trunk/Source/WebCore/ChangeLog 2012-07-09 13:36:07 UTC (rev 122105)
@@ -1,3 +1,17 @@
+2012-07-09 Andrey Kosyakov <[email protected]>
+
+ REGRESSION(r121980) Layout Test inspector/timeline/timeline-frames.html started to crash.
+ https://bugs.webkit.org/show_bug.cgi?id=90747
+
+ Reviewed by Pavel Feldman.
+
+ - consider didCancelFrame() call normal if there is no pending frame, remove assertion;
+ - always set empty data object for frame records;
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCancelFrame):
+ (WebCore::InspectorTimelineAgent::commitFrameRecord):
+
2012-07-09 Taiju Tsuiki <[email protected]>
Web Inspector: Add FileContentView for FileSystemView
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (122104 => 122105)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-07-09 12:33:48 UTC (rev 122104)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-07-09 13:36:07 UTC (rev 122105)
@@ -200,7 +200,6 @@
void InspectorTimelineAgent::didCancelFrame()
{
- ASSERT(m_pendingFrameRecord);
m_pendingFrameRecord.clear();
}
@@ -544,6 +543,7 @@
if (!m_pendingFrameRecord)
return;
+ m_pendingFrameRecord->setObject("data", InspectorObject::create());
innerAddRecordToTimeline(m_pendingFrameRecord.release(), TimelineRecordType::BeginFrame, "");
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
