[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[knorton at google.com]

The following commit has been merged in the webkit-1.2 branch:
commit b13d5e6fed75ec1d338e106a369c24b84f551657
Author: knorton at google.com <knorton at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 21:25:53 2010 +0000

    2010-01-12  Kelly Norton  <knorton at google.com>
    
            Reviewed by Timothy Hatcher.
    
            Adds source length to ParseHTMLRecords in the inspector timeline.
            https://bugs.webkit.org/show_bug.cgi?id=33548
    
            Test: inspector/timeline-parse-html.html
    
            * html/HTMLTokenizer.cpp:
            (WebCore::HTMLTokenizer::write):
            * inspector/InspectorTimelineAgent.cpp:
            (WebCore::InspectorTimelineAgent::willWriteHTML):
            * inspector/InspectorTimelineAgent.h:
            * inspector/TimelineRecordFactory.cpp:
            (WebCore::TimelineRecordFactory::createParseHTMLRecord):
            * inspector/TimelineRecordFactory.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/inspector/timeline-parse-html-expected.txt b/LayoutTests/inspector/timeline-parse-html-expected.txt
index d42a8e7..51700ac 100644
--- a/LayoutTests/inspector/timeline-parse-html-expected.txt
+++ b/LayoutTests/inspector/timeline-parse-html-expected.txt
@@ -2,6 +2,9 @@ Tests the Timeline API instrumentation of ParseHTML
 
 ParseHTML Properties:
 + startTime : * DEFINED *
++ data : {
++- length : 9
++ }
 + children : * DEFINED *
 + endTime : * DEFINED *
 + type : 4
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e08773..04de9f0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-12  Kelly Norton  <knorton at google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Adds source length to ParseHTMLRecords in the inspector timeline.
+        https://bugs.webkit.org/show_bug.cgi?id=33548
+
+        Test: inspector/timeline-parse-html.html
+
+        * html/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::write):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::willWriteHTML):
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/TimelineRecordFactory.cpp:
+        (WebCore::TimelineRecordFactory::createParseHTMLRecord):
+        * inspector/TimelineRecordFactory.h:
+
 2010-01-12  Jungshik Shin  <jshin at chromium.org>
 
         Reviewed by Darin Adler
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index 9a1ffd0..f05b318 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();
+        timelineAgent->willWriteHTML(source.length());
 #endif
   
     Frame* frame = m_doc->frame();
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index b28aa97..89a1349 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -96,9 +96,9 @@ void InspectorTimelineAgent::didPaint()
     didCompleteCurrentRecord(PaintTimelineRecordType);
 }
 
-void InspectorTimelineAgent::willWriteHTML()
+void InspectorTimelineAgent::willWriteHTML(unsigned length)
 {
-    pushCurrentRecord(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), ParseHTMLTimelineRecordType);
+    pushCurrentRecord(TimelineRecordFactory::createParseHTMLRecord(m_frontend, currentTimeInMilliseconds(), length), ParseHTMLTimelineRecordType);
 }
 
 void InspectorTimelineAgent::didWriteHTML()
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 53670bb..2fee128 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -86,7 +86,7 @@ namespace WebCore {
         void willPaint(const IntRect&);
         void didPaint();
 
-        void willWriteHTML();
+        void willWriteHTML(unsigned length);
         void didWriteHTML();
         
         void didInstallTimer(int timerId, int timeout, bool singleShot);
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index 4fdd502..f09e227 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -167,6 +167,15 @@ ScriptObject TimelineRecordFactory::createPaintRecord(InspectorFrontend* fronten
     return record;
 }
 
+ScriptObject TimelineRecordFactory::createParseHTMLRecord(InspectorFrontend* frontend, double startTime, unsigned length)
+{
+    ScriptObject record = createGenericRecord(frontend, startTime);
+    ScriptObject data = frontend->newScriptObject();
+    data.set("length", length);
+    record.set("data", data);
+    return record;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/TimelineRecordFactory.h b/WebCore/inspector/TimelineRecordFactory.h
index e0ccc95..c12c754 100644
--- a/WebCore/inspector/TimelineRecordFactory.h
+++ b/WebCore/inspector/TimelineRecordFactory.h
@@ -68,6 +68,8 @@ namespace WebCore {
 
         static ScriptObject createPaintRecord(InspectorFrontend*, double startTime, const IntRect&);
 
+        static ScriptObject createParseHTMLRecord(InspectorFrontend*, double startTime, unsigned length);
+
     private:
         TimelineRecordFactory() { }
     };

-- 
WebKit Debian packaging