[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

tonyg at chromium.org tonyg at chromium.org
Wed Dec 22 18:48:09 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 64d18d9b8d449e51d6b4f284cbc8436d15ff6d63
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 18 09:23:56 2010 +0000

    2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Laszlo Gombos.
    
            [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
            https://bugs.webkit.org/show_bug.cgi?id=50943
    
            * fast/dom/Window/window-properties-performance-expected.txt:
            * fast/dom/script-tests/webtiming.js:
            (checkTimingBeforeLoad):
            (checkTimingWhileDeferred):
            (checkWebTimingOnDOMContentLoaded):
            (checkWebTimingWhileAsync):
            (checkWebTimingOnLoad):
            (checkWebTimingAfterLoad):
            * fast/dom/webtiming-document-open-expected.txt:
            * fast/dom/webtiming-expected.txt:
            * fast/dom/webtiming-navigate-within-document-expected.txt:
    2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Laszlo Gombos.
    
            [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
            https://bugs.webkit.org/show_bug.cgi?id=50943
    
            See: http://test.w3.org/webperf/specs/NavigationTiming/#nt-dom-content-event-start
    
            * dom/Document.cpp:
            (WebCore::Document::finishedParsing):
            * dom/DocumentTiming.h:
            (WebCore::DocumentTiming::DocumentTiming):
            * page/PerformanceTiming.cpp:
            (WebCore::PerformanceTiming::domContentLoadedEventStart):
            (WebCore::PerformanceTiming::domContentLoadedEventEnd):
            * page/PerformanceTiming.h:
            * page/PerformanceTiming.idl:
    2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Laszlo Gombos.
    
            [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
            https://bugs.webkit.org/show_bug.cgi?id=50943
    
            Exposes all dom* times to the chromium port. I'm particularly interested in
            domContentLoadedEventEnd as it compares to the FinishDoc metric.
    
            * public/WebPerformance.h:
            * src/WebPerformance.cpp:
            (WebKit::WebPerformance::domLoading):
            (WebKit::WebPerformance::domInteractive):
            (WebKit::WebPerformance::domContentLoadedEventStart):
            (WebKit::WebPerformance::domContentLoadedEventEnd):
            (WebKit::WebPerformance::domComplete):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 94e2224..2328f34 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
+        https://bugs.webkit.org/show_bug.cgi?id=50943
+
+        * fast/dom/Window/window-properties-performance-expected.txt:
+        * fast/dom/script-tests/webtiming.js:
+        (checkTimingBeforeLoad):
+        (checkTimingWhileDeferred):
+        (checkWebTimingOnDOMContentLoaded):
+        (checkWebTimingWhileAsync):
+        (checkWebTimingOnLoad):
+        (checkWebTimingAfterLoad):
+        * fast/dom/webtiming-document-open-expected.txt:
+        * fast/dom/webtiming-expected.txt:
+        * fast/dom/webtiming-navigate-within-document-expected.txt:
+
 2010-12-17  Tony Gentilcore  <tonyg at chromium.org>
 
         Unreviewed.
diff --git a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
index 7a71c4f..592e1e2 100644
--- a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
@@ -15,8 +15,8 @@ window.webkitPerformance.timing [object PerformanceTiming]
 window.webkitPerformance.timing.connectEnd [number]
 window.webkitPerformance.timing.connectStart [number]
 window.webkitPerformance.timing.domComplete [number]
-window.webkitPerformance.timing.domContentLoadedEnd [number]
-window.webkitPerformance.timing.domContentLoadedStart [number]
+window.webkitPerformance.timing.domContentLoadedEventEnd [number]
+window.webkitPerformance.timing.domContentLoadedEventStart [number]
 window.webkitPerformance.timing.domInteractive [number]
 window.webkitPerformance.timing.domLoading [number]
 window.webkitPerformance.timing.domainLookupEnd [number]
diff --git a/LayoutTests/fast/dom/script-tests/webtiming.js b/LayoutTests/fast/dom/script-tests/webtiming.js
index 16cb83d..fa6eb18 100644
--- a/LayoutTests/fast/dom/script-tests/webtiming.js
+++ b/LayoutTests/fast/dom/script-tests/webtiming.js
@@ -42,8 +42,8 @@ function checkTimingBeforeLoad()
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBe("timing.domInteractive", "0");
-    shouldBe("timing.domContentLoadedStart", "0");
-    shouldBe("timing.domContentLoadedEnd", "0");
+    shouldBe("timing.domContentLoadedEventStart", "0");
+    shouldBe("timing.domContentLoadedEventEnd", "0");
     shouldBe("timing.domComplete", "0");
 
     shouldBe("timing.loadEventStart", "0");
@@ -77,8 +77,8 @@ function checkTimingWhileDeferred()
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBeGreaterThanOrEqual("timing.domInteractive", "timing.domLoading");
-    shouldBe("timing.domContentLoadedStart", "0");
-    shouldBe("timing.domContentLoadedEnd", "0");
+    shouldBe("timing.domContentLoadedEventStart", "0");
+    shouldBe("timing.domContentLoadedEventEnd", "0");
     shouldBe("timing.domComplete", "0");
 
     shouldBe("timing.loadEventStart", "0");
@@ -113,8 +113,8 @@ function checkWebTimingOnDOMContentLoaded() {
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBeGreaterThanOrEqual("timing.domInteractive", "timing.domLoading");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedStart", "timing.domInteractive");
-    shouldBe("timing.domContentLoadedEnd", "0");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventStart", "timing.domInteractive");
+    shouldBe("timing.domContentLoadedEventEnd", "0");
     shouldBe("timing.domComplete", "0");
 
     shouldBe("timing.loadEventStart", "0");
@@ -155,8 +155,8 @@ function checkWebTimingWhileAsync()
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBeGreaterThanOrEqual("timing.domInteractive", "timing.responseEnd");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedStart", "timing.domInteractive");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedEnd", "timing.domContentLoadedStart");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventStart", "timing.domInteractive");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventEnd", "timing.domContentLoadedEventStart");
     shouldBe("timing.domComplete", "0");
 
     shouldBe("timing.loadEventStart", "0");
@@ -193,9 +193,9 @@ function checkWebTimingOnLoad()
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBeGreaterThanOrEqual("timing.domInteractive", "timing.responseEnd");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedStart", "timing.domInteractive");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedEnd", "timing.domContentLoadedStart");
-    shouldBeGreaterThanOrEqual("timing.domComplete", "timing.domContentLoadedEnd");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventStart", "timing.domInteractive");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventEnd", "timing.domContentLoadedEventStart");
+    shouldBeGreaterThanOrEqual("timing.domComplete", "timing.domContentLoadedEventEnd");
 
     shouldBeGreaterThanOrEqual("timing.loadEventStart", "timing.responseEnd");
     shouldBe("timing.loadEventEnd", "0");
@@ -231,9 +231,9 @@ function checkWebTimingAfterLoad()
 
     shouldBeGreaterThanOrEqual("timing.domLoading", "timing.fetchStart");
     shouldBeGreaterThanOrEqual("timing.domInteractive", "timing.responseEnd");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedStart", "timing.domInteractive");
-    shouldBeGreaterThanOrEqual("timing.domContentLoadedEnd", "timing.domContentLoadedStart");
-    shouldBeGreaterThanOrEqual("timing.domComplete", "timing.domContentLoadedEnd");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventStart", "timing.domInteractive");
+    shouldBeGreaterThanOrEqual("timing.domContentLoadedEventEnd", "timing.domContentLoadedEventStart");
+    shouldBeGreaterThanOrEqual("timing.domComplete", "timing.domContentLoadedEventEnd");
 
     shouldBeGreaterThanOrEqual("timing.loadEventStart", "timing.responseEnd");
     shouldBeGreaterThanOrEqual("timing.loadEventEnd", "timing.loadEventStart + 50");
diff --git a/LayoutTests/fast/dom/webtiming-document-open-expected.txt b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
index f2d05d6..2a6e46e 100644
--- a/LayoutTests/fast/dom/webtiming-document-open-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-document-open-expected.txt
@@ -6,8 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS timing.connectEnd is originalTiming.connectEnd
 PASS timing.connectStart is originalTiming.connectStart
 PASS timing.domComplete is originalTiming.domComplete
-PASS timing.domContentLoadedEnd is originalTiming.domContentLoadedEnd
-PASS timing.domContentLoadedStart is originalTiming.domContentLoadedStart
+PASS timing.domContentLoadedEventEnd is originalTiming.domContentLoadedEventEnd
+PASS timing.domContentLoadedEventStart is originalTiming.domContentLoadedEventStart
 PASS timing.domInteractive is originalTiming.domInteractive
 PASS timing.domLoading is originalTiming.domLoading
 PASS timing.domainLookupEnd is originalTiming.domainLookupEnd
diff --git a/LayoutTests/fast/dom/webtiming-expected.txt b/LayoutTests/fast/dom/webtiming-expected.txt
index 4d832ba..9d9f95e 100644
--- a/LayoutTests/fast/dom/webtiming-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-expected.txt
@@ -19,8 +19,8 @@ PASS timing.requestStart is >= timing.connectEnd
 PASS timing.responseStart is >= timing.requestStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is 0
-PASS timing.domContentLoadedStart is 0
-PASS timing.domContentLoadedEnd is 0
+PASS timing.domContentLoadedEventStart is 0
+PASS timing.domContentLoadedEventEnd is 0
 PASS timing.domComplete is 0
 PASS timing.loadEventStart is 0
 PASS timing.loadEventEnd is 0
@@ -40,8 +40,8 @@ PASS timing.requestStart is >= timing.connectEnd
 PASS timing.responseStart is >= timing.requestStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is >= timing.domLoading
-PASS timing.domContentLoadedStart is 0
-PASS timing.domContentLoadedEnd is 0
+PASS timing.domContentLoadedEventStart is 0
+PASS timing.domContentLoadedEventEnd is 0
 PASS timing.domComplete is 0
 PASS timing.loadEventStart is 0
 PASS timing.loadEventEnd is 0
@@ -61,8 +61,8 @@ PASS timing.requestStart is >= timing.connectEnd
 PASS timing.responseStart is >= timing.requestStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is >= timing.domLoading
-PASS timing.domContentLoadedStart is >= timing.domInteractive
-PASS timing.domContentLoadedEnd is 0
+PASS timing.domContentLoadedEventStart is >= timing.domInteractive
+PASS timing.domContentLoadedEventEnd is 0
 PASS timing.domComplete is 0
 PASS timing.loadEventStart is 0
 PASS timing.loadEventEnd is 0
@@ -82,8 +82,8 @@ PASS timing.requestStart is >= timing.connectEnd
 PASS timing.responseStart is >= timing.requestStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is >= timing.responseEnd
-PASS timing.domContentLoadedStart is >= timing.domInteractive
-PASS timing.domContentLoadedEnd is >= timing.domContentLoadedStart
+PASS timing.domContentLoadedEventStart is >= timing.domInteractive
+PASS timing.domContentLoadedEventEnd is >= timing.domContentLoadedEventStart
 PASS timing.domComplete is 0
 PASS timing.loadEventStart is 0
 PASS timing.loadEventEnd is 0
@@ -104,9 +104,9 @@ PASS timing.responseStart is >= timing.requestStart
 PASS timing.responseEnd is >= timing.responseStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is >= timing.responseEnd
-PASS timing.domContentLoadedStart is >= timing.domInteractive
-PASS timing.domContentLoadedEnd is >= timing.domContentLoadedStart
-PASS timing.domComplete is >= timing.domContentLoadedEnd
+PASS timing.domContentLoadedEventStart is >= timing.domInteractive
+PASS timing.domContentLoadedEventEnd is >= timing.domContentLoadedEventStart
+PASS timing.domComplete is >= timing.domContentLoadedEventEnd
 PASS timing.loadEventStart is >= timing.responseEnd
 PASS timing.loadEventEnd is 0
 PASS timing.navigationStart is >= oneHourAgoUTC
@@ -126,9 +126,9 @@ PASS timing.responseStart is >= timing.requestStart
 PASS timing.responseEnd is >= timing.responseStart
 PASS timing.domLoading is >= timing.fetchStart
 PASS timing.domInteractive is >= timing.responseEnd
-PASS timing.domContentLoadedStart is >= timing.domInteractive
-PASS timing.domContentLoadedEnd is >= timing.domContentLoadedStart
-PASS timing.domComplete is >= timing.domContentLoadedEnd
+PASS timing.domContentLoadedEventStart is >= timing.domInteractive
+PASS timing.domContentLoadedEventEnd is >= timing.domContentLoadedEventStart
+PASS timing.domComplete is >= timing.domContentLoadedEventEnd
 PASS timing.loadEventStart is >= timing.responseEnd
 PASS timing.loadEventEnd is >= timing.loadEventStart + 50
 PASS successfullyParsed is true
diff --git a/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt b/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
index 7d61e43..9e69fd3 100644
--- a/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
+++ b/LayoutTests/fast/dom/webtiming-navigate-within-document-expected.txt
@@ -6,8 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS connectEnd is unchanged.
 PASS connectStart is unchanged.
 PASS domComplete is unchanged.
-PASS domContentLoadedEnd is unchanged.
-PASS domContentLoadedStart is unchanged.
+PASS domContentLoadedEventEnd is unchanged.
+PASS domContentLoadedEventStart is unchanged.
 PASS domInteractive is unchanged.
 PASS domLoading is unchanged.
 PASS domainLookupEnd is unchanged.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f500e4..990cc57 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
+        https://bugs.webkit.org/show_bug.cgi?id=50943
+
+        See: http://test.w3.org/webperf/specs/NavigationTiming/#nt-dom-content-event-start
+
+        * dom/Document.cpp:
+        (WebCore::Document::finishedParsing):
+        * dom/DocumentTiming.h:
+        (WebCore::DocumentTiming::DocumentTiming):
+        * page/PerformanceTiming.cpp:
+        (WebCore::PerformanceTiming::domContentLoadedEventStart):
+        (WebCore::PerformanceTiming::domContentLoadedEventEnd):
+        * page/PerformanceTiming.h:
+        * page/PerformanceTiming.idl:
+
 2010-12-17  Justin Schuh  <jschuh at chromium.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 87a40d6..ae604e9 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -4208,11 +4208,11 @@ void Document::finishedParsing()
     ASSERT(!scriptableDocumentParser() || !m_parser->isParsing());
     ASSERT(!scriptableDocumentParser() || m_readyState != Loading);
     setParsing(false);
-    if (!m_documentTiming.domContentLoadedStart)
-        m_documentTiming.domContentLoadedStart = currentTime();
+    if (!m_documentTiming.domContentLoadedEventStart)
+        m_documentTiming.domContentLoadedEventStart = currentTime();
     dispatchEvent(Event::create(eventNames().DOMContentLoadedEvent, true, false));
-    if (!m_documentTiming.domContentLoadedEnd)
-        m_documentTiming.domContentLoadedEnd = currentTime();
+    if (!m_documentTiming.domContentLoadedEventEnd)
+        m_documentTiming.domContentLoadedEventEnd = currentTime();
 
     if (Frame* f = frame()) {
         // FrameLoader::finishedParsing() might end up calling Document::implicitClose() if all
diff --git a/WebCore/dom/DocumentTiming.h b/WebCore/dom/DocumentTiming.h
index 7abc219..89e2fb9 100644
--- a/WebCore/dom/DocumentTiming.h
+++ b/WebCore/dom/DocumentTiming.h
@@ -32,16 +32,16 @@ struct DocumentTiming {
     DocumentTiming()
         : domLoading(0.0)
         , domInteractive(0.0)
-        , domContentLoadedStart(0.0)
-        , domContentLoadedEnd(0.0)
+        , domContentLoadedEventStart(0.0)
+        , domContentLoadedEventEnd(0.0)
         , domComplete(0.0)
     {
     }
 
     double domLoading;
     double domInteractive;
-    double domContentLoadedStart;
-    double domContentLoadedEnd;
+    double domContentLoadedEventStart;
+    double domContentLoadedEventEnd;
     double domComplete;
 };
 
diff --git a/WebCore/page/PerformanceTiming.cpp b/WebCore/page/PerformanceTiming.cpp
index d9139a9..47f9278 100644
--- a/WebCore/page/PerformanceTiming.cpp
+++ b/WebCore/page/PerformanceTiming.cpp
@@ -281,22 +281,22 @@ unsigned long long PerformanceTiming::domInteractive() const
     return toIntegerMilliseconds(timing->domInteractive);
 }
 
-unsigned long long PerformanceTiming::domContentLoadedStart() const
+unsigned long long PerformanceTiming::domContentLoadedEventStart() const
 {
     const DocumentTiming* timing = documentTiming();
     if (!timing)
         return 0;
 
-    return toIntegerMilliseconds(timing->domContentLoadedStart);
+    return toIntegerMilliseconds(timing->domContentLoadedEventStart);
 }
 
-unsigned long long PerformanceTiming::domContentLoadedEnd() const
+unsigned long long PerformanceTiming::domContentLoadedEventEnd() const
 {
     const DocumentTiming* timing = documentTiming();
     if (!timing)
         return 0;
 
-    return toIntegerMilliseconds(timing->domContentLoadedEnd);
+    return toIntegerMilliseconds(timing->domContentLoadedEventEnd);
 }
 
 unsigned long long PerformanceTiming::domComplete() const
diff --git a/WebCore/page/PerformanceTiming.h b/WebCore/page/PerformanceTiming.h
index 28553f3..9c35672 100644
--- a/WebCore/page/PerformanceTiming.h
+++ b/WebCore/page/PerformanceTiming.h
@@ -67,8 +67,8 @@ public:
     unsigned long long responseEnd() const;
     unsigned long long domLoading() const;
     unsigned long long domInteractive() const;
-    unsigned long long domContentLoadedStart() const;
-    unsigned long long domContentLoadedEnd() const;
+    unsigned long long domContentLoadedEventStart() const;
+    unsigned long long domContentLoadedEventEnd() const;
     unsigned long long domComplete() const;
     unsigned long long loadEventStart() const;
     unsigned long long loadEventEnd() const;
diff --git a/WebCore/page/PerformanceTiming.idl b/WebCore/page/PerformanceTiming.idl
index b258e48..a0f08e2 100644
--- a/WebCore/page/PerformanceTiming.idl
+++ b/WebCore/page/PerformanceTiming.idl
@@ -48,8 +48,8 @@ module window {
         readonly attribute unsigned long long responseEnd;
         readonly attribute unsigned long long domLoading;
         readonly attribute unsigned long long domInteractive;
-        readonly attribute unsigned long long domContentLoadedStart;
-        readonly attribute unsigned long long domContentLoadedEnd;
+        readonly attribute unsigned long long domContentLoadedEventStart;
+        readonly attribute unsigned long long domContentLoadedEventEnd;
         readonly attribute unsigned long long domComplete;
         readonly attribute unsigned long long loadEventStart;
         readonly attribute unsigned long long loadEventEnd;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d5ea660..2b2ed68 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-18  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Web Timing] Rename domContentLoaded{Start,End}->domContentLoadedEvent{Start,End}
+        https://bugs.webkit.org/show_bug.cgi?id=50943
+
+        Exposes all dom* times to the chromium port. I'm particularly interested in
+        domContentLoadedEventEnd as it compares to the FinishDoc metric.
+
+        * public/WebPerformance.h:
+        * src/WebPerformance.cpp:
+        (WebKit::WebPerformance::domLoading):
+        (WebKit::WebPerformance::domInteractive):
+        (WebKit::WebPerformance::domContentLoadedEventStart):
+        (WebKit::WebPerformance::domContentLoadedEventEnd):
+        (WebKit::WebPerformance::domComplete):
+
 2010-12-17  Tony Gentilcore  <tonyg at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKit/chromium/public/WebPerformance.h b/WebKit/chromium/public/WebPerformance.h
index f096ac6..c7a728e 100644
--- a/WebKit/chromium/public/WebPerformance.h
+++ b/WebKit/chromium/public/WebPerformance.h
@@ -73,6 +73,11 @@ public:
     WEBKIT_API double requestStart() const;
     WEBKIT_API double responseStart() const;
     WEBKIT_API double responseEnd() const;
+    WEBKIT_API double domLoading() const;
+    WEBKIT_API double domInteractive() const;
+    WEBKIT_API double domContentLoadedEventStart() const;
+    WEBKIT_API double domContentLoadedEventEnd() const;
+    WEBKIT_API double domComplete() const;
     WEBKIT_API double loadEventStart() const;
     WEBKIT_API double loadEventEnd() const;
 
diff --git a/WebKit/chromium/src/WebPerformance.cpp b/WebKit/chromium/src/WebPerformance.cpp
index 10df4c7..8c377db 100644
--- a/WebKit/chromium/src/WebPerformance.cpp
+++ b/WebKit/chromium/src/WebPerformance.cpp
@@ -133,6 +133,31 @@ double WebPerformance::responseEnd() const
     return millisecondsToSeconds(m_private->timing()->responseEnd());
 }
 
+double WebPerformance::domLoading() const
+{
+    return millisecondsToSeconds(m_private->timing()->domLoading());
+}
+
+double WebPerformance::domInteractive() const
+{
+    return millisecondsToSeconds(m_private->timing()->domInteractive());
+}
+
+double WebPerformance::domContentLoadedEventStart() const
+{
+    return millisecondsToSeconds(m_private->timing()->domContentLoadedEventStart());
+}
+
+double WebPerformance::domContentLoadedEventEnd() const
+{
+    return millisecondsToSeconds(m_private->timing()->domContentLoadedEventEnd());
+}
+
+double WebPerformance::domComplete() const
+{
+    return millisecondsToSeconds(m_private->timing()->domComplete());
+}
+
 double WebPerformance::loadEventStart() const
 {
     return millisecondsToSeconds(m_private->timing()->loadEventStart());

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list