[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ffca6d7178db31d9a3a3ac501f1a6a5af2490230
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 04:56:44 2009 +0000

    2009-10-20  Eric Z. Ayers  <zundel at google.com>
    
            Reviewed by Timothy Hatcher.
    
            Changes TimelineItems to be created with raw timestamps as opposed
            to a time relative to a start of session.  Normalized timestamps cause
            problems when monitoring a browsing session across multiple page
            transitions.
    
            * inspector/InspectorTimelineAgent.cpp:
            (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
            (WebCore::InspectorTimelineAgent::willDispatchDOMEvent):
            (WebCore::InspectorTimelineAgent::willLayout):
            (WebCore::InspectorTimelineAgent::willRecalculateStyle):
            (WebCore::InspectorTimelineAgent::willPaint):
            (WebCore::InspectorTimelineAgent::willWriteHTML):
            (WebCore::InspectorTimelineAgent::reset):
            (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
            * inspector/InspectorTimelineAgent.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 30347f6..ad7509b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2009-10-20  Eric Z. Ayers  <zundel at google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Changes TimelineItems to be created with raw timestamps as opposed
+        to a time relative to a start of session.  Normalized timestamps cause
+        problems when monitoring a browsing session across multiple page
+        transitions.
+
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+        (WebCore::InspectorTimelineAgent::willDispatchDOMEvent):
+        (WebCore::InspectorTimelineAgent::willLayout):
+        (WebCore::InspectorTimelineAgent::willRecalculateStyle):
+        (WebCore::InspectorTimelineAgent::willPaint):
+        (WebCore::InspectorTimelineAgent::willWriteHTML):
+        (WebCore::InspectorTimelineAgent::reset):
+        (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+        * inspector/InspectorTimelineAgent.h:
+
 2009-10-20  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index c3ad075..4a6ad71 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -43,8 +43,7 @@
 namespace WebCore {
 
 InspectorTimelineAgent::InspectorTimelineAgent(InspectorFrontend* frontend)
-    : m_sessionStartTime(currentTimeInMilliseconds())
-    , m_frontend(frontend)
+    : m_frontend(frontend)
     , m_currentTimelineItem(0)
 {
     ASSERT(m_frontend);
@@ -56,7 +55,7 @@ InspectorTimelineAgent::~InspectorTimelineAgent()
 
 void InspectorTimelineAgent::willDispatchDOMEvent(const Event& event)
 {
-    m_currentTimelineItem = new DOMDispatchTimelineItem(m_currentTimelineItem.release(), sessionTimeInMilliseconds(), event);
+    m_currentTimelineItem = new DOMDispatchTimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), event);
 }
 
 void InspectorTimelineAgent::didDispatchDOMEvent()
@@ -67,7 +66,7 @@ void InspectorTimelineAgent::didDispatchDOMEvent()
 
 void InspectorTimelineAgent::willLayout()
 {
-    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), sessionTimeInMilliseconds(), LayoutTimelineItemType);
+    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), LayoutTimelineItemType);
 }
 
 void InspectorTimelineAgent::didLayout()
@@ -78,7 +77,7 @@ void InspectorTimelineAgent::didLayout()
 
 void InspectorTimelineAgent::willRecalculateStyle()
 {
-    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), sessionTimeInMilliseconds(), RecalculateStylesTimelineItemType);
+    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), RecalculateStylesTimelineItemType);
 }
 
 void InspectorTimelineAgent::didRecalculateStyle()
@@ -89,7 +88,7 @@ void InspectorTimelineAgent::didRecalculateStyle()
 
 void InspectorTimelineAgent::willPaint()
 {
-    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), sessionTimeInMilliseconds(), PaintTimelineItemType);
+    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), PaintTimelineItemType);
 }
 
 void InspectorTimelineAgent::didPaint()
@@ -100,7 +99,7 @@ void InspectorTimelineAgent::didPaint()
 
 void InspectorTimelineAgent::willWriteHTML()
 {
-    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), sessionTimeInMilliseconds(), ParseHTMLTimelineItemType);
+    m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), ParseHTMLTimelineItemType);
 }
 
 void InspectorTimelineAgent::didWriteHTML()
@@ -111,7 +110,6 @@ void InspectorTimelineAgent::didWriteHTML()
 
 void InspectorTimelineAgent::reset()
 {
-    m_sessionStartTime = currentTimeInMilliseconds();
     m_currentTimelineItem.set(0);
 }
 
@@ -120,7 +118,7 @@ void InspectorTimelineAgent::didCompleteCurrentRecord()
     OwnPtr<TimelineItem> item(m_currentTimelineItem.release());
     m_currentTimelineItem = item->releasePrevious();
 
-    item->setEndTime(sessionTimeInMilliseconds());
+    item->setEndTime(currentTimeInMilliseconds());
     if (m_currentTimelineItem.get())
         m_currentTimelineItem->addChildItem(item.release());
     else
@@ -132,11 +130,6 @@ double InspectorTimelineAgent::currentTimeInMilliseconds()
     return currentTime() * 1000.0;
 }
 
-double InspectorTimelineAgent::sessionTimeInMilliseconds()
-{
-    return currentTimeInMilliseconds() - m_sessionStartTime;
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 4095fed..1a7c3bf 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -61,13 +61,10 @@ namespace WebCore {
         void didWriteHTML();
         void willWriteHTML();
     private:
-        double sessionTimeInMilliseconds();
-
         static double currentTimeInMilliseconds();
 
         void didCompleteCurrentRecord();
 
-        double m_sessionStartTime;
         InspectorFrontend* m_frontend;
         OwnPtr<TimelineItem> m_currentTimelineItem;
     };

-- 
WebKit Debian packaging